Simplify state version checks by requiring exact version match

The existing state unification logic was likely to help ensure that
various distributor availability-states were treated as if they were
simply Up, but the distributor has not been able to even _be_ in other
available states than Up for many years. So it's effectively pointless.

Remove unification entirely and instead require both the distributor
and content node to be mutually in sync with the exact cluster state
version.

1 files changed, 5 insertions, 1 deletions

diff --git a/storage/src/tests/bucketdb/bucketmanagertest.cpp b/storage/src/tests/bucketdb/bucketmanagertest.cpp
index 6404dba7935..dc33bfd04e2 100644
--- a/storage/src/tests/bucketdb/bucketmanagertest.cpp
+++ b/storage/src/tests/bucketdb/bucketmanagertest.cpp
@@ -631,6 +631,10 @@ public:
         return std::make_shared<api::RequestBucketInfoCommand>(makeBucketSpace(), 0, *_state);
     }
 
+    auto createFullFetchCommand(const lib::ClusterState& explicit_state) const {
+        return std::make_shared<api::RequestBucketInfoCommand>(makeBucketSpace(), 0, explicit_state);
+    }
+
     auto createFullFetchCommandWithHash(vespalib::stringref hash) const {
         return std::make_shared<api::RequestBucketInfoCommand>(makeBucketSpace(), 0, *_state, hash);
     }
@@ -1271,7 +1275,7 @@ TEST_F(BucketManagerTest, bounce_request_on_state_change_barrier_not_reached) {
     _top->waitForMessage(api::MessageType::SETSYSTEMSTATE_REPLY, MESSAGE_WAIT_TIME);
     (void)_top->getRepliesOnce();
 
-    _top->sendDown(f.createFullFetchCommand());
+    _top->sendDown(f.createFullFetchCommand(new_state));
     replies = f.awaitAndGetReplies(1);
     {
         auto& reply = dynamic_cast<api::RequestBucketInfoReply&>(*replies[0]);