diff options
| author | Jon Marius Venstad <jonmv@users.noreply.github.com> | 2020-12-10 13:23:06 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-12-10 13:23:06 +0100 |
| commit | bdf02b5a355e14d83831d09964f78f9b6becefdc (patch) | |
| tree | f60c38a7cac8c758f51fba9128a9826b88972f97 /clustercontroller-reindexer | |
| parent | a4b297165caca7c8875e560a83614446c31c7b16 (diff) | |
| parent | bf127fe126f7c6e3b7924bd64fabc955fccbc7c3 (diff) | |
Merge pull request #15772 from vespa-engine/jonmv/percentwise-progress-in-api
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..56bacea5cb6 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.setDouble("progress", progress.percentFinished() * 1e-2)); 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..e00b10b80bd 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\":1.0," + "\"state\":\"failed\"," + "\"message\":\"ヽ(。_°)ノ\"}" + "}" + |