aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorHenning Baldersheim <balder@yahoo-inc.com>2023-09-05 14:12:36 +0000
committerHenning Baldersheim <balder@yahoo-inc.com>2023-09-05 14:12:36 +0000
commitce1350673a2d345cb600ba58895daefd42e3766e (patch)
tree5636ec568f9db7696ddb37f50d3c617cdb443234
parent20039e877fa36ce2c38e94823a07f4cdb5acc970 (diff)
Make modification evident by renaming entry to set_entry
-rw-r--r--storage/src/tests/distributor/statecheckerstest.cpp2
-rw-r--r--storage/src/vespa/storage/distributor/idealstatemanager.cpp6
-rw-r--r--storage/src/vespa/storage/distributor/statechecker.h2
3 files changed, 5 insertions, 5 deletions
diff --git a/storage/src/tests/distributor/statecheckerstest.cpp b/storage/src/tests/distributor/statecheckerstest.cpp
index 41fd8e2a48a..c249395ca50 100644
--- a/storage/src/tests/distributor/statecheckerstest.cpp
+++ b/storage/src/tests/distributor/statecheckerstest.cpp
@@ -93,7 +93,7 @@ struct StateCheckersTest : Test, DistributorStripeTestUtil {
// Run checking only on this bucketid, but include all buckets
// owned by it or owners of it, so we can detect inconsistent split.
if (entry.getBucketId() == c.getBucketId()) {
- c.entry(entry);
+ c.set_entry(entry);
StateChecker::Result result(checker.check(c));
IdealStateOperation::UP op(result.createOperation());
diff --git a/storage/src/vespa/storage/distributor/idealstatemanager.cpp b/storage/src/vespa/storage/distributor/idealstatemanager.cpp
index 8141afd3dbf..59dbecc4397 100644
--- a/storage/src/vespa/storage/distributor/idealstatemanager.cpp
+++ b/storage/src/vespa/storage/distributor/idealstatemanager.cpp
@@ -117,7 +117,7 @@ IdealStateManager::generateHighestPriority(const document::Bucket& bucket, NodeM
}
LOG(spam, "Checking bucket %s", e->toString().c_str());
- c.entry(*e);
+ c.set_entry(*e);
verify_only_live_nodes_in_context(c);
return runStateCheckers(c);
}
@@ -143,7 +143,7 @@ IdealStateManager::generateInterceptingSplit(BucketSpace bucketSpace, const Buck
document::Bucket bucket(bucketSpace, e.getBucketId());
auto& distributorBucketSpace = _op_ctx.bucket_space_repo().get(bucket.getBucketSpace());
StateChecker::Context c(node_context(), operation_context(), distributorBucketSpace, statsTracker, bucket);
- c.entry(e);
+ c.set_entry(e);
IdealStateOperation::UP operation(_splitBucketStateChecker->check(c).createOperation());
if (operation.get()) {
@@ -175,7 +175,7 @@ IdealStateManager::generateAll(const document::Bucket &bucket, NodeMaintenanceSt
const BucketDatabase::Entry* e(c.getEntryForPrimaryBucket());
std::vector<MaintenanceOperation::SP> operations;
if (e) {
- c.entry(*e);
+ c.set_entry(*e);
} else {
return operations;
}
diff --git a/storage/src/vespa/storage/distributor/statechecker.h b/storage/src/vespa/storage/distributor/statechecker.h
index 64998ca6c5f..3635e025a21 100644
--- a/storage/src/vespa/storage/distributor/statechecker.h
+++ b/storage/src/vespa/storage/distributor/statechecker.h
@@ -91,7 +91,7 @@ public:
const BucketDatabase::Entry* getEntryForPrimaryBucket() const;
const BucketDatabase::Entry & entry() const noexcept { return _entry; }
- void entry(const BucketDatabase::Entry & e) { _entry = e; }
+ void set_entry(const BucketDatabase::Entry & e) { _entry = e; }
private:
BucketDatabase::Entry _entry;
};