diff options
Diffstat (limited to 'storage/src/tests/distributor')
-rw-r--r-- | storage/src/tests/distributor/distributortest.cpp | 17 | ||||
-rw-r--r-- | storage/src/tests/distributor/nodemaintenancestatstrackertest.cpp | 28 |
2 files changed, 28 insertions, 17 deletions
diff --git a/storage/src/tests/distributor/distributortest.cpp b/storage/src/tests/distributor/distributortest.cpp index cc1c9df0509..33549226b98 100644 --- a/storage/src/tests/distributor/distributortest.cpp +++ b/storage/src/tests/distributor/distributortest.cpp @@ -98,7 +98,7 @@ protected: void entering_recovery_mode_resets_bucket_space_stats(); void leaving_recovery_mode_immediately_sends_getnodestate_replies(); - void assertBucketSpaceStats(size_t expBucketPending, uint16_t node, const vespalib::string &bucketSpace, + void assertBucketSpaceStats(size_t expBucketPending, size_t expBucketTotal, uint16_t node, const vespalib::string &bucketSpace, const BucketSpacesStatsProvider::PerNodeBucketSpacesStats &stats); std::vector<document::BucketSpace> _bucketSpaces; @@ -639,28 +639,31 @@ Distributor_Test::mergeStatsAreAccumulatedDuringDatabaseIteration() NodeMaintenanceStats wanted; wanted.syncing = 1; wanted.copyingOut = 2; + wanted.total = 3; CPPUNIT_ASSERT_EQUAL(wanted, stats.perNodeStats.forNode(0, makeBucketSpace())); } { NodeMaintenanceStats wanted; wanted.movingOut = 1; + wanted.total = 1; CPPUNIT_ASSERT_EQUAL(wanted, stats.perNodeStats.forNode(1, makeBucketSpace())); } { NodeMaintenanceStats wanted; wanted.syncing = 1; wanted.copyingIn = 2; + wanted.total = 1; CPPUNIT_ASSERT_EQUAL(wanted, stats.perNodeStats.forNode(2, makeBucketSpace())); } auto bucketStats = _distributor->getBucketSpacesStats(); CPPUNIT_ASSERT_EQUAL(static_cast<size_t>(3), bucketStats.size()); - assertBucketSpaceStats(1, 0, "default", bucketStats); - assertBucketSpaceStats(0, 1, "default", bucketStats); - assertBucketSpaceStats(3, 2, "default", bucketStats); + assertBucketSpaceStats(1, 3, 0, "default", bucketStats); + assertBucketSpaceStats(0, 1, 1, "default", bucketStats); + assertBucketSpaceStats(3, 1, 2, "default", bucketStats); } void -Distributor_Test::assertBucketSpaceStats(size_t expBucketPending, uint16_t node, const vespalib::string &bucketSpace, +Distributor_Test::assertBucketSpaceStats(size_t expBucketPending, size_t expBucketTotal, uint16_t node, const vespalib::string &bucketSpace, const BucketSpacesStatsProvider::PerNodeBucketSpacesStats &stats) { auto nodeItr = stats.find(node); @@ -669,7 +672,7 @@ Distributor_Test::assertBucketSpaceStats(size_t expBucketPending, uint16_t node, auto bucketSpaceItr = nodeItr->second.find(bucketSpace); CPPUNIT_ASSERT(bucketSpaceItr != nodeItr->second.end()); CPPUNIT_ASSERT(bucketSpaceItr->second.valid()); - CPPUNIT_ASSERT_EQUAL(static_cast<size_t>(0), bucketSpaceItr->second.bucketsTotal()); + CPPUNIT_ASSERT_EQUAL(expBucketTotal, bucketSpaceItr->second.bucketsTotal()); CPPUNIT_ASSERT_EQUAL(expBucketPending, bucketSpaceItr->second.bucketsPending()); } @@ -694,11 +697,13 @@ Distributor_Test::statsGeneratedForPreemptedOperations() { NodeMaintenanceStats wanted; wanted.syncing = 1; + wanted.total = 1; CPPUNIT_ASSERT_EQUAL(wanted, stats.perNodeStats.forNode(0, makeBucketSpace())); } { NodeMaintenanceStats wanted; wanted.syncing = 1; + wanted.total = 1; CPPUNIT_ASSERT_EQUAL(wanted, stats.perNodeStats.forNode(1, makeBucketSpace())); } } diff --git a/storage/src/tests/distributor/nodemaintenancestatstrackertest.cpp b/storage/src/tests/distributor/nodemaintenancestatstrackertest.cpp index 5663db78e12..ae0d0bc4478 100644 --- a/storage/src/tests/distributor/nodemaintenancestatstrackertest.cpp +++ b/storage/src/tests/distributor/nodemaintenancestatstrackertest.cpp @@ -26,7 +26,7 @@ class NodeMaintenanceStatsTrackerTest : public CppUnit::TestFixture void statsAreTrackedPerNode(); void statsAreTrackedPerBucketSpace(); void assertEmptyBucketStats(BucketSpace bucketSpace, const NodeMaintenanceStatsTracker& tracker); - void assertBucketStats(uint64_t expMovingOut, uint64_t expSyncing, uint64_t expCopyingIn, uint64_t expCopyingOut, + void assertBucketStats(uint64_t expMovingOut, uint64_t expSyncing, uint64_t expCopyingIn, uint64_t expCopyingOut, uint64_t expTotal, BucketSpace bucketSpace, const NodeMaintenanceStatsTracker& tracker); }; @@ -112,25 +112,30 @@ NodeMaintenanceStatsTrackerTest::statsAreTrackedPerBucketSpace() BucketSpace fooSpace(3); BucketSpace barSpace(5); + tracker.incTotal(0, fooSpace); tracker.incMovingOut(0, fooSpace); - assertBucketStats(1, 0, 0, 0, fooSpace, tracker); + assertBucketStats(1, 0, 0, 0, 1, fooSpace, tracker); assertEmptyBucketStats(barSpace, tracker); + tracker.incTotal(0, barSpace); tracker.incMovingOut(0, barSpace); - assertBucketStats(1, 0, 0, 0, fooSpace, tracker); - assertBucketStats(1, 0, 0, 0, barSpace, tracker); + assertBucketStats(1, 0, 0, 0, 1, fooSpace, tracker); + assertBucketStats(1, 0, 0, 0, 1, barSpace, tracker); + tracker.incTotal(0, fooSpace); tracker.incSyncing(0, fooSpace); - assertBucketStats(1, 1, 0, 0, fooSpace, tracker); - assertBucketStats(1, 0, 0, 0, barSpace, tracker); + assertBucketStats(1, 1, 0, 0, 2, fooSpace, tracker); + assertBucketStats(1, 0, 0, 0, 1, barSpace, tracker); + tracker.incTotal(0, fooSpace); tracker.incCopyingIn(0, fooSpace); - assertBucketStats(1, 1, 1, 0, fooSpace, tracker); - assertBucketStats(1, 0, 0, 0, barSpace, tracker); + assertBucketStats(1, 1, 1, 0, 3, fooSpace, tracker); + assertBucketStats(1, 0, 0, 0, 1, barSpace, tracker); + tracker.incTotal(0, fooSpace); tracker.incCopyingOut(0, fooSpace); - assertBucketStats(1, 1, 1, 1, fooSpace, tracker); - assertBucketStats(1, 0, 0, 0, barSpace, tracker); + assertBucketStats(1, 1, 1, 1, 4, fooSpace, tracker); + assertBucketStats(1, 0, 0, 0, 1, barSpace, tracker); } void @@ -146,10 +151,11 @@ NodeMaintenanceStatsTrackerTest::assertBucketStats(uint64_t expMovingOut, uint64_t expSyncing, uint64_t expCopyingIn, uint64_t expCopyingOut, + uint64_t expTotal, BucketSpace bucketSpace, const NodeMaintenanceStatsTracker& tracker) { - NodeMaintenanceStats expStats(expMovingOut, expSyncing, expCopyingIn, expCopyingOut); + NodeMaintenanceStats expStats(expMovingOut, expSyncing, expCopyingIn, expCopyingOut, expTotal); CPPUNIT_ASSERT_EQUAL(expStats, tracker.forNode(0, bucketSpace)); } |