summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorXuerui Fa <xuerui.fa@mongodb.com>2020-04-01 11:01:20 -0400
committerEvergreen Agent <no-reply@evergreen.mongodb.com>2020-04-28 15:57:45 +0000
commite3ee1df650f6a38bca6691c7b9cba1c5fbc56a11 (patch)
tree09a2a3575f12cf90fb2c94d43af527c206daed1e
parent35f4172754bec2cc62115f96af14366bf2b8ca1a (diff)
downloadmongo-e3ee1df650f6a38bca6691c7b9cba1c5fbc56a11.tar.gz
SERVER-46195: Ensure rollback completes before validate command in rollback_after_enabling_majority_reads.js
(cherry picked from commit 85c88cbaa6b16b00d92e502e9d72ccb2f15321de)
-rw-r--r--jstests/replsets/rollback_after_enabling_majority_reads.js5
1 files changed, 4 insertions, 1 deletions
diff --git a/jstests/replsets/rollback_after_enabling_majority_reads.js b/jstests/replsets/rollback_after_enabling_majority_reads.js
index 0a3b11ddf53..4f226567087 100644
--- a/jstests/replsets/rollback_after_enabling_majority_reads.js
+++ b/jstests/replsets/rollback_after_enabling_majority_reads.js
@@ -64,9 +64,12 @@
}
}
+ // Ensure that the secondary has completed rollback by waiting for its last optime to equal the
+ // primary's.
+ replTest.awaitReplication(null /* timeout */, null /* secondaryOpTimeType */, rollbackNode);
+
// Fix counts for "local.startup_log", since they are corrupted by this rollback.
// transitionToSteadyStateOperations() checks collection counts.
- replTest.waitForState(rollbackNode, ReplSetTest.State.SECONDARY);
assert.commandWorked(rollbackNode.getDB("local").runCommand({validate: "startup_log"}));
rollbackTest.transitionToSteadyStateOperations();