diff options
| author | Jon Marius Venstad <venstad@gmail.com> | 2020-12-10 13:08:55 +0100 |
|---|---|---|
| committer | Jon Marius Venstad <venstad@gmail.com> | 2020-12-10 13:08:55 +0100 |
| commit | 1e95ab58443cfe8065832aee7666a2dfbd2cfdd6 (patch) | |
| tree | 66b6df3673d589284d90dfb02ecf4e27549d0ff2 /clustercontroller-reindexer | |
| parent | 25cbf4637a2f312f7646ec1c47916368a747d983 (diff) | |
Use percent complete instead of actual progress token
Diffstat (limited to 'clustercontroller-reindexer')
2 files changed, 2 insertions, 2 deletions
diff --git a/clustercontroller-reindexer/src/main/java/ai/vespa/reindexing/http/ReindexingV1ApiHandler.java b/clustercontroller-reindexer/src/main/java/ai/vespa/reindexing/http/ReindexingV1ApiHandler.java index b1c0d012325..3337d30e34a 100644 --- a/clustercontroller-reindexer/src/main/java/ai/vespa/reindexing/http/ReindexingV1ApiHandler.java +++ b/clustercontroller-reindexer/src/main/java/ai/vespa/reindexing/http/ReindexingV1ApiHandler.java @@ -82,7 +82,7 @@ public class ReindexingV1ApiHandler extends ThreadedHttpRequestHandler { Cursor statusObject = documentTypesObject.setObject(type.getName()); statusObject.setLong("startedMillis", status.startedAt().toEpochMilli()); status.endedAt().ifPresent(endedAt -> statusObject.setLong("endedMillis", endedAt.toEpochMilli())); - status.progress().ifPresent(progress -> statusObject.setString("progress", progress.serializeToString())); + status.progress().ifPresent(progress -> statusObject.setString("progress", String.format("%.2f%%", progress.percentFinished()))); statusObject.setString("state", toString(status.state())); status.message().ifPresent(message -> statusObject.setString("message", message)); }); diff --git a/clustercontroller-reindexer/src/test/java/ai/vespa/reindexing/http/ReindexingV1ApiTest.java b/clustercontroller-reindexer/src/test/java/ai/vespa/reindexing/http/ReindexingV1ApiTest.java index b8f62050347..d9432dab2c2 100644 --- a/clustercontroller-reindexer/src/test/java/ai/vespa/reindexing/http/ReindexingV1ApiTest.java +++ b/clustercontroller-reindexer/src/test/java/ai/vespa/reindexing/http/ReindexingV1ApiTest.java @@ -62,7 +62,7 @@ class ReindexingV1ApiTest { "\"music\":{" + "\"startedMillis\":0," + "\"endedMillis\":123," + - "\"progress\":\"" + new ProgressToken().serializeToString() + "\"," + + "\"progress\":\"100.00%\"," + "\"state\":\"failed\"," + "\"message\":\"ヽ(。_°)ノ\"}" + "}" + |