diff options
Diffstat (limited to 'searchcore/src/apps')
-rw-r--r-- | searchcore/src/apps/vespa-feed-bm/vespa_feed_bm.cpp | 32 | ||||
-rw-r--r-- | searchcore/src/apps/vespa-redistribute-bm/vespa_redistribute_bm.cpp | 18 |
2 files changed, 33 insertions, 17 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 3dac66685f9..0fe673cebe0 100644 --- a/searchcore/src/apps/vespa-feed-bm/vespa_feed_bm.cpp +++ b/searchcore/src/apps/vespa-feed-bm/vespa_feed_bm.cpp @@ -106,6 +106,10 @@ BMParams::check() const std::cerr << "Put passes too low: " << _put_passes << std::endl; return false; } + if (get_groups() > 0 && !needs_distributor()) { + std::cerr << "grouped distribution only allowed when using distributor" << std::endl; + return false; + } return true; } @@ -211,24 +215,25 @@ App::usage() "[--bucket-db-stripe-bits bits]\n" "[--client-threads threads]\n" "[--distributor-stripes stripes]\n" + "[--documents documents]\n" + "[--enable-distributor]\n" + "[--enable-service-layer]\n" "[--get-passes get-passes]\n" + "[--groups groups]\n" "[--indexing-sequencer [latency,throughput,adaptive]]\n" "[--max-pending max-pending]\n" - "[--documents documents]\n" - "[--nodes nodes]\n" + "[--nodes-per-group nodes-per-group]\n" "[--put-passes put-passes]\n" - "[--update-passes update-passes]\n" "[--remove-passes remove-passes]\n" + "[--response-threads threads]\n" "[--rpc-events-before-wakeup events]\n" "[--rpc-network-threads threads]\n" "[--rpc-targets-per-node targets]\n" - "[--response-threads threads]\n" - "[--enable-distributor]\n" - "[--enable-service-layer]\n" "[--skip-communicationmanager-thread]\n" "[--skip-get-spi-bucket-info]\n" - "[--use-document-api]\n" + "[--update-passes update-passes]\n" "[--use-async-message-handling]\n" + "[--use-document-api]\n" "[--use-message-bus\n" "[--use-storage-chain]" << std::endl; } @@ -247,9 +252,10 @@ App::get_options() { "enable-distributor", 0, nullptr, 0 }, { "enable-service-layer", 0, nullptr, 0 }, { "get-passes", 1, nullptr, 0 }, + { "groups", 1, nullptr, 0 }, { "indexing-sequencer", 1, nullptr, 0 }, { "max-pending", 1, nullptr, 0 }, - { "nodes", 1, nullptr, 0 }, + { "nodes-per-group", 1, nullptr, 0 }, { "put-passes", 1, nullptr, 0 }, { "remove-passes", 1, nullptr, 0 }, { "response-threads", 1, nullptr, 0 }, @@ -272,9 +278,10 @@ App::get_options() LONGOPT_ENABLE_DISTRIBUTOR, LONGOPT_ENABLE_SERVICE_LAYER, LONGOPT_GET_PASSES, + LONGOPT_GROUPS, LONGOPT_INDEXING_SEQUENCER, LONGOPT_MAX_PENDING, - LONGOPT_NODES, + LONGOPT_NODES_PER_GROUP, LONGOPT_PUT_PASSES, LONGOPT_REMOVE_PASSES, LONGOPT_RESPONSE_THREADS, @@ -316,14 +323,17 @@ App::get_options() case LONGOPT_GET_PASSES: _bm_params.set_get_passes(atoi(opt_argument)); break; + case LONGOPT_GROUPS: + _bm_params.set_groups(atoi(opt_argument)); + break; case LONGOPT_INDEXING_SEQUENCER: _bm_params.set_indexing_sequencer(opt_argument); break; case LONGOPT_MAX_PENDING: _bm_params.set_max_pending(atoi(opt_argument)); break; - case LONGOPT_NODES: - _bm_params.set_num_nodes(atoi(opt_argument)); + case LONGOPT_NODES_PER_GROUP: + _bm_params.set_nodes_per_group(atoi(opt_argument)); break; case LONGOPT_PUT_PASSES: _bm_params.set_put_passes(atoi(opt_argument)); 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 d9c2c1eda3e..1b8f93b381f 100644 --- a/searchcore/src/apps/vespa-redistribute-bm/vespa_redistribute_bm.cpp +++ b/searchcore/src/apps/vespa-redistribute-bm/vespa_redistribute_bm.cpp @@ -128,7 +128,7 @@ BMParams::BMParams() set_enable_service_layer(true); set_enable_distributor(true); set_use_document_api(true); - set_num_nodes(4); + set_nodes_per_group(4); } @@ -370,10 +370,11 @@ App::usage() "[--distributor-stripes stripes]\n" "[--documents documents]\n" "[--flip-nodes flip-nodes]\n" + "[--groups groups]\n" "[--indexing-sequencer [latency,throughput,adaptive]]\n" "[--max-pending max-pending]\n" "[--mode [grow, shrink, perm-crash, temp-crash, replace]\n" - "[--nodes nodes]\n" + "[--nodes-per-group nodes-per-group]\n" "[--redundancy redundancy]\n" "[--rpc-events-before-wakeup events]\n" "[--rpc-network-threads threads]\n" @@ -396,10 +397,11 @@ App::get_options() { "distributor-stripes", 1, nullptr, 0 }, { "documents", 1, nullptr, 0 }, { "flip-nodes", 1, nullptr, 0 }, + { "groups", 1, nullptr, 0 }, { "indexing-sequencer", 1, nullptr, 0 }, { "max-pending", 1, nullptr, 0 }, { "mode", 1, nullptr, 0 }, - { "nodes", 1, nullptr, 0 }, + { "nodes-per-group", 1, nullptr, 0 }, { "redundancy", 1, nullptr, 0 }, { "response-threads", 1, nullptr, 0 }, { "rpc-events-before-wakeup", 1, nullptr, 0 }, @@ -415,10 +417,11 @@ App::get_options() LONGOPT_DISTRIBUTOR_STRIPES, LONGOPT_DOCUMENTS, LONGOPT_FLIP_NODES, + LONGOPT_GROUPS, LONGOPT_INDEXING_SEQUENCER, LONGOPT_MAX_PENDING, LONGOPT_MODE, - LONGOPT_NODES, + LONGOPT_NODES_PER_GROUP, LONGOPT_REDUNDANCY, LONGOPT_RESPONSE_THREADS, LONGOPT_RPC_EVENTS_BEFORE_WAKEUP, @@ -449,6 +452,9 @@ App::get_options() case LONGOPT_FLIP_NODES: _bm_params.set_flip_nodes(atoi(opt_argument)); break; + case LONGOPT_GROUPS: + _bm_params.set_groups(atoi(opt_argument)); + break; case LONGOPT_INDEXING_SEQUENCER: _bm_params.set_indexing_sequencer(opt_argument); break; @@ -461,8 +467,8 @@ App::get_options() std::cerr << "Unknown mode name " << opt_argument << std::endl; } break; - case LONGOPT_NODES: - _bm_params.set_num_nodes(atoi(opt_argument)); + case LONGOPT_NODES_PER_GROUP: + _bm_params.set_nodes_per_group(atoi(opt_argument)); break; case LONGOPT_REDUNDANCY: _bm_params.set_redundancy(atoi(opt_argument)); |