From e69fa91e45bef0c1dec4fd3c6db5efd24f0de4f3 Mon Sep 17 00:00:00 2001 From: Tor Egge Date: Mon, 30 Nov 2020 17:59:51 +0100 Subject: Avoid creating buckets via SPI when using distributor. --- .../apps/vespa-feed-bm/document_api_message_bus_bm_feed_handler.cpp | 6 ------ .../apps/vespa-feed-bm/document_api_message_bus_bm_feed_handler.h | 1 - searchcore/src/apps/vespa-feed-bm/i_bm_feed_handler.h | 1 - searchcore/src/apps/vespa-feed-bm/spi_bm_feed_handler.cpp | 6 ------ searchcore/src/apps/vespa-feed-bm/spi_bm_feed_handler.h | 1 - .../src/apps/vespa-feed-bm/storage_api_chain_bm_feed_handler.cpp | 6 ------ .../src/apps/vespa-feed-bm/storage_api_chain_bm_feed_handler.h | 1 - .../apps/vespa-feed-bm/storage_api_message_bus_bm_feed_handler.cpp | 6 ------ .../apps/vespa-feed-bm/storage_api_message_bus_bm_feed_handler.h | 1 - .../src/apps/vespa-feed-bm/storage_api_rpc_bm_feed_handler.cpp | 6 ------ searchcore/src/apps/vespa-feed-bm/storage_api_rpc_bm_feed_handler.h | 1 - searchcore/src/apps/vespa-feed-bm/vespa_feed_bm.cpp | 2 +- 12 files changed, 1 insertion(+), 37 deletions(-) (limited to 'searchcore') diff --git a/searchcore/src/apps/vespa-feed-bm/document_api_message_bus_bm_feed_handler.cpp b/searchcore/src/apps/vespa-feed-bm/document_api_message_bus_bm_feed_handler.cpp index a1429a1c572..38c8490de69 100644 --- a/searchcore/src/apps/vespa-feed-bm/document_api_message_bus_bm_feed_handler.cpp +++ b/searchcore/src/apps/vespa-feed-bm/document_api_message_bus_bm_feed_handler.cpp @@ -85,12 +85,6 @@ DocumentApiMessageBusBmFeedHandler::get_name() const return _name; } -bool -DocumentApiMessageBusBmFeedHandler::manages_buckets() const -{ - return true; -} - bool DocumentApiMessageBusBmFeedHandler::manages_timestamp() const { diff --git a/searchcore/src/apps/vespa-feed-bm/document_api_message_bus_bm_feed_handler.h b/searchcore/src/apps/vespa-feed-bm/document_api_message_bus_bm_feed_handler.h index 52e0b89007f..c71bb113c5b 100644 --- a/searchcore/src/apps/vespa-feed-bm/document_api_message_bus_bm_feed_handler.h +++ b/searchcore/src/apps/vespa-feed-bm/document_api_message_bus_bm_feed_handler.h @@ -34,7 +34,6 @@ public: void attach_bucket_info_queue(PendingTracker &tracker) override; uint32_t get_error_count() const override; const vespalib::string &get_name() const override; - bool manages_buckets() const override; bool manages_timestamp() const override; }; diff --git a/searchcore/src/apps/vespa-feed-bm/i_bm_feed_handler.h b/searchcore/src/apps/vespa-feed-bm/i_bm_feed_handler.h index f359e5a7fa2..26cbf27b455 100644 --- a/searchcore/src/apps/vespa-feed-bm/i_bm_feed_handler.h +++ b/searchcore/src/apps/vespa-feed-bm/i_bm_feed_handler.h @@ -31,7 +31,6 @@ public: virtual void attach_bucket_info_queue(PendingTracker& tracker) = 0; virtual uint32_t get_error_count() const = 0; virtual const vespalib::string &get_name() const = 0; - virtual bool manages_buckets() const = 0; virtual bool manages_timestamp() const = 0; }; diff --git a/searchcore/src/apps/vespa-feed-bm/spi_bm_feed_handler.cpp b/searchcore/src/apps/vespa-feed-bm/spi_bm_feed_handler.cpp index daebc8a7a47..11149eecb3f 100644 --- a/searchcore/src/apps/vespa-feed-bm/spi_bm_feed_handler.cpp +++ b/searchcore/src/apps/vespa-feed-bm/spi_bm_feed_handler.cpp @@ -149,12 +149,6 @@ SpiBmFeedHandler::get_name() const return _name; } -bool -SpiBmFeedHandler::manages_buckets() const -{ - return false; -} - bool SpiBmFeedHandler::manages_timestamp() const { diff --git a/searchcore/src/apps/vespa-feed-bm/spi_bm_feed_handler.h b/searchcore/src/apps/vespa-feed-bm/spi_bm_feed_handler.h index f6cbcc3b954..a78aa06628b 100644 --- a/searchcore/src/apps/vespa-feed-bm/spi_bm_feed_handler.h +++ b/searchcore/src/apps/vespa-feed-bm/spi_bm_feed_handler.h @@ -31,7 +31,6 @@ public: void attach_bucket_info_queue(PendingTracker &tracker) override; uint32_t get_error_count() const override; const vespalib::string &get_name() const override; - bool manages_buckets() const override; bool manages_timestamp() const override; }; diff --git a/searchcore/src/apps/vespa-feed-bm/storage_api_chain_bm_feed_handler.cpp b/searchcore/src/apps/vespa-feed-bm/storage_api_chain_bm_feed_handler.cpp index 8cde6a7a25d..82cf2df065f 100644 --- a/searchcore/src/apps/vespa-feed-bm/storage_api_chain_bm_feed_handler.cpp +++ b/searchcore/src/apps/vespa-feed-bm/storage_api_chain_bm_feed_handler.cpp @@ -99,12 +99,6 @@ StorageApiChainBmFeedHandler::get_name() const return _name; } -bool -StorageApiChainBmFeedHandler::manages_buckets() const -{ - return _distributor; -} - bool StorageApiChainBmFeedHandler::manages_timestamp() const { diff --git a/searchcore/src/apps/vespa-feed-bm/storage_api_chain_bm_feed_handler.h b/searchcore/src/apps/vespa-feed-bm/storage_api_chain_bm_feed_handler.h index 689b4c20203..0c4b715122e 100644 --- a/searchcore/src/apps/vespa-feed-bm/storage_api_chain_bm_feed_handler.h +++ b/searchcore/src/apps/vespa-feed-bm/storage_api_chain_bm_feed_handler.h @@ -32,7 +32,6 @@ public: void attach_bucket_info_queue(PendingTracker &tracker) override; uint32_t get_error_count() const override; const vespalib::string &get_name() const override; - bool manages_buckets() const override; bool manages_timestamp() const override; }; diff --git a/searchcore/src/apps/vespa-feed-bm/storage_api_message_bus_bm_feed_handler.cpp b/searchcore/src/apps/vespa-feed-bm/storage_api_message_bus_bm_feed_handler.cpp index dcf91ff1901..f63a8e33cc0 100644 --- a/searchcore/src/apps/vespa-feed-bm/storage_api_message_bus_bm_feed_handler.cpp +++ b/searchcore/src/apps/vespa-feed-bm/storage_api_message_bus_bm_feed_handler.cpp @@ -85,12 +85,6 @@ StorageApiMessageBusBmFeedHandler::get_name() const return _name; } -bool -StorageApiMessageBusBmFeedHandler::manages_buckets() const -{ - return _distributor; -} - bool StorageApiMessageBusBmFeedHandler::manages_timestamp() const { diff --git a/searchcore/src/apps/vespa-feed-bm/storage_api_message_bus_bm_feed_handler.h b/searchcore/src/apps/vespa-feed-bm/storage_api_message_bus_bm_feed_handler.h index 6925053ad43..2aafd0c6830 100644 --- a/searchcore/src/apps/vespa-feed-bm/storage_api_message_bus_bm_feed_handler.h +++ b/searchcore/src/apps/vespa-feed-bm/storage_api_message_bus_bm_feed_handler.h @@ -38,7 +38,6 @@ public: void attach_bucket_info_queue(PendingTracker &tracker) override; uint32_t get_error_count() const override; const vespalib::string &get_name() const override; - bool manages_buckets() const override; bool manages_timestamp() const override; }; diff --git a/searchcore/src/apps/vespa-feed-bm/storage_api_rpc_bm_feed_handler.cpp b/searchcore/src/apps/vespa-feed-bm/storage_api_rpc_bm_feed_handler.cpp index d37b6ee9f41..04d49bba0a3 100644 --- a/searchcore/src/apps/vespa-feed-bm/storage_api_rpc_bm_feed_handler.cpp +++ b/searchcore/src/apps/vespa-feed-bm/storage_api_rpc_bm_feed_handler.cpp @@ -134,12 +134,6 @@ StorageApiRpcBmFeedHandler::get_name() const return _name; } -bool -StorageApiRpcBmFeedHandler::manages_buckets() const -{ - return _distributor; -} - bool StorageApiRpcBmFeedHandler::manages_timestamp() const { diff --git a/searchcore/src/apps/vespa-feed-bm/storage_api_rpc_bm_feed_handler.h b/searchcore/src/apps/vespa-feed-bm/storage_api_rpc_bm_feed_handler.h index ff38c24e167..5057d8889a5 100644 --- a/searchcore/src/apps/vespa-feed-bm/storage_api_rpc_bm_feed_handler.h +++ b/searchcore/src/apps/vespa-feed-bm/storage_api_rpc_bm_feed_handler.h @@ -47,7 +47,6 @@ public: void attach_bucket_info_queue(PendingTracker &tracker) override; uint32_t get_error_count() const override; const vespalib::string &get_name() const override; - bool manages_buckets() const override; bool manages_timestamp() const override; }; 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 5532abcc8ba..5a5f5cb46d6 100644 --- a/searchcore/src/apps/vespa-feed-bm/vespa_feed_bm.cpp +++ b/searchcore/src/apps/vespa-feed-bm/vespa_feed_bm.cpp @@ -1302,7 +1302,7 @@ void benchmark_async_spi(const BMParams &bm_params) LOG(info, "start initialize"); provider.initialize(); LOG(info, "create %u buckets", f.num_buckets()); - if (!f._feed_handler->manages_buckets()) { + if (!bm_params.needs_distributor()) { f.create_buckets(); } if (bm_params.needs_service_layer()) { -- cgit v1.2.3