diff options
| author | Cheahuychou Mao <mao.cheahuychou@gmail.com> | 2021-01-21 01:25:10 +0000 |
|---|---|---|
| committer | Evergreen Agent <no-reply@evergreen.mongodb.com> | 2021-01-28 02:11:41 +0000 |
| commit | e9360bd8e7cb8f1447ffd513149d284c394bb4a0 (patch) | |
| tree | 7404bfc08bba640c65cbaf1aed551a6428aedf06 /src/mongo/db/namespace_string.cpp | |
| parent | 96fe72c36d370a4067240738f051021d4daf72ce (diff) | |
| download | mongo-e9360bd8e7cb8f1447ffd513149d284c394bb4a0.tar.gz | |
SERVER-53404 Make tenant migration donor copy the recipient's cluster time signing keys before sending recipientSyncData
Diffstat (limited to 'src/mongo/db/namespace_string.cpp')
| -rw-r--r-- | src/mongo/db/namespace_string.cpp | 22 |
1 files changed, 7 insertions, 15 deletions
diff --git a/src/mongo/db/namespace_string.cpp b/src/mongo/db/namespace_string.cpp index eea72c9e3f8..11445d700a5 100644 --- a/src/mongo/db/namespace_string.cpp +++ b/src/mongo/db/namespace_string.cpp @@ -79,8 +79,10 @@ const NamespaceString NamespaceString::kShardConfigCollectionsNamespace(Namespac "cache.collections"); const NamespaceString NamespaceString::kShardConfigDatabasesNamespace(NamespaceString::kConfigDb, "cache.databases"); -const NamespaceString NamespaceString::kSystemKeysNamespace(NamespaceString::kAdminDb, - "system.keys"); +const NamespaceString NamespaceString::kKeysCollectionNamespace(NamespaceString::kAdminDb, + "system.keys"); +const NamespaceString NamespaceString::kExternalKeysCollectionNamespace( + NamespaceString::kAdminDb, "system.external_validation_keys"); const NamespaceString NamespaceString::kRsOplogNamespace(NamespaceString::kLocalDb, "oplog.rs"); const NamespaceString NamespaceString::kSystemReplSetNamespace(NamespaceString::kLocalDb, "system.replset"); @@ -108,12 +110,6 @@ const NamespaceString NamespaceString::kReshardingApplierProgressNamespace( const NamespaceString NamespaceString::kReshardingTxnClonerProgressNamespace( NamespaceString::kConfigDb, "localReshardingOperations.recipient.progress_txn_cloner"); -const NamespaceString NamespaceString::kKeysCollectionNamespace(NamespaceString::kAdminDb, - "system.keys"); - -const NamespaceString NamespaceString::kExternalKeysCollectionNamespace( - NamespaceString::kAdminDb, "system.external_validation_keys"); - bool NamespaceString::isListCollectionsCursorNS() const { return coll() == listCollectionsCursorCol; } @@ -128,16 +124,12 @@ bool NamespaceString::isLegalClientSystemNS() const { return true; if (coll() == kServerConfigurationNamespace.coll()) return true; - if (coll() == kSystemKeysNamespace.coll()) + if (coll() == kKeysCollectionNamespace.coll()) return true; - if (coll() == "system.backup_users") + if (coll() == kExternalKeysCollectionNamespace.coll()) return true; - if (coll() == kExternalKeysCollectionNamespace.coll()) { - // TODO (SERVER-53404): This was added to allow client in an integration test to - // manually insert the key document into this system collection. Remove this when the - // tenant migration donor does the copying by itself. + if (coll() == "system.backup_users") return true; - } } else if (db() == kConfigDb) { if (coll() == "system.sessions") return true; |