diff options
| author | XueruiFa <xuerui.fa@mongodb.com> | 2021-04-22 14:15:07 +0000 |
|---|---|---|
| committer | Evergreen Agent <no-reply@evergreen.mongodb.com> | 2021-04-22 17:37:47 +0000 |
| commit | 7c5eecd009a39e4f10dd4ad607cea642a0f10d83 (patch) | |
| tree | 710b6ed98e2b0a90fe34018bb937bd7b2ca64e84 | |
| parent | c7f6e40784d143ee0304c64b467ec44cd4279112 (diff) | |
| download | mongo-7c5eecd009a39e4f10dd4ad607cea642a0f10d83.tar.gz | |
SERVER-56258: Complete TODO from SERVER-55355
(cherry picked from commit fcf20de28b02f4f2a4e16addd87c43e722fb65e8)
| -rw-r--r-- | buildscripts/resmokelib/testing/hooks/tenant_migration.py | 12 |
1 files changed, 2 insertions, 10 deletions
diff --git a/buildscripts/resmokelib/testing/hooks/tenant_migration.py b/buildscripts/resmokelib/testing/hooks/tenant_migration.py index d900779df8c..3f05f8f05dc 100644 --- a/buildscripts/resmokelib/testing/hooks/tenant_migration.py +++ b/buildscripts/resmokelib/testing/hooks/tenant_migration.py @@ -332,13 +332,6 @@ class _TenantMigrationThread(threading.Thread): # pylint: disable=too-many-inst return abort_reason["code"] == self.INTERNAL_ERR_CODE and abort_reason[ "errmsg"] == "simulate a tenant migration error" - def _is_stale_sync_source_err(self, abort_reason): - # TODO (SERVER-55355): Tenant migration recipient aborts the migration if it selected an - # invalid sync source instead of selecting a new one. - err_msg_regex = r"Sync source's last applied OpTime.*is older than our last fetched OpTime" - return abort_reason["code"] == self.INVALID_SYNC_SOURCE_ERR_CODE and re.search( - err_msg_regex, abort_reason["errmsg"]) - def _is_missing_uuid_in_collection_info_err(self, abort_reason): # TODO (SERVER-55352): Missing uuid in collection info returned by TenantDatabaseCloner's # listCollections command. @@ -358,9 +351,8 @@ class _TenantMigrationThread(threading.Thread): # pylint: disable=too-many-inst "Tenant migration recipient command failed") if not is_recipient_err: return False - return self._is_stale_sync_source_err( - abort_reason) or self._is_missing_uuid_in_collection_info_err( - abort_reason) or self._is_no_such_key_in_oplog_buffer_err(abort_reason) + return self._is_missing_uuid_in_collection_info_err( + abort_reason) or self._is_no_such_key_in_oplog_buffer_err(abort_reason) def _create_migration_opts(self, donor_rs_index, recipient_rs_index): donor_rs = self._tenant_migration_fixture.get_replset(donor_rs_index) |