diff options
| author | Jon Marius Venstad <venstad@gmail.com> | 2022-02-02 12:35:48 +0100 |
|---|---|---|
| committer | Jon Marius Venstad <venstad@gmail.com> | 2022-02-02 12:35:48 +0100 |
| commit | 611453d5778bef8e8312c9c9ac7a62eb7001d947 (patch) | |
| tree | 09e650e2526d2e9501d45b2cba6e0c89520956c9 /vespa-feed-client-cli | |
| parent | fe37932e6418d3d7a8bbea2f4ca5f727b67e8d00 (diff) | |
Always print statistics at end, andd to stdout if --benchmark
Diffstat (limited to 'vespa-feed-client-cli')
3 files changed, 6 insertions, 6 deletions
diff --git a/vespa-feed-client-cli/src/main/java/ai/vespa/feed/client/impl/CliArguments.java b/vespa-feed-client-cli/src/main/java/ai/vespa/feed/client/impl/CliArguments.java index 2fc7e5af7b4..4374be94dbd 100644 --- a/vespa-feed-client-cli/src/main/java/ai/vespa/feed/client/impl/CliArguments.java +++ b/vespa-feed-client-cli/src/main/java/ai/vespa/feed/client/impl/CliArguments.java @@ -259,7 +259,7 @@ class CliArguments { .build()) .addOption(Option.builder() .longOpt(BENCHMARK_OPTION) - .desc("Enable benchmark mode") + .desc("Print statistics to stdout when done") .build()) .addOption(Option.builder() .longOpt(ROUTE_OPTION) @@ -292,7 +292,7 @@ class CliArguments { .build()) .addOption(Option.builder() .longOpt(SILENT_OPTION) - .desc("Disable periodic status printing") + .desc("Disable periodic status printing to stderr") .build()) .addOption(Option.builder() .longOpt(SHOW_ERRORS_OPTION) diff --git a/vespa-feed-client-cli/src/main/java/ai/vespa/feed/client/impl/CliClient.java b/vespa-feed-client-cli/src/main/java/ai/vespa/feed/client/impl/CliClient.java index 7e036b8dec3..83358585935 100644 --- a/vespa-feed-client-cli/src/main/java/ai/vespa/feed/client/impl/CliClient.java +++ b/vespa-feed-client-cli/src/main/java/ai/vespa/feed/client/impl/CliClient.java @@ -94,9 +94,7 @@ public class CliClient { }); latch.await(); - if (cliArgs.benchmarkModeEnabled()) { - printBenchmarkResult(System.nanoTime() - startNanos, successes.get(), failures.get(), feedClient.stats(), systemOut); - } + printBenchmarkResult(System.nanoTime() - startNanos, successes.get(), failures.get(), feedClient.stats(), cliArgs.benchmarkModeEnabled() ? systemOut : systemError); if (fatal.get() != null) throw fatal.get(); } return 0; diff --git a/vespa-feed-client-cli/src/test/resources/help.txt b/vespa-feed-client-cli/src/test/resources/help.txt index 67b83c07699..f0819e26449 100644 --- a/vespa-feed-client-cli/src/test/resources/help.txt +++ b/vespa-feed-client-cli/src/test/resources/help.txt @@ -1,6 +1,7 @@ usage: vespa-feed-client <options> Vespa feed client - --benchmark Enable benchmark mode + --benchmark Print statistics to stdout when + done --ca-certificates <arg> Path to file containing CA X.509 certificates encoded as PEM --certificate <arg> Path to PEM encoded X.509 @@ -27,6 +28,7 @@ Vespa feed client --show-errors Print every feed operation failure --silent Disable periodic status printing + to stderr --stdin Read JSON input from standard input --timeout <arg> Feed operation timeout (in |