diff options
author | Amirsaman Memaripour <amirsaman.memaripour@mongodb.com> | 2020-06-29 23:08:09 +0000 |
---|---|---|
committer | Evergreen Agent <no-reply@evergreen.mongodb.com> | 2020-07-01 16:22:45 +0000 |
commit | d4e7ea57599b44353b5393afedee8ae5670837b3 (patch) | |
tree | 2c0717c768faa292590bd6018d7db7038129a23e /src/mongo/db/repl | |
parent | 5ffbd8f8322651b4953f29da0cde9e31eab039d4 (diff) | |
download | mongo-d4e7ea57599b44353b5393afedee8ae5670837b3.tar.gz |
SERVER-49151 Fix malformed LOGV2 and assertion IDs
Diffstat (limited to 'src/mongo/db/repl')
-rw-r--r-- | src/mongo/db/repl/repl_set_config.cpp | 2 | ||||
-rw-r--r-- | src/mongo/db/repl/replication_consistency_markers_impl.cpp | 2 | ||||
-rw-r--r-- | src/mongo/db/repl/rollback_impl_test.cpp | 2 | ||||
-rw-r--r-- | src/mongo/db/repl/rollback_test_fixture.h | 2 | ||||
-rw-r--r-- | src/mongo/db/repl/storage_interface_impl.cpp | 2 |
5 files changed, 5 insertions, 5 deletions
diff --git a/src/mongo/db/repl/repl_set_config.cpp b/src/mongo/db/repl/repl_set_config.cpp index c768cedd634..114fd84df18 100644 --- a/src/mongo/db/repl/repl_set_config.cpp +++ b/src/mongo/db/repl/repl_set_config.cpp @@ -538,7 +538,7 @@ void ReplSetConfig::_addInternalWriteConcernModes() { } else if (status != ErrorCodes::NoSuchKey) { // NoSuchKey means we have no $voter-tagged nodes in this config; // other errors are unexpected. - fassert(46712003, status); + fassert(4671203, status); } // $stepDownCheck: one electable node plus ourselves diff --git a/src/mongo/db/repl/replication_consistency_markers_impl.cpp b/src/mongo/db/repl/replication_consistency_markers_impl.cpp index df7fd8b19e8..a4d24555bf9 100644 --- a/src/mongo/db/repl/replication_consistency_markers_impl.cpp +++ b/src/mongo/db/repl/replication_consistency_markers_impl.cpp @@ -515,7 +515,7 @@ ReplicationConsistencyMarkersImpl::refreshOplogTruncateAfterPointIfPrimary( invariant(truncateOplogEntryBSON, "Found no oplog entry lte " + truncateTimestamp.toString()); return fassert( - 44555001, + 4455501, OpTimeAndWallTime::parseOpTimeAndWallTimeFromOplogEntry(truncateOplogEntryBSON.get())); } diff --git a/src/mongo/db/repl/rollback_impl_test.cpp b/src/mongo/db/repl/rollback_impl_test.cpp index 379fed5007f..29f3fc25984 100644 --- a/src/mongo/db/repl/rollback_impl_test.cpp +++ b/src/mongo/db/repl/rollback_impl_test.cpp @@ -665,7 +665,7 @@ TEST_F(RollbackImplTest, RollbackCallsRecoverToStableTimestamp) { DEATH_TEST_REGEX_F(RollbackImplTest, RollbackFassertsIfRecoverToStableTimestampFails, - "Fatal assertion.*45847000") { + "Fatal assertion.*4584700") { auto op = makeOpAndRecordId(1); _remoteOplog->setOperations({op}); ASSERT_OK(_insertOplogEntry(op.first)); diff --git a/src/mongo/db/repl/rollback_test_fixture.h b/src/mongo/db/repl/rollback_test_fixture.h index c421d17fa23..4754f7dcf26 100644 --- a/src/mongo/db/repl/rollback_test_fixture.h +++ b/src/mongo/db/repl/rollback_test_fixture.h @@ -158,7 +158,7 @@ public: Timestamp recoverToStableTimestamp(OperationContext* opCtx) override { stdx::lock_guard<Latch> lock(_mutex); if (_recoverToTimestampStatus) { - fassert(45847000, _recoverToTimestampStatus.get()); + fassert(4584700, _recoverToTimestampStatus.get()); } _currTimestamp = _stableTimestamp; diff --git a/src/mongo/db/repl/storage_interface_impl.cpp b/src/mongo/db/repl/storage_interface_impl.cpp index 88546bd626d..47c0a5a7190 100644 --- a/src/mongo/db/repl/storage_interface_impl.cpp +++ b/src/mongo/db/repl/storage_interface_impl.cpp @@ -1119,7 +1119,7 @@ boost::optional<BSONObj> StorageInterfaceImpl::findOplogEntryLessThanOrEqualToTi // This will log a message about the conflict initially and then every 5 seconds, with // the current rather arbitrary settings. if (retries % 10 == 0) { - LOGV2(47959000, + LOGV2(4795900, "Reading the oplog collection conflicts with a validate cmd. Continuing to " "retry.", "retries"_attr = retries); |