Merge pull request #18221 from vespa-engine/geirst/simplify-get-active-ideal-state-operations

Only support legacy mode in getActiveIdealStateOperations().

2 files changed, 2 insertions, 23 deletions

diff --git a/storage/src/vespa/storage/distributor/distributor.cpp b/storage/src/vespa/storage/distributor/distributor.cpp
index be9ad1179fb..d6727299ee6 100644
--- a/storage/src/vespa/storage/distributor/distributor.cpp
+++ b/storage/src/vespa/storage/distributor/distributor.cpp
@@ -131,18 +131,6 @@ Distributor::getMetrics()
     return _use_legacy_mode ? *_metrics : _total_metrics->bucket_db_updater_metrics();
 }
 
-// TODO STRIPE remove
-DistributorStripe&
-Distributor::first_stripe() noexcept {
-    return *_stripes[0];
-}
-
-// TODO STRIPE remove
-const DistributorStripe&
-Distributor::first_stripe() const noexcept {
-    return *_stripes[0];
-}
-
 // TODO STRIPE figure out how to handle inspection functions used by tests when legacy mode no longer exists.
 //   All functions below that assert on _use_legacy_mode are only currently used by tests
 
@@ -772,13 +760,8 @@ Distributor::getReportContentType(const framework::HttpUrlPath& path) const
 std::string
 Distributor::getActiveIdealStateOperations() const
 {
-    // TODO STRIPE need to aggregate status responses _across_ stripes..!
-    if (_use_legacy_mode) {
-        return _stripe->getActiveIdealStateOperations();
-    } else {
-        auto guard = _stripe_accessor->rendezvous_and_hold_all();
-        return first_stripe().getActiveIdealStateOperations();
-    }
+    assert(_use_legacy_mode);
+    return _stripe->getActiveIdealStateOperations();
 }
 
 bool
diff --git a/storage/src/vespa/storage/distributor/distributor.h b/storage/src/vespa/storage/distributor/distributor.h
index 48ad061859f..756346277c9 100644
--- a/storage/src/vespa/storage/distributor/distributor.h
+++ b/storage/src/vespa/storage/distributor/distributor.h
@@ -129,10 +129,6 @@ private:
     friend class DistributorTestUtil;
     friend class MetricUpdateHook;
 
-    // TODO STRIPE remove
-    DistributorStripe& first_stripe() noexcept;
-    const DistributorStripe& first_stripe() const noexcept;
-
     void setNodeStateUp();
     bool handleMessage(const std::shared_ptr<api::StorageMessage>& msg);