diff options
| author | auto-revert-processor <dev-prod-dag@mongodb.com> | 2023-04-15 04:58:07 +0000 |
|---|---|---|
| committer | Evergreen Agent <no-reply@evergreen.mongodb.com> | 2023-04-15 05:32:18 +0000 |
| commit | fecd7c876ae3838942f752267f4a0b30e5e0d373 (patch) | |
| tree | 31dc0c3b5f93149b007e2365c06b24df10cb0b05 /buildscripts/resmokelib | |
| parent | 88a17d29b2890c0ab25ed44ddc349f3589fb6934 (diff) | |
| download | mongo-fecd7c876ae3838942f752267f4a0b30e5e0d373.tar.gz | |
Revert "SERVER-75990: Tenant Migrations are not resilient to recipient failover"
This reverts commit c92d1161fdf333a3e3219631557a480fae30a593.
Diffstat (limited to 'buildscripts/resmokelib')
| -rw-r--r-- | buildscripts/resmokelib/testing/hooks/tenant_migration.py | 11 |
1 files changed, 1 insertions, 10 deletions
diff --git a/buildscripts/resmokelib/testing/hooks/tenant_migration.py b/buildscripts/resmokelib/testing/hooks/tenant_migration.py index c61eeeb02da..6b805fa137e 100644 --- a/buildscripts/resmokelib/testing/hooks/tenant_migration.py +++ b/buildscripts/resmokelib/testing/hooks/tenant_migration.py @@ -234,7 +234,6 @@ class _TenantMigrationThread(threading.Thread): WAIT_SECS_RANGES = [[0.05, 0.1], [0.1, 0.5], [1, 5], [5, 15]] POLL_INTERVAL_SECS = 0.1 - MIGRATION_ABORTED_ERR_CODE = 325 NO_SUCH_MIGRATION_ERR_CODE = 327 INTERNAL_ERR_CODE = 1 INVALID_SYNC_SOURCE_ERR_CODE = 119 @@ -365,10 +364,6 @@ class _TenantMigrationThread(threading.Thread): return abort_reason["code"] == self.INTERNAL_ERR_CODE and abort_reason[ "errmsg"] == "simulate a tenant migration error" - def _is_recipient_failover_abort_reason(self, abort_reason): - return abort_reason["code"] == self.MIGRATION_ABORTED_ERR_CODE and abort_reason[ - "errmsg"].find("Recipient failover happened during migration") - def _create_migration_opts(self, donor_rs_index, recipient_rs_index): donor_rs = self._tenant_migration_fixture.get_replset(donor_rs_index) recipient_rs = self._tenant_migration_fixture.get_replset(recipient_rs_index) @@ -437,11 +432,7 @@ class _TenantMigrationThread(threading.Thread): return True abort_reason = res["abortReason"] - if self._is_recipient_failover_abort_reason(abort_reason): - self.logger.info("Tenant migration '%s' aborted due to recipient failover: %s", - migration_opts.migration_id, str(res)) - return False - elif self._is_fail_point_abort_reason(abort_reason): + if self._is_fail_point_abort_reason(abort_reason): self.logger.info( "Tenant migration '%s' with donor replica set '%s' aborted due to failpoint: " + "%s.", migration_opts.migration_id, migration_opts.get_donor_name(), str(res)) |