diff options
| author | mathisbessamdb <mathis.bessa@mongodb.com> | 2023-05-11 22:37:41 +0000 |
|---|---|---|
| committer | Evergreen Agent <no-reply@evergreen.mongodb.com> | 2023-05-12 00:29:01 +0000 |
| commit | 91d9967910ed5d2257074dfe3362b0b317a26cff (patch) | |
| tree | 20ead0d5cb211d277276aef8bddff123250a142b /src/mongo/db/catalog | |
| parent | f4b6a7cd809dba448f1c474f492556d0027e160d (diff) | |
| download | mongo-91d9967910ed5d2257074dfe3362b0b317a26cff.tar.gz | |
SERVER-68655 Change ReplicationCoordinator::canAcceptWritesForDatabase to take in DatabaseName obj
Diffstat (limited to 'src/mongo/db/catalog')
| -rw-r--r-- | src/mongo/db/catalog/drop_database.cpp | 8 | ||||
| -rw-r--r-- | src/mongo/db/catalog/drop_database_test.cpp | 4 | ||||
| -rw-r--r-- | src/mongo/db/catalog/rename_collection_test.cpp | 2 |
3 files changed, 7 insertions, 7 deletions
diff --git a/src/mongo/db/catalog/drop_database.cpp b/src/mongo/db/catalog/drop_database.cpp index 15dee02d730..05994b0faa7 100644 --- a/src/mongo/db/catalog/drop_database.cpp +++ b/src/mongo/db/catalog/drop_database.cpp @@ -71,8 +71,8 @@ Status _checkNssAndReplState(OperationContext* opCtx, Database* db, const Databa } auto replCoord = repl::ReplicationCoordinator::get(opCtx); - bool userInitiatedWritesAndNotPrimary = opCtx->writesAreReplicated() && - !replCoord->canAcceptWritesForDatabase(opCtx, dbName.toStringWithTenantId()); + bool userInitiatedWritesAndNotPrimary = + opCtx->writesAreReplicated() && !replCoord->canAcceptWritesForDatabase(opCtx, dbName); if (userInitiatedWritesAndNotPrimary) { return Status(ErrorCodes::NotWritablePrimary, @@ -439,8 +439,8 @@ Status _dropDatabase(OperationContext* opCtx, const DatabaseName& dbName, bool a << numCollectionsToDrop << " collection(s)."); } - bool userInitiatedWritesAndNotPrimary = opCtx->writesAreReplicated() && - !replCoord->canAcceptWritesForDatabase(opCtx, dbName.toStringWithTenantId()); + bool userInitiatedWritesAndNotPrimary = + opCtx->writesAreReplicated() && !replCoord->canAcceptWritesForDatabase(opCtx, dbName); if (userInitiatedWritesAndNotPrimary) { return Status(ErrorCodes::PrimarySteppedDown, diff --git a/src/mongo/db/catalog/drop_database_test.cpp b/src/mongo/db/catalog/drop_database_test.cpp index e81d03e002e..0cf234450bc 100644 --- a/src/mongo/db/catalog/drop_database_test.cpp +++ b/src/mongo/db/catalog/drop_database_test.cpp @@ -221,7 +221,7 @@ TEST_F(DropDatabaseTest, DropDatabaseReturnsNotWritablePrimaryIfNotPrimary) { _createCollection(_opCtx.get(), _nss); ASSERT_OK(_replCoord->setFollowerMode(repl::MemberState::RS_SECONDARY)); ASSERT_TRUE(_opCtx->writesAreReplicated()); - ASSERT_FALSE(_replCoord->canAcceptWritesForDatabase(_opCtx.get(), _nss.db())); + ASSERT_FALSE(_replCoord->canAcceptWritesForDatabase(_opCtx.get(), _nss.dbName())); ASSERT_EQUALS(ErrorCodes::NotWritablePrimary, dropDatabaseForApplyOps(_opCtx.get(), _nss.dbName())); } @@ -408,7 +408,7 @@ TEST_F(DropDatabaseTest, [this](OperationContext*, const repl::OpTime&) { ASSERT_OK(_replCoord->setFollowerMode(repl::MemberState::RS_SECONDARY)); ASSERT_TRUE(_opCtx->writesAreReplicated()); - ASSERT_FALSE(_replCoord->canAcceptWritesForDatabase(_opCtx.get(), _nss.db())); + ASSERT_FALSE(_replCoord->canAcceptWritesForDatabase(_opCtx.get(), _nss.dbName())); return repl::ReplicationCoordinator::StatusAndDuration(Status::OK(), Milliseconds(0)); }); diff --git a/src/mongo/db/catalog/rename_collection_test.cpp b/src/mongo/db/catalog/rename_collection_test.cpp index efb5e81614c..3d56994f277 100644 --- a/src/mongo/db/catalog/rename_collection_test.cpp +++ b/src/mongo/db/catalog/rename_collection_test.cpp @@ -568,7 +568,7 @@ TEST_F(RenameCollectionTest, RenameCollectionReturnsNotWritablePrimaryIfNotPrima _createCollection(_opCtx.get(), _sourceNss); ASSERT_OK(_replCoord->setFollowerMode(repl::MemberState::RS_SECONDARY)); ASSERT_TRUE(_opCtx->writesAreReplicated()); - ASSERT_FALSE(_replCoord->canAcceptWritesForDatabase(_opCtx.get(), _sourceNss.db())); + ASSERT_FALSE(_replCoord->canAcceptWritesForDatabase(_opCtx.get(), _sourceNss.dbName())); ASSERT_EQUALS(ErrorCodes::NotWritablePrimary, renameCollection(_opCtx.get(), _sourceNss, _targetNss, {})); } |