diff options
| author | Judah Schvimer <judah@mongodb.com> | 2017-12-06 11:52:29 -0500 |
|---|---|---|
| committer | Judah Schvimer <judah@mongodb.com> | 2017-12-06 17:27:50 -0500 |
| commit | cef82b45ca182e788ba33aa6cb034b34a63b7b56 (patch) | |
| tree | 8028d957093115d946e65b288f109fcaa8477ad9 /src/mongo/db/repl/sync_source_resolver.cpp | |
| parent | 69f94d7172801725bad43dba99ca0e5400eb293c (diff) | |
| download | mongo-cef82b45ca182e788ba33aa6cb034b34a63b7b56.tar.gz | |
SERVER-32178 Do not use IDL on oldest oplog entry
Diffstat (limited to 'src/mongo/db/repl/sync_source_resolver.cpp')
| -rw-r--r-- | src/mongo/db/repl/sync_source_resolver.cpp | 23 |
1 files changed, 18 insertions, 5 deletions
diff --git a/src/mongo/db/repl/sync_source_resolver.cpp b/src/mongo/db/repl/sync_source_resolver.cpp index ebb9f9649c7..f95e5ae5aeb 100644 --- a/src/mongo/db/repl/sync_source_resolver.cpp +++ b/src/mongo/db/repl/sync_source_resolver.cpp @@ -168,7 +168,11 @@ std::unique_ptr<Fetcher> SyncSourceResolver::_makeFirstOplogEntryFetcher( _taskExecutor, candidate, kLocalOplogNss.db().toString(), - BSON("find" << kLocalOplogNss.coll() << "limit" << 1 << "sort" << BSON("$natural" << 1)), + BSON("find" << kLocalOplogNss.coll() << "limit" << 1 << "sort" << BSON("$natural" << 1) + << "projection" + << BSON(OplogEntryBase::kTimestampFieldName << 1 + << OplogEntryBase::kTermFieldName + << 1)), stdx::bind(&SyncSourceResolver::_firstOplogEntryFetcherCallback, this, stdx::placeholders::_1, @@ -242,9 +246,18 @@ OpTime SyncSourceResolver::_parseRemoteEarliestOpTime(const HostAndPort& candida return OpTime(); } - const OplogEntry oplogEntry(firstObjFound); - const auto remoteEarliestOpTime = oplogEntry.getOpTime(); - if (remoteEarliestOpTime.isNull()) { + const auto remoteEarliestOpTime = OpTime::parseFromOplogEntry(firstObjFound); + if (!remoteEarliestOpTime.isOK()) { + const auto until = _taskExecutor->now() + kFirstOplogEntryNullTimestampBlacklistDuration; + log() << "Blacklisting " << candidate << " due to error parsing OpTime from the oldest" + << " oplog entry for " << kFirstOplogEntryNullTimestampBlacklistDuration + << " until: " << until << ". Error: " << remoteEarliestOpTime.getStatus() + << ", Entry: " << redact(firstObjFound); + _syncSourceSelector->blacklistSyncSource(candidate, until); + return OpTime(); + } + + if (remoteEarliestOpTime.getValue().isNull()) { // First document in remote oplog is empty. const auto until = _taskExecutor->now() + kFirstOplogEntryNullTimestampBlacklistDuration; log() << "Blacklisting " << candidate << " due to null timestamp in first document for " @@ -253,7 +266,7 @@ OpTime SyncSourceResolver::_parseRemoteEarliestOpTime(const HostAndPort& candida return OpTime(); } - return remoteEarliestOpTime; + return remoteEarliestOpTime.getValue(); } void SyncSourceResolver::_firstOplogEntryFetcherCallback( |