diff options
| author | Kaloian Manassiev <kaloian.manassiev@mongodb.com> | 2019-03-21 13:14:40 -0400 |
|---|---|---|
| committer | Kaloian Manassiev <kaloian.manassiev@mongodb.com> | 2019-03-21 21:36:47 -0400 |
| commit | be36aeb7166b2e06dd47dd0769ea28cbb7250041 (patch) | |
| tree | d95db70de0f2ac6cf1d6bc62ef85c657c6cff2f5 /src/mongo/s/catalog | |
| parent | 78eaa3cf538764d5aa5a09c5997532a4c3b2bca8 (diff) | |
| download | mongo-be36aeb7166b2e06dd47dd0769ea28cbb7250041.tar.gz | |
SERVER-40223 Use the AsyncWorkScheduler to run local command when recovering a coordinator decision
Diffstat (limited to 'src/mongo/s/catalog')
| -rw-r--r-- | src/mongo/s/catalog/sharding_catalog_client_impl.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/mongo/s/catalog/sharding_catalog_client_impl.cpp b/src/mongo/s/catalog/sharding_catalog_client_impl.cpp index 7105eb1494b..32b352edcaf 100644 --- a/src/mongo/s/catalog/sharding_catalog_client_impl.cpp +++ b/src/mongo/s/catalog/sharding_catalog_client_impl.cpp @@ -152,14 +152,14 @@ StatusWith<repl::OpTimeWith<DatabaseType>> ShardingCatalogClientImpl::getDatabas } // The admin database is always hosted on the config server. - if (dbName == "admin") { + if (dbName == NamespaceString::kAdminDb) { DatabaseType dbt( dbName, ShardRegistry::kConfigServerShardId, false, databaseVersion::makeFixed()); return repl::OpTimeWith<DatabaseType>(dbt); } // The config database's primary shard is always config, and it is always sharded. - if (dbName == "config") { + if (dbName == NamespaceString::kConfigDb) { DatabaseType dbt( dbName, ShardRegistry::kConfigServerShardId, true, databaseVersion::makeFixed()); return repl::OpTimeWith<DatabaseType>(dbt); @@ -219,7 +219,7 @@ StatusWith<repl::OpTimeWith<DatabaseType>> ShardingCatalogClientImpl::_fetchData const std::string& dbName, const ReadPreferenceSetting& readPref, repl::ReadConcernLevel readConcernLevel) { - dassert(dbName != "admin" && dbName != "config"); + invariant(dbName != NamespaceString::kAdminDb && dbName != NamespaceString::kConfigDb); auto findStatus = _exhaustiveFindOnConfig(opCtx, readPref, |