summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--etc/backports_required_for_multiversion_tests.yml4
-rw-r--r--jstests/replsets/sync_source_selection_ignores_minvalid_after_rollback.js5
-rw-r--r--src/mongo/db/repl/topology_coordinator.cpp2
3 files changed, 9 insertions, 2 deletions
diff --git a/etc/backports_required_for_multiversion_tests.yml b/etc/backports_required_for_multiversion_tests.yml
index b87e30395c0..c6b3b849aa9 100644
--- a/etc/backports_required_for_multiversion_tests.yml
+++ b/etc/backports_required_for_multiversion_tests.yml
@@ -228,6 +228,8 @@ last-continuous:
ticket: SERVER-68361
- test_file: jstests/sharding/all_collection_stats.js
ticket: SERVER-71477
+ - test_file: src/mongo/db/modules/enterprise/jstests/fcbis/fcbis_election_during_storage_change.js
+ ticket: SERVER-69861
suites: null
last-lts:
all:
@@ -533,4 +535,6 @@ last-lts:
ticket: SERVER-68361
- test_file: jstests/sharding/all_collection_stats.js
ticket: SERVER-71477
+ - test_file: src/mongo/db/modules/enterprise/jstests/fcbis/fcbis_election_during_storage_change.js
+ ticket: SERVER-69861
suites: null
diff --git a/jstests/replsets/sync_source_selection_ignores_minvalid_after_rollback.js b/jstests/replsets/sync_source_selection_ignores_minvalid_after_rollback.js
index ee7c23b0db0..e4ab88ed90d 100644
--- a/jstests/replsets/sync_source_selection_ignores_minvalid_after_rollback.js
+++ b/jstests/replsets/sync_source_selection_ignores_minvalid_after_rollback.js
@@ -64,6 +64,9 @@ assert.commandWorked(node1.adminCommand({clearLog: 'global'}));
jsTestLog("Stepping up node 2");
+// Make sure id:5972100 debug log is enabled.
+setLogVerbosity([node1], {"replication": {"verbosity": 1}});
+
// Node 2 runs for election. This is needed before node 1 steps up because otherwise it will always
// lose future elections and will not be considered the proper branch of history.
const electionShell = startParallelShell(() => {
@@ -126,4 +129,4 @@ assert.eq(node2Coll.find({_id: "proper branch of history"}).itcount(), 1);
assert.eq(node2Coll.find({_id: "diverging point"}).itcount(), 0);
rst.stopSet();
-})(); \ No newline at end of file
+})();
diff --git a/src/mongo/db/repl/topology_coordinator.cpp b/src/mongo/db/repl/topology_coordinator.cpp
index 47a043e093e..333aebaf76f 100644
--- a/src/mongo/db/repl/topology_coordinator.cpp
+++ b/src/mongo/db/repl/topology_coordinator.cpp
@@ -3485,7 +3485,7 @@ void TopologyCoordinator::processReplSetRequestVotes(const ReplSetRequestVotesAr
if (!args.isADryRun()) {
_lastVote.setTerm(args.getTerm());
_lastVote.setCandidateIndex(args.getCandidateIndex());
- LOGV2_DEBUG(5972100, 0, "Voting yes in election");
+ LOGV2_DEBUG(5972100, 1, "Voting yes in election");
}
response->setVoteGranted(true);
}