diff options
| author | mathisbessamdb <mathis.bessa@mongodb.com> | 2022-12-20 22:46:37 +0000 |
|---|---|---|
| committer | Evergreen Agent <no-reply@evergreen.mongodb.com> | 2022-12-21 00:13:50 +0000 |
| commit | 22d2a4696c86a42662a86752a63fdb4ed9686ff7 (patch) | |
| tree | 04880ea2d106508878303048428fca01c7b45c30 | |
| parent | aa841fd244431e841b47232ad9deb668704cc402 (diff) | |
| download | mongo-22d2a4696c86a42662a86752a63fdb4ed9686ff7.tar.gz | |
SERVER-71855 ListDatabases returns all databases if no tenantId supplied
| -rw-r--r-- | jstests/serverless/native_tenant_data_isolation_basic_dollar_tenant.js | 9 | ||||
| -rw-r--r-- | src/mongo/db/commands/list_databases.cpp | 13 |
2 files changed, 4 insertions, 18 deletions
diff --git a/jstests/serverless/native_tenant_data_isolation_basic_dollar_tenant.js b/jstests/serverless/native_tenant_data_isolation_basic_dollar_tenant.js index c1e91d759fb..04c62d25b1c 100644 --- a/jstests/serverless/native_tenant_data_isolation_basic_dollar_tenant.js +++ b/jstests/serverless/native_tenant_data_isolation_basic_dollar_tenant.js @@ -123,13 +123,8 @@ const testColl = testDb.getCollection(kCollName); expectedDbs.push("config"); expectedDbs.push("local"); - if (featureFlagRequireTenantId) { - assert.eq(0, allDbs.databases.length); - assert(arrayEq([], allDbs.databases.map(db => db.name))); - } else { - assert.eq(5, allDbs.databases.length); - assert(arrayEq(expectedDbs, allDbs.databases.map(db => db.name))); - } + assert.eq(5, allDbs.databases.length); + assert(arrayEq(expectedDbs, allDbs.databases.map(db => db.name))); } // Test insert, agg, find, getMore, and explain commands. diff --git a/src/mongo/db/commands/list_databases.cpp b/src/mongo/db/commands/list_databases.cpp index e3aa35d36c2..ecb4694e57d 100644 --- a/src/mongo/db/commands/list_databases.cpp +++ b/src/mongo/db/commands/list_databases.cpp @@ -122,17 +122,8 @@ public: Lock::GlobalLock lk(opCtx, MODE_IS); CurOpFailpointHelpers::waitWhileFailPointEnabled( &hangBeforeListDatabases, opCtx, "hangBeforeListDatabases", []() {}); - auto tid = cmd.getDbName().tenantId(); - - if (gMultitenancySupport && - serverGlobalParams.featureCompatibility.isVersionInitialized() && - gFeatureFlagRequireTenantID.isEnabled( - serverGlobalParams.featureCompatibility) && - !tid) { - dbNames = {}; - } else { - dbNames = storageEngine->listDatabases(tid); - } + + dbNames = storageEngine->listDatabases(cmd.getDbName().tenantId()); } std::vector<ListDatabasesReplyItem> items; int64_t totalSize = list_databases::setReplyItems(opCtx, |