diff options
| author | Tommaso Tocci <tommaso.tocci@mongodb.com> | 2022-02-23 16:12:51 +0000 |
|---|---|---|
| committer | Evergreen Agent <no-reply@evergreen.mongodb.com> | 2022-02-23 18:00:30 +0000 |
| commit | 5d99bcaa999e8ca595e36642bdd174abe6986929 (patch) | |
| tree | 3a82b72b8a1517851d59207d01cfbef673b6e101 /src/mongo/db/s/move_primary_source_manager.cpp | |
| parent | 359ecf5230af8f0b9db7fb92fecdf68769d95d0e (diff) | |
| download | mongo-5d99bcaa999e8ca595e36642bdd174abe6986929.tar.gz | |
SERVER-63897 IDL-ify database type
Diffstat (limited to 'src/mongo/db/s/move_primary_source_manager.cpp')
| -rw-r--r-- | src/mongo/db/s/move_primary_source_manager.cpp | 18 |
1 files changed, 10 insertions, 8 deletions
diff --git a/src/mongo/db/s/move_primary_source_manager.cpp b/src/mongo/db/s/move_primary_source_manager.cpp index e0431a8688f..feb704071fd 100644 --- a/src/mongo/db/s/move_primary_source_manager.cpp +++ b/src/mongo/db/s/move_primary_source_manager.cpp @@ -336,9 +336,9 @@ Status MovePrimarySourceManager::_commitOnConfig(OperationContext* opCtx) { configShard->exhaustiveFindOnConfig(opCtx, ReadPreferenceSetting{ReadPreference::PrimaryOnly}, repl::ReadConcernLevel::kMajorityReadConcern, - DatabaseType::ConfigNS, - BSON(DatabaseType::name << _dbname), - BSON(DatabaseType::name << -1), + NamespaceString::kConfigDatabasesNamespace, + BSON(DatabaseType::kNameFieldName << _dbname), + BSON(DatabaseType::kNameFieldName << -1), 1)); const auto databasesVector = std::move(findResponse.docs); @@ -347,7 +347,8 @@ Status MovePrimarySourceManager::_commitOnConfig(OperationContext* opCtx) { << "', but found no databases", !databasesVector.empty()); - const auto dbType = uassertStatusOK(DatabaseType::fromBSON(databasesVector.front())); + const auto dbType = + DatabaseType::parse(IDLParserErrorContext("DatabaseType"), databasesVector.front()); if (dbType.getPrimary() == _toShard) { return Status::OK(); @@ -360,13 +361,14 @@ Status MovePrimarySourceManager::_commitOnConfig(OperationContext* opCtx) { newDbType.setVersion(currentDatabaseVersion.makeUpdated()); - auto updateQueryBuilder = BSONObjBuilder(BSON(DatabaseType::name << _dbname)); - updateQueryBuilder.append(DatabaseType::version.name(), currentDatabaseVersion.toBSON()); + auto const updateQuery = + BSON(DatabaseType::kNameFieldName << _dbname << DatabaseType::kVersionFieldName + << currentDatabaseVersion.toBSON()); auto updateStatus = Grid::get(opCtx)->catalogClient()->updateConfigDocument( opCtx, - DatabaseType::ConfigNS, - updateQueryBuilder.obj(), + NamespaceString::kConfigDatabasesNamespace, + updateQuery, newDbType.toBSON(), false, ShardingCatalogClient::kMajorityWriteConcern); |