Merge pull request #14683 from vespa-engine/geirst/support-multiple-rpc-targets-in-storage-api-over-rpc

Add support for multiple RPC targets per node when using Storage API …

1 files changed, 5 insertions, 3 deletions

diff --git a/searchcore/src/apps/vespa-feed-bm/bm_cluster_controller.cpp b/searchcore/src/apps/vespa-feed-bm/bm_cluster_controller.cpp
index 324f98625f3..15fbb2e2344 100644
--- a/searchcore/src/apps/vespa-feed-bm/bm_cluster_controller.cpp
+++ b/searchcore/src/apps/vespa-feed-bm/bm_cluster_controller.cpp
@@ -44,9 +44,11 @@ BmClusterController::set_cluster_up(bool distributor)
 {
     StorageMessageAddress storage_address("storage", distributor ? NodeType::DISTRIBUTOR : NodeType::STORAGE, 0);
     auto req = make_set_cluster_state_request();
-    auto target_resolver = std::make_unique<storage::rpc::CachingRpcTargetResolver>(_shared_rpc_resources.slobrok_mirror(), _shared_rpc_resources.target_factory());
-    auto target = target_resolver->resolve_rpc_target(storage_address);
-    target->_target->get()->InvokeSync(req, 10.0); // 10 seconds timeout
+    auto target_resolver = std::make_unique<storage::rpc::CachingRpcTargetResolver>(_shared_rpc_resources.slobrok_mirror(),
+                                                                                    _shared_rpc_resources.target_factory(), 1);
+    uint64_t fake_bucket_id = 0;
+    auto target = target_resolver->resolve_rpc_target(storage_address, fake_bucket_id);
+    target->get()->InvokeSync(req, 10.0); // 10 seconds timeout
     assert(!req->IsError());
     req->SubRef();
 }