diff options
author | Jamie Anderson <jamie.anderson@mongodb.com> | 2021-05-06 19:48:35 +0000 |
---|---|---|
committer | Evergreen Agent <no-reply@evergreen.mongodb.com> | 2021-05-14 00:46:31 +0000 |
commit | 5752dacbc3ceee2efac6efff8f57ba2ec7dc3a55 (patch) | |
tree | ff74d40f14d54f9682502f668a37af40c69e10d9 /src/mongo/db/s/collection_metadata.cpp | |
parent | 310b02cfa32df40d2c31d9f8c5852ae2e66b7d1e (diff) | |
download | mongo-5752dacbc3ceee2efac6efff8f57ba2ec7dc3a55.tar.gz |
SERVER-56726: Rename resharding coordinator enums to reflect the delineation between committing and aborting
Diffstat (limited to 'src/mongo/db/s/collection_metadata.cpp')
-rw-r--r-- | src/mongo/db/s/collection_metadata.cpp | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/src/mongo/db/s/collection_metadata.cpp b/src/mongo/db/s/collection_metadata.cpp index 518f5405085..c96a4848842 100644 --- a/src/mongo/db/s/collection_metadata.cpp +++ b/src/mongo/db/s/collection_metadata.cpp @@ -73,9 +73,9 @@ boost::optional<ShardKeyPattern> CollectionMetadata::getReshardingKeyIfShouldFor case CoordinatorStateEnum::kUnused: case CoordinatorStateEnum::kInitializing: case CoordinatorStateEnum::kBlockingWrites: - case CoordinatorStateEnum::kDecisionPersisted: + case CoordinatorStateEnum::kAborting: + case CoordinatorStateEnum::kCommitting: case CoordinatorStateEnum::kDone: - case CoordinatorStateEnum::kError: return boost::none; case CoordinatorStateEnum::kPreparingToDonate: case CoordinatorStateEnum::kCloning: @@ -121,10 +121,11 @@ bool CollectionMetadata::disallowWritesForResharding(const UUID& currentCollecti case CoordinatorStateEnum::kBlockingWrites: // Only return true if this is also the donor shard. return reshardingFields->getDonorFields() != boost::none; - case CoordinatorStateEnum::kDecisionPersisted: + case CoordinatorStateEnum::kAborting: + return false; + case CoordinatorStateEnum::kCommitting: break; case CoordinatorStateEnum::kDone: - case CoordinatorStateEnum::kError: return false; } |