Merge pull request #28062 from vespa-engine/vekterli/post-review-changes

Minor post-review changes

7 files changed, 15 insertions, 15 deletions

diff --git a/storage/src/tests/distributor/simplemaintenancescannertest.cpp b/storage/src/tests/distributor/simplemaintenancescannertest.cpp
index b5dc72d995b..3d3c58ba842 100644
--- a/storage/src/tests/distributor/simplemaintenancescannertest.cpp
+++ b/storage/src/tests/distributor/simplemaintenancescannertest.cpp
@@ -82,7 +82,7 @@ TEST_F(SimpleMaintenanceScannerTest, prioritize_single_bucket) {
 TEST_F(SimpleMaintenanceScannerTest, prioritize_single_bucket_alt_bucket_space) {
     document::BucketSpace bucketSpace(4);
     _bucketSpaceRepo->add(bucketSpace, std::make_unique<DistributorBucketSpace>());
-    _scanner->reset();
+    (void)_scanner->fetch_and_reset();
     addBucketToDb(bucketSpace, 1);
     std::string expected("PrioritizedBucket(Bucket(BucketSpace(0x0000000000000004), BucketId(0x4000000000000001)), pri VERY_HIGH)\n");
 
@@ -148,7 +148,7 @@ TEST_F(SimpleMaintenanceScannerTest, reset) {
     ASSERT_TRUE(scanEntireDatabase(0));
     EXPECT_EQ(expected, _priorityDb->toString());
 
-    _scanner->reset();
+    (void)_scanner->fetch_and_reset();
     ASSERT_TRUE(scanEntireDatabase(3));
 
     expected = "PrioritizedBucket(Bucket(BucketSpace(0x0000000000000001), BucketId(0x4000000000000001)), pri VERY_HIGH)\n"
@@ -180,7 +180,7 @@ TEST_F(SimpleMaintenanceScannerTest, pending_maintenance_operation_statistics) {
         EXPECT_EQ(expected, stringifyGlobalPendingStats(stats));
     }
 
-    _scanner->reset();
+    (void)_scanner->fetch_and_reset();
     {
         const auto & stats = _scanner->getPendingMaintenanceStats();
         EXPECT_EQ(expectedEmpty, stringifyGlobalPendingStats(stats));
@@ -301,7 +301,7 @@ TEST_F(SimpleMaintenanceScannerTest, merge_pending_maintenance_stats) {
 TEST_F(SimpleMaintenanceScannerTest, empty_bucket_db_is_immediately_done_by_default) {
     auto res = _scanner->scanNext();
     EXPECT_TRUE(res.isDone());
-    _scanner->reset();
+    (void)_scanner->fetch_and_reset();
     res = _scanner->scanNext();
     EXPECT_TRUE(res.isDone());
 }
diff --git a/storage/src/vespa/storage/distributor/distributor_stripe.cpp b/storage/src/vespa/storage/distributor/distributor_stripe.cpp
index 37d81f45ac1..b686c6bc80c 100644
--- a/storage/src/vespa/storage/distributor/distributor_stripe.cpp
+++ b/storage/src/vespa/storage/distributor/distributor_stripe.cpp
@@ -314,7 +314,7 @@ DistributorStripe::enterRecoveryMode()
 {
     LOG(debug, "Entering recovery mode");
     _schedulingMode = MaintenanceScheduler::RECOVERY_SCHEDULING_MODE;
-    _scanner->reset(); // Just drop accumulated stat on the floor.
+    (void)_scanner->fetch_and_reset(); // Just drop accumulated stats on the floor.
     // We enter recovery mode due to cluster state or distribution config changes.
     // Until we have completed a new DB scan round, we don't know the state of our
     // newly owned buckets and must not report stats for these out to the cluster
@@ -643,7 +643,7 @@ DistributorStripe::updateInternalMetricsForCompletedScan()
 
     _bucketDBMetricUpdater.completeRound();
     _bucketDbStats = _bucketDBMetricUpdater.getLastCompleteStats();
-    _maintenanceStats = _scanner->reset();
+    _maintenanceStats = _scanner->fetch_and_reset();
     auto new_space_stats = toBucketSpacesStats(_maintenanceStats.perNodeStats);
     if (merge_no_longer_pending_edge(_bucketSpacesStats, new_space_stats)) {
         _must_send_updated_host_info = true;
diff --git a/storage/src/vespa/storage/distributor/idealstatemetricsset.cpp b/storage/src/vespa/storage/distributor/idealstatemetricsset.cpp
index d50b2004bf2..ea345176dd0 100644
--- a/storage/src/vespa/storage/distributor/idealstatemetricsset.cpp
+++ b/storage/src/vespa/storage/distributor/idealstatemetricsset.cpp
@@ -134,7 +134,7 @@ IdealStateMetricSet::IdealStateMetricSet()
 
 IdealStateMetricSet::~IdealStateMetricSet() = default;
 
-void IdealStateMetricSet::setPendingOperations(vespalib::ConstArrayRef<uint64_t> newMetrics) {
+void IdealStateMetricSet::setPendingOperations(std::span<uint64_t, IdealStateOperation::OPERATION_COUNT> newMetrics) {
     for (uint32_t i = 0; i < IdealStateOperation::OPERATION_COUNT; i++) {
         operations[i]->pending.set(newMetrics[i]);
     }
diff --git a/storage/src/vespa/storage/distributor/idealstatemetricsset.h b/storage/src/vespa/storage/distributor/idealstatemetricsset.h
index 0bbc13d061a..e51e58ba3a4 100644
--- a/storage/src/vespa/storage/distributor/idealstatemetricsset.h
+++ b/storage/src/vespa/storage/distributor/idealstatemetricsset.h
@@ -5,7 +5,7 @@
 #include <vespa/metrics/valuemetric.h>
 #include <vespa/metrics/countmetric.h>
 #include <vespa/storage/distributor/operations/idealstate/idealstateoperation.h>
-#include <vespa/vespalib/util/arrayref.h>
+#include <span>
 
 namespace storage::distributor {
 
@@ -62,7 +62,7 @@ public:
     IdealStateMetricSet();
     ~IdealStateMetricSet() override;
 
-    void setPendingOperations(vespalib::ConstArrayRef<uint64_t> newMetrics);
+    void setPendingOperations(std::span<uint64_t, IdealStateOperation::OPERATION_COUNT> newMetrics);
 };
 
 } // storage::distributor
diff --git a/storage/src/vespa/storage/distributor/maintenance/simplemaintenancescanner.cpp b/storage/src/vespa/storage/distributor/maintenance/simplemaintenancescanner.cpp
index e0c1abaaffa..86399c1b620 100644
--- a/storage/src/vespa/storage/distributor/maintenance/simplemaintenancescanner.cpp
+++ b/storage/src/vespa/storage/distributor/maintenance/simplemaintenancescanner.cpp
@@ -49,7 +49,7 @@ SimpleMaintenanceScanner::PendingMaintenanceStats &
 SimpleMaintenanceScanner::PendingMaintenanceStats::operator = (PendingMaintenanceStats &&) noexcept = default;
 
 SimpleMaintenanceScanner::PendingMaintenanceStats
-SimpleMaintenanceScanner::PendingMaintenanceStats::reset() {
+SimpleMaintenanceScanner::PendingMaintenanceStats::fetch_and_reset() {
     PendingMaintenanceStats prev = std::move(*this);
     global = GlobalMaintenanceStats();
     perNodeStats.reset(prev.perNodeStats.numNodes());
@@ -78,11 +78,11 @@ SimpleMaintenanceScanner::scanNext()
 }
 
 SimpleMaintenanceScanner::PendingMaintenanceStats
-SimpleMaintenanceScanner::reset()
+SimpleMaintenanceScanner::fetch_and_reset()
 {
     _bucketCursor = document::BucketId();
     _bucketSpaceItr = _bucketSpaceRepo.begin();
-    return _pendingMaintenance.reset();
+    return _pendingMaintenance.fetch_and_reset();
 }
 
 void
diff --git a/storage/src/vespa/storage/distributor/maintenance/simplemaintenancescanner.h b/storage/src/vespa/storage/distributor/maintenance/simplemaintenancescanner.h
index 35b022c7af7..3d1a57a6422 100644
--- a/storage/src/vespa/storage/distributor/maintenance/simplemaintenancescanner.h
+++ b/storage/src/vespa/storage/distributor/maintenance/simplemaintenancescanner.h
@@ -29,7 +29,7 @@ public:
         PendingMaintenanceStats(PendingMaintenanceStats &&) noexcept;
         PendingMaintenanceStats &operator = (PendingMaintenanceStats &&) noexcept;
         ~PendingMaintenanceStats();
-        PendingMaintenanceStats reset();
+        [[nodiscard]] PendingMaintenanceStats fetch_and_reset();
         GlobalMaintenanceStats      global;
         NodeMaintenanceStatsTracker perNodeStats;
 
@@ -53,7 +53,7 @@ public:
     ~SimpleMaintenanceScanner() override;
 
     ScanResult scanNext() override;
-    PendingMaintenanceStats reset();
+    [[nodiscard]] PendingMaintenanceStats fetch_and_reset();
 
     // TODO: move out into own interface!
     void prioritizeBucket(const document::Bucket &id);
diff --git a/storage/src/vespa/storage/distributor/messagetracker.cpp b/storage/src/vespa/storage/distributor/messagetracker.cpp
index 28fbaad4619..842238aa24c 100644
--- a/storage/src/vespa/storage/distributor/messagetracker.cpp
+++ b/storage/src/vespa/storage/distributor/messagetracker.cpp
@@ -20,7 +20,7 @@ MessageTracker::~MessageTracker() = default;
 void
 MessageTracker::flushQueue(MessageSender& sender)
 {
-    _sentMessages.resize(_commandQueue.size());
+    _sentMessages.resize(_sentMessages.size() + _commandQueue.size());
     for (const auto & toSend : _commandQueue) {
         toSend._msg->setAddress(api::StorageMessageAddress::create(_cluster_ctx.cluster_name_ptr(), lib::NodeType::STORAGE, toSend._target));
         _sentMessages[toSend._msg->getMsgId()] = toSend._target;