Track outdated nodes per bucket space.

Use distributor bucket space to get distribution when detecting outdated nodes.

1 files changed, 9 insertions, 8 deletions

diff --git a/storage/src/tests/distributor/bucketdbupdatertest.cpp b/storage/src/tests/distributor/bucketdbupdatertest.cpp
index 363065be65c..e792eb5a48d 100644
--- a/storage/src/tests/distributor/bucketdbupdatertest.cpp
+++ b/storage/src/tests/distributor/bucketdbupdatertest.cpp
@@ -157,6 +157,8 @@ protected:
     }
 
 public:
+    using OutdatedNodes = std::unordered_set<uint16_t>;
+    using OutdatedNodesMap = std::unordered_map<document::BucketSpace, OutdatedNodes, document::BucketSpace::hash>;
     void setUp() override {
         createLinks();
     };
@@ -539,9 +541,9 @@ public:
             ClusterInformation::CSP clusterInfo(
                     owner.createClusterInfo(oldClusterState));
 
-            std::unordered_set<uint16_t> outdatedNodes;
+            OutdatedNodesMap outdatedNodesMap;
             state = PendingClusterState::createForClusterStateChange(
-                    clock, clusterInfo, sender, owner.getBucketSpaceRepo(), cmd, outdatedNodes,
+                    clock, clusterInfo, sender, owner.getBucketSpaceRepo(), cmd, outdatedNodesMap,
                     api::Timestamp(1));
         }
 
@@ -552,7 +554,6 @@ public:
             ClusterInformation::CSP clusterInfo(
                     owner.createClusterInfo(oldClusterState));
 
-            std::unordered_set<uint16_t> outdatedNodes;
             state = PendingClusterState::createForDistributionChange(
                     clock, clusterInfo, sender, owner.getBucketSpaceRepo(), api::Timestamp(1));
         }
@@ -1640,10 +1641,10 @@ BucketDBUpdaterTest::testPendingClusterStateReceive()
 
     framework::defaultimplementation::FakeClock clock;
     ClusterInformation::CSP clusterInfo(createClusterInfo("cluster:d"));
-    std::unordered_set<uint16_t> outdatedNodes;
+    OutdatedNodesMap outdatedNodesMap;
     std::unique_ptr<PendingClusterState> state(
             PendingClusterState::createForClusterStateChange(
-                    clock, clusterInfo, sender, getBucketSpaceRepo(), cmd, outdatedNodes,
+                    clock, clusterInfo, sender, getBucketSpaceRepo(), cmd, outdatedNodesMap,
                     api::Timestamp(1)));
 
     CPPUNIT_ASSERT_EQUAL(3, (int)sender.commands.size());
@@ -1798,7 +1799,7 @@ BucketDBUpdaterTest::mergeBucketLists(
     framework::MilliSecTimer timer(clock);
 
     MessageSenderStub sender;
-    std::unordered_set<uint16_t> outdatedNodes;
+    OutdatedNodesMap outdatedNodesMap;
 
     {
         auto cmd(std::make_shared<api::SetSystemStateCommand>(oldState));
@@ -1808,7 +1809,7 @@ BucketDBUpdaterTest::mergeBucketLists(
         ClusterInformation::CSP clusterInfo(createClusterInfo("cluster:d"));
         std::unique_ptr<PendingClusterState> state(
                 PendingClusterState::createForClusterStateChange(
-                        clock, clusterInfo, sender, getBucketSpaceRepo(), cmd, outdatedNodes,
+                        clock, clusterInfo, sender, getBucketSpaceRepo(), cmd, outdatedNodesMap,
                         beforeTime));
 
         parseInputData(existingData, beforeTime, *state, includeBucketInfo);
@@ -1827,7 +1828,7 @@ BucketDBUpdaterTest::mergeBucketLists(
         ClusterInformation::CSP clusterInfo(createClusterInfo(oldState.toString()));
         std::unique_ptr<PendingClusterState> state(
                 PendingClusterState::createForClusterStateChange(
-                        clock, clusterInfo, sender, getBucketSpaceRepo(), cmd, outdatedNodes,
+                        clock, clusterInfo, sender, getBucketSpaceRepo(), cmd, outdatedNodesMap,
                         afterTime));
 
         parseInputData(newData, afterTime, *state, includeBucketInfo);