diff options
| author | Jack Mulrow <jack.mulrow@mongodb.com> | 2021-05-02 18:40:37 +0000 |
|---|---|---|
| committer | Evergreen Agent <no-reply@evergreen.mongodb.com> | 2021-05-06 20:01:05 +0000 |
| commit | d3559beab25b08afa292529182ce100922596741 (patch) | |
| tree | 0fa3121f39e6476ea4f74077d64e3e68db833ba6 | |
| parent | 68053f2e2f758e8b60e0f3f1845807b7da2c5a8e (diff) | |
| download | mongo-d3559beab25b08afa292529182ce100922596741.tar.gz | |
SERVER-56471 Give tenant migration recipients privilege to skip cluster time validation
(cherry picked from commit 395510381dc73a1741d139fbf8d5de266ef21384)
| -rw-r--r-- | buildscripts/resmokelib/testing/fixtures/tenant_migration.py | 16 | ||||
| -rw-r--r-- | jstests/replsets/libs/tenant_migration_util.js | 5 |
2 files changed, 13 insertions, 8 deletions
diff --git a/buildscripts/resmokelib/testing/fixtures/tenant_migration.py b/buildscripts/resmokelib/testing/fixtures/tenant_migration.py index 50e2375868f..b253274733a 100644 --- a/buildscripts/resmokelib/testing/fixtures/tenant_migration.py +++ b/buildscripts/resmokelib/testing/fixtures/tenant_migration.py @@ -177,13 +177,15 @@ class TenantMigrationFixture(interface.Fixture): # pylint: disable=too-many-ins try: primary_client.admin.command({ - "createRole": "tenantMigrationRecipientRole", "privileges": - [{"resource": {"cluster": True}, "actions": ["listDatabases", "useUUID"]}, - {"resource": {"db": "", "collection": ""}, "actions": ["listCollections"]}, - { - "resource": {"anyResource": True}, - "actions": ["dbStats", "collStats", "find", "listIndexes"] - }], "roles": [] + "createRole": "tenantMigrationRecipientRole", + "privileges": [{ + "resource": {"cluster": True}, + "actions": ["listDatabases", "useUUID", "advanceClusterTime"] + }, {"resource": {"db": "", "collection": ""}, "actions": ["listCollections"]}, + { + "resource": {"anyResource": True}, + "actions": ["dbStats", "collStats", "find", "listIndexes"] + }], "roles": [] }) except: self.logger.exception( diff --git a/jstests/replsets/libs/tenant_migration_util.js b/jstests/replsets/libs/tenant_migration_util.js index cc6ecb5bfb6..0c347adac07 100644 --- a/jstests/replsets/libs/tenant_migration_util.js +++ b/jstests/replsets/libs/tenant_migration_util.js @@ -389,7 +389,10 @@ var TenantMigrationUtil = (function() { assert.commandWorked(adminDB.runCommand({ createRole: "tenantMigrationRecipientRole", privileges: [ - {resource: {cluster: true}, actions: ["listDatabases", "useUUID"]}, + { + resource: {cluster: true}, + actions: ["listDatabases", "useUUID", "advanceClusterTime"] + }, {resource: {db: "", collection: ""}, actions: ["listCollections"]}, { resource: {anyResource: true}, |