xuemingqiang/mongo
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Revert "SERVER-76796 Enable more lint warnings and fix them"

Browse Source 
This reverts commit 7e0887b55d.
This commit is contained in:
auto-revert-processor
2023-07-13 19:30:15 +00:00
committed by Evergreen Agent
parent ae78f9a136
commit 8837a2dfe2
41 changed files with 93 additions and 79 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
buildscripts/resmokelib/testing/hooks/continuous_initial_sync.py
View File

@@ -323,11 +323,12 @@ class _InitialSyncThread(threading.Thread):
# (potentially) higher config version. We should not receive these codes
# indefinitely.
# pylint: disable=too-many-boolean-expressions
if err.code not in (self._NEW_REPLICA_SET_CONFIGURATION_INCOMPATIBLE,
self._CURRENT_CONFIG_NOT_COMMITTED_YET,
self._CONFIGURATION_IN_PROGRESS, self._NODE_NOT_FOUND,
self._INTERRUPTED_DUE_TO_REPL_STATE_CHANGE,
self._INTERRUPTED_DUE_TO_STORAGE_CHANGE):
if (err.code != self._NEW_REPLICA_SET_CONFIGURATION_INCOMPATIBLE
and err.code != self._CURRENT_CONFIG_NOT_COMMITTED_YET
and err.code != self._CONFIGURATION_IN_PROGRESS
and err.code != self._NODE_NOT_FOUND
and err.code != self._INTERRUPTED_DUE_TO_REPL_STATE_CHANGE
and err.code != self._INTERRUPTED_DUE_TO_STORAGE_CHANGE):
msg = (
"Operation failure while adding tag for node on port {} in fixture {}: {}"
).format(sync_node.port, fixture.replset_name, err)
@@ -431,8 +432,8 @@ class _InitialSyncThread(threading.Thread):
conn.admin.command(cmd)
break
except pymongo.errors.OperationFailure as err:
if err.code not in (self.INTERRUPTED_DUE_TO_REPL_STATE_CHANGE,
self.INTERRUPTED_DUE_TO_STORAGE_CHANGE):
if (err.code != self.INTERRUPTED_DUE_TO_REPL_STATE_CHANGE
and err.code != self.INTERRUPTED_DUE_TO_STORAGE_CHANGE):
raise
msg = (
"Interrupted while waiting for node on port {} in set {} to reach primary state, retrying: {}"