diff options
| author | Lingzhi Deng <lingzhi.deng@mongodb.com> | 2021-01-19 13:05:16 -0500 |
|---|---|---|
| committer | Evergreen Agent <no-reply@evergreen.mongodb.com> | 2021-01-19 22:58:34 +0000 |
| commit | 2c268821e6c78d8f739f3cfed33793f2af004855 (patch) | |
| tree | 60deffae1a1d6293b5f1b6160a5c984239a5f24e | |
| parent | f9bf2b02440138902e31c55d2414961499629767 (diff) | |
| download | mongo-2c268821e6c78d8f739f3cfed33793f2af004855.tar.gz | |
SERVER-53312: Enable recipient testing for tenant_migration_jscore_passthrough
| -rw-r--r-- | buildscripts/resmokeconfig/suites/tenant_migration_jscore_passthrough.yml | 3 | ||||
| -rw-r--r-- | src/mongo/db/repl/tenant_oplog_applier.cpp | 3 |
2 files changed, 3 insertions, 3 deletions
diff --git a/buildscripts/resmokeconfig/suites/tenant_migration_jscore_passthrough.yml b/buildscripts/resmokeconfig/suites/tenant_migration_jscore_passthrough.yml index 4e98ee49924..ce834d6fe9f 100644 --- a/buildscripts/resmokeconfig/suites/tenant_migration_jscore_passthrough.yml +++ b/buildscripts/resmokeconfig/suites/tenant_migration_jscore_passthrough.yml @@ -122,9 +122,6 @@ executor: mode: alwaysOn data: blockTimeMS: 250 - # TODO SERVER-53312: Remove the failpoint 'returnResponseOkForRecipientSyncDataCmd'. - failpoint.returnResponseOkForRecipientSyncDataCmd: - mode: alwaysOn # Set the delay before migration state machine is garbage collected to be short to avoid # migration conflicts since the ContinuousTenantMigration hook migrates a single tenant # between the replica sets in the fixture. diff --git a/src/mongo/db/repl/tenant_oplog_applier.cpp b/src/mongo/db/repl/tenant_oplog_applier.cpp index 445500b75bf..54698b77f00 100644 --- a/src/mongo/db/repl/tenant_oplog_applier.cpp +++ b/src/mongo/db/repl/tenant_oplog_applier.cpp @@ -589,6 +589,9 @@ Status TenantOplogApplier::_applyOplogBatchPerWorker(std::vector<const OplogEntr tenantMigrationRecipientInfo(opCtx.get()) = boost::make_optional<TenantMigrationRecipientInfo>(_migrationUuid); + // Set this to satisfy low-level locking invariants. + opCtx->lockState()->setShouldConflictWithSecondaryBatchApplication(false); + const bool allowNamespaceNotFoundErrorsOnCrudOps(true); auto status = OplogApplierUtils::applyOplogBatchCommon( opCtx.get(), |