summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDaniel Gottlieb <daniel.gottlieb@mongodb.com>2018-04-06 00:29:07 -0400
committerMax Hirschhorn <max.hirschhorn@mongodb.com>2018-04-06 00:29:07 -0400
commitc6af9faf91d7911bdb29fc436f1480ffc6652c04 (patch)
tree0732951723e0d48391626a9fcf718a6d07878249
parent91ab0fc589043b3f565df3f90685010b59f6e4a5 (diff)
downloadmongo-c6af9faf91d7911bdb29fc436f1480ffc6652c04.tar.gz
SERVER-33843: Have periodic kill secondaries first do dbhash checks then validate collection.
(cherry picked from commit 2b2f4b65daa15ebc912c3e4db3d7768902b2f453)
-rw-r--r--buildscripts/resmokelib/testing/hooks/periodic_kill_secondaries.py12
1 files changed, 8 insertions, 4 deletions
diff --git a/buildscripts/resmokelib/testing/hooks/periodic_kill_secondaries.py b/buildscripts/resmokelib/testing/hooks/periodic_kill_secondaries.py
index 3ac51361fb2..30a693340d6 100644
--- a/buildscripts/resmokelib/testing/hooks/periodic_kill_secondaries.py
+++ b/buildscripts/resmokelib/testing/hooks/periodic_kill_secondaries.py
@@ -84,14 +84,18 @@ class PeriodicKillSecondaries(interface.CustomBehavior):
self._kill_secondaries()
self._check_secondaries_and_restart_fixture()
- # Validate all collections on all nodes after having the secondaries reconcile the end
- # of their oplogs.
- self._validate_collections(test_report)
-
+ # The CheckReplDBHash hook waits until all operations have replicated to and have been
+ # applied on the secondaries, so we run the ValidateCollections hook after it to ensure
+ # we're validating the entire contents of the collection.
+ #
# Verify that the dbhashes match across all nodes after having the secondaries reconcile
# the end of their oplogs.
self._check_repl_dbhash(test_report)
+ # Validate all collections on all nodes after having the secondaries reconcile the end
+ # of their oplogs.
+ self._validate_collections(test_report)
+
self._restart_and_clear_fixture()
except Exception as err:
self.hook_test_case.logger.exception(