mirrors/mongodb
mirrors/mongodb
0
0
Fork 0
mirror of https://github.com/mongodb/mongo.git synced 2024-11-24 00:17:37 +01:00
Code Issues Releases Activity

SERVER-96828 Make dropDatabase coordinator to write to config.dropPendingDBs to serialize with concurrent database creation (#29263)

Browse Source 
GitOrigin-RevId: 16dd6dd1cefa023bd2c0eb03b790b050f061215c
This commit is contained in:
Yuhong Zhang 2024-11-19 08:58:30 -05:00 committed by MongoDB Bot
parent d055ae4ba6
commit 824ffeed9a
1 changed files with 52 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

60
src/mongo/db/s/drop_database_coordinator.cpp
View File

@ -116,6 +116,14 @@
namespace mongo {
namespace {
BSONObj makeDatabaseQuery(const DatabaseName& dbName, const DatabaseVersion& dbVersion) {
// Making the dbVersion timestamp part of the query ensures idempotency.
return BSON(DatabaseType::kDbNameFieldName
<< DatabaseNameUtil::serialize(dbName, SerializationContext::stateCommandRequest())
<< DatabaseType::kVersionFieldName + "." + DatabaseVersion::kTimestampFieldName
<< dbVersion.getTimestamp());
}
void removeDatabaseFromConfigAndUpdatePlacementHistory(
OperationContext* opCtx,
const std::shared_ptr<executor::TaskExecutor>& executor,
@ -138,13 +146,7 @@ void removeDatabaseFromConfigAndUpdatePlacementHistory(
const auto transactionChain = [opCtx, dbName, dbVersion](
const txn_api::TransactionClient& txnClient,
ExecutorPtr txnExec) {
// Making the dbVersion timestamp part of the query ensures idempotency.
write_ops::DeleteOpEntry deleteDatabaseEntryOp{
BSON(DatabaseType::kDbNameFieldName
<< DatabaseNameUtil::serialize(dbName, SerializationContext::stateCommandRequest())
<< DatabaseType::kVersionFieldName + "." + DatabaseVersion::kTimestampFieldName
<< dbVersion.getTimestamp()),
false};
write_ops::DeleteOpEntry deleteDatabaseEntryOp{makeDatabaseQuery(dbName, dbVersion), false};
write_ops::DeleteCommandRequest deleteDatabaseEntry(
NamespaceString::kConfigDatabasesNamespace, {deleteDatabaseEntryOp});
@ -166,8 +168,26 @@ void removeDatabaseFromConfigAndUpdatePlacementHistory(
return txnClient.runCRUDOp(insertPlacementEntry, {1});
})
.thenRunOn(txnExec)
.then([](const BatchedCommandResponse& insertPlacementEntryResponse) {
.then([&](const BatchedCommandResponse& insertPlacementEntryResponse) {
uassertStatusOK(insertPlacementEntryResponse.toStatus());
// Inserts a document {_id: <dbName>, version: {timestamp: <timestamp>}} to
// 'config.dropPendingDBs' collection on the config server. This blocks
// createDatabase coordinator from committing the creation of database with the
// same name to the sharding catalog.
write_ops::InsertCommandRequest insertConfigDropPendingDBsEntry(
NamespaceString::kConfigDropPendingDBsNamespace,
{BSON(DatabaseType::kDbNameFieldName
<< DatabaseNameUtil::serialize(
dbName, SerializationContext::stateCommandRequest())
<< DatabaseType::kVersionFieldName
<< BSON(DatabaseVersion::kTimestampFieldName
<< dbVersion.getTimestamp()))});
return txnClient.runCRUDOp(insertConfigDropPendingDBsEntry, {2});
})
.thenRunOn(txnExec)
.then([](const BatchedCommandResponse& insertConfigDropPendingDBsEntryResponse) {
uassertStatusOK(insertConfigDropPendingDBsEntryResponse.toStatus());
})
.semi();
};
@ -525,6 +545,30 @@ ExecutorFuture<void> DropDatabaseCoordinator::_runImpl(
ShardingLogging::get(opCtx)->logChange(opCtx, "dropDatabase", dbNss);
LOGV2(5494506, "Database dropped", "db"_attr = _dbName);
})
.then([this, anchor = shared_from_this()] {
auto opCtxHolder = cc().makeOperationContext();
auto* opCtx = opCtxHolder.get();
getForwardableOpMetadata().setOn(opCtx);
BatchedCommandRequest request([&] {
write_ops::DeleteOpEntry deleteDatabaseEntryOp{
makeDatabaseQuery(_dbName, *metadata().getDatabaseVersion()), false};
write_ops::DeleteCommandRequest deleteDatabaseEntry(
NamespaceString::kConfigDropPendingDBsNamespace, {deleteDatabaseEntryOp});
return deleteDatabaseEntry;
}());
auto configServer = Grid::get(opCtx)->shardRegistry()->getConfigShard();
uassertStatusOK(configServer
->runBatchWriteCommand(opCtx,
Milliseconds::max(),
request,
ShardingCatalogClient::kMajorityWriteConcern,
Shard::RetryPolicy::kIdempotent)
.toStatus());
});
}