diff options
Diffstat (limited to 'searchcore/src/apps')
| -rw-r--r-- | searchcore/src/apps/vespa-feed-bm/vespa_feed_bm.cpp | 5 | ||||
| -rw-r--r-- | searchcore/src/apps/vespa-redistribute-bm/vespa_redistribute_bm.cpp | 43 |
2 files changed, 43 insertions, 5 deletions
diff --git a/searchcore/src/apps/vespa-feed-bm/vespa_feed_bm.cpp b/searchcore/src/apps/vespa-feed-bm/vespa_feed_bm.cpp index 0fe673cebe0..7441d0f2fe0 100644 --- a/searchcore/src/apps/vespa-feed-bm/vespa_feed_bm.cpp +++ b/searchcore/src/apps/vespa-feed-bm/vespa_feed_bm.cpp @@ -167,7 +167,7 @@ Benchmark::run() auto update_feed = _feed.make_feed(executor, _params, [this](BmRange range, BucketSelector bucket_selector) { return _feed.make_update_feed(range, bucket_selector); }, _feed.num_buckets(), "update"); auto get_feed = _feed.make_feed(executor, _params, [this](BmRange range, BucketSelector bucket_selector) { return _feed.make_get_feed(range, bucket_selector); }, _feed.num_buckets(), "get"); auto remove_feed = _feed.make_feed(executor, _params, [this](BmRange range, BucketSelector bucket_selector) { return _feed.make_remove_feed(range, bucket_selector); }, _feed.num_buckets(), "remove"); - BmNodeStatsReporter reporter(*_cluster); + BmNodeStatsReporter reporter(*_cluster, false); reporter.start(500ms); int64_t time_bias = std::chrono::duration_cast<std::chrono::microseconds>(std::chrono::system_clock::now().time_since_epoch() - 24h).count(); LOG(info, "Feed handler is '%s'", feeder.get_feed_handler().get_name().c_str()); @@ -268,7 +268,8 @@ App::get_options() { "use-async-message-handling", 0, nullptr, 0 }, { "use-document-api", 0, nullptr, 0 }, { "use-message-bus", 0, nullptr, 0 }, - { "use-storage-chain", 0, nullptr, 0 } + { "use-storage-chain", 0, nullptr, 0 }, + { nullptr, 0, nullptr, 0 } }; enum longopts_enum { LONGOPT_BUCKET_DB_STRIPE_BITS, diff --git a/searchcore/src/apps/vespa-redistribute-bm/vespa_redistribute_bm.cpp b/searchcore/src/apps/vespa-redistribute-bm/vespa_redistribute_bm.cpp index 1b8f93b381f..3fc42e50cdb 100644 --- a/searchcore/src/apps/vespa-redistribute-bm/vespa_redistribute_bm.cpp +++ b/searchcore/src/apps/vespa-redistribute-bm/vespa_redistribute_bm.cpp @@ -279,7 +279,7 @@ Benchmark::feed() vespalib::ThreadStackExecutor executor(_params.get_client_threads(), 128_Ki); BmFeeder feeder(_repo, *_cluster->get_feed_handler(), executor); auto put_feed = _feed.make_feed(executor, _params, [this](BmRange range, BucketSelector bucket_selector) { return _feed.make_put_feed(range, bucket_selector); }, _feed.num_buckets(), "put"); - BmNodeStatsReporter reporter(*_cluster); + BmNodeStatsReporter reporter(*_cluster, false); reporter.start(500ms); int64_t time_bias = std::chrono::duration_cast<std::chrono::microseconds>(std::chrono::system_clock::now().time_since_epoch() - 24h).count(); LOG(info, "Feed handler is '%s'", feeder.get_feed_handler().get_name().c_str()); @@ -297,7 +297,7 @@ Benchmark::feed() std::chrono::duration<double> Benchmark::redistribute() { - BmNodeStatsReporter reporter(*_cluster); + BmNodeStatsReporter reporter(*_cluster, true); auto before = std::chrono::steady_clock::now(); reporter.start(500ms); _cluster->propagate_cluster_state(); @@ -367,12 +367,18 @@ App::usage() "vespa-redistribute-bm\n" "[--bucket-db-stripe-bits bits]\n" "[--client-threads threads]\n" + "[--distributor-merge-busy-wait distributor-merge-busy-wait]\n" "[--distributor-stripes stripes]\n" + "[--doc-store-chunk-compression-level level]\n" + "[--doc-store-chunk-maxbytes maxbytes]\n" "[--documents documents]\n" "[--flip-nodes flip-nodes]\n" "[--groups groups]\n" "[--indexing-sequencer [latency,throughput,adaptive]]\n" + "[--max-merges-per-node max-merges-per-node]\n" + "[--max-merge-queue-size max-merge-queue-size]\n" "[--max-pending max-pending]\n" + "[--max-pending-idealstate-operations max-pending-idealstate-operations]\n" "[--mode [grow, shrink, perm-crash, temp-crash, replace]\n" "[--nodes-per-group nodes-per-group]\n" "[--redundancy redundancy]\n" @@ -394,12 +400,18 @@ App::get_options() static struct option long_opts[] = { { "bucket-db-stripe-bits", 1, nullptr, 0 }, { "client-threads", 1, nullptr, 0 }, + { "distributor-merge-busy-wait", 1, nullptr, 0 }, { "distributor-stripes", 1, nullptr, 0 }, + { "doc-store-chunk-compression-level", 1, nullptr, 0 }, + { "doc-store-chunk-maxbytes", 1, nullptr, 0 }, { "documents", 1, nullptr, 0 }, { "flip-nodes", 1, nullptr, 0 }, { "groups", 1, nullptr, 0 }, { "indexing-sequencer", 1, nullptr, 0 }, + { "max-merges-per-node", 1, nullptr, 0 }, + { "max-merge-queue-size", 1, nullptr, 0 }, { "max-pending", 1, nullptr, 0 }, + { "max-pending-idealstate-operations", 1, nullptr, 0 }, { "mode", 1, nullptr, 0 }, { "nodes-per-group", 1, nullptr, 0 }, { "redundancy", 1, nullptr, 0 }, @@ -409,17 +421,24 @@ App::get_options() { "rpc-targets-per-node", 1, nullptr, 0 }, { "skip-communicationmanager-thread", 0, nullptr, 0 }, { "use-async-message-handling", 0, nullptr, 0 }, - { "use-feed-settle", 0, nullptr, 0 } + { "use-feed-settle", 0, nullptr, 0 }, + { nullptr, 0, nullptr, 0 } }; enum longopts_enum { LONGOPT_BUCKET_DB_STRIPE_BITS, LONGOPT_CLIENT_THREADS, + LONGOPT_DISTRIBUTOR_MERGE_BUSY_WAIT, LONGOPT_DISTRIBUTOR_STRIPES, + LONGOPT_DOC_STORE_CHUNK_COMPRESSION_LEVEL, + LONGOPT_DOC_STORE_CHUNK_MAXBYTES, LONGOPT_DOCUMENTS, LONGOPT_FLIP_NODES, LONGOPT_GROUPS, LONGOPT_INDEXING_SEQUENCER, + LONGOPT_MAX_MERGES_PER_NODE, + LONGOPT_MAX_MERGE_QUEUE_SIZE, LONGOPT_MAX_PENDING, + LONGOPT_MAX_PENDING_IDEALSTATE_OPERATIONS, LONGOPT_MODE, LONGOPT_NODES_PER_GROUP, LONGOPT_REDUNDANCY, @@ -443,9 +462,18 @@ App::get_options() case LONGOPT_CLIENT_THREADS: _bm_params.set_client_threads(atoi(opt_argument)); break; + case LONGOPT_DISTRIBUTOR_MERGE_BUSY_WAIT: + _bm_params.set_distributor_merge_busy_wait(atoi(opt_argument)); + break; case LONGOPT_DISTRIBUTOR_STRIPES: _bm_params.set_distributor_stripes(atoi(opt_argument)); break; + case LONGOPT_DOC_STORE_CHUNK_COMPRESSION_LEVEL: + _bm_params.set_doc_store_chunk_compression_level(atoi(opt_argument)); + break; + case LONGOPT_DOC_STORE_CHUNK_MAXBYTES: + _bm_params.set_doc_store_chunk_maxbytes(atoi(opt_argument)); + break; case LONGOPT_DOCUMENTS: _bm_params.set_documents(atoi(opt_argument)); break; @@ -458,9 +486,18 @@ App::get_options() case LONGOPT_INDEXING_SEQUENCER: _bm_params.set_indexing_sequencer(opt_argument); break; + case LONGOPT_MAX_MERGES_PER_NODE: + _bm_params.set_max_merges_per_node(atoi(opt_argument)); + break; + case LONGOPT_MAX_MERGE_QUEUE_SIZE: + _bm_params.set_max_merge_queue_size(atoi(opt_argument)); + break; case LONGOPT_MAX_PENDING: _bm_params.set_max_pending(atoi(opt_argument)); break; + case LONGOPT_MAX_PENDING_IDEALSTATE_OPERATIONS: + _bm_params.set_max_pending_idealstate_operations(atoi(opt_argument)); + break; case LONGOPT_MODE: _bm_params.set_mode(get_mode(opt_argument)); if (_bm_params.get_mode() == Mode::BAD) { |