diff --git a/debian/mongod.1 b/debian/mongod.1 index c854769102d..60a55bc4a02 100644 --- a/debian/mongod.1 +++ b/debian/mongod.1 @@ -1854,18 +1854,6 @@ through a restart, update the value of \fB\-\-oplogMinRetentionHours\f1\f1\&. .RE .PP -\fBmongod \-\-enableMajorityReadConcern\f1 -.RS -.PP -\fIDefault\f1: true -.PP -Configures support for \fB"majority"\f1\f1 read concern. -.PP -Starting in MongoDB 5.0, -\fB\-\-enableMajorityReadConcern\f1\f1 cannot be changed -and is always set to \fBtrue\f1\&. In earlier versions of MongoDB, -\fB\-\-enableMajorityReadConcern\f1\f1 was configurable. -.PP If you are using a three\-member primary\-secondary\-arbiter (PSA) architecture, consider the following: .RS diff --git a/jstests/libs/replsettest.js b/jstests/libs/replsettest.js index 9c1e7ace5b5..28a2aad2d85 100644 --- a/jstests/libs/replsettest.js +++ b/jstests/libs/replsettest.js @@ -523,18 +523,6 @@ export class ReplSetTest { this.awaitSecondaryNodes(timeout, secondaries, retryIntervalMS); MongoRunner.runHangAnalyzer.enable(); } catch (originalEx) { - // There is a special case where we expect the (rare) possibility of unrecoverable - // rollbacks with EMRC:false in rollback suites with unclean shutdowns. - jsTestLog("Exception in 'awaitSecondaryNodes', checking for unrecoverable rollback"); - if (connToCheckForUnrecoverableRollback) { - const conn = connToCheckForUnrecoverableRollback; - - const statusRes = assert.commandWorked(conn.adminCommand({replSetGetStatus: 1})); - const isRecovering = (statusRes.myState === ReplSetTest.State.RECOVERING); - const hasNoSyncSource = (statusRes.syncSourceId === -1); - - const cmdLineOptsRes = assert.commandWorked(conn.adminCommand("getCmdLineOpts")); - } // Re-throw the original exception in all cases. MongoRunner.runHangAnalyzer.enable(); throw originalEx; diff --git a/src/mongo/db/repl/rollback_impl.cpp b/src/mongo/db/repl/rollback_impl.cpp index 0400ca75bdd..b10f31d7657 100644 --- a/src/mongo/db/repl/rollback_impl.cpp +++ b/src/mongo/db/repl/rollback_impl.cpp @@ -1223,8 +1223,6 @@ StatusWith RollbackImpl::_findComm // Rollback common point should be >= the stable timestamp. invariant(stableTimestamp); if (commonPointOpTime.getTimestamp() < *stableTimestamp) { - // This is an fassert rather than an invariant, since it can happen if the server was - // recently upgraded to enableMajorityReadConcern=true. LOGV2_FATAL_NOTRACE(51121, "Common point must be at least stable timestamp", "commonPoint"_attr = commonPointOpTime.getTimestamp(),