diff options
| author | Eric Milkie <milkie@10gen.com> | 2017-09-19 11:27:59 -0400 |
|---|---|---|
| committer | Eric Milkie <milkie@10gen.com> | 2017-09-25 13:17:16 -0400 |
| commit | 8c118d741327e6e3fe29955f7f75f6fe853297e5 (patch) | |
| tree | b215e7de950e487f67fbd8f98fe27437d90a70d3 /src/mongo/db/repl/initial_syncer.cpp | |
| parent | 62fe0f89e9fa15c69f912d31b822b3631f691fe7 (diff) | |
| download | mongo-8c118d741327e6e3fe29955f7f75f6fe853297e5.tar.gz | |
SERVER-31086 adorn secondary inserts and vector inserts with timestamps
Diffstat (limited to 'src/mongo/db/repl/initial_syncer.cpp')
| -rw-r--r-- | src/mongo/db/repl/initial_syncer.cpp | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/src/mongo/db/repl/initial_syncer.cpp b/src/mongo/db/repl/initial_syncer.cpp index b2c21cc62d8..96a03c06414 100644 --- a/src/mongo/db/repl/initial_syncer.cpp +++ b/src/mongo/db/repl/initial_syncer.cpp @@ -756,7 +756,6 @@ void InitialSyncer::_databasesClonerCallback(const Status& databaseClonerFinishS void InitialSyncer::_lastOplogEntryFetcherCallbackForStopTimestamp( const StatusWith<Fetcher::QueryResponse>& result, std::shared_ptr<OnCompletionGuard> onCompletionGuard) { - Timestamp oplogSeedDocTimestamp; OpTimeWithHash optimeWithHash; { stdx::lock_guard<stdx::mutex> lock(_mutex); @@ -774,8 +773,7 @@ void InitialSyncer::_lastOplogEntryFetcherCallbackForStopTimestamp( return; } optimeWithHash = optimeWithHashStatus.getValue(); - oplogSeedDocTimestamp = _initialSyncState->stopTimestamp = - optimeWithHash.opTime.getTimestamp(); + _initialSyncState->stopTimestamp = optimeWithHash.opTime.getTimestamp(); if (_initialSyncState->beginTimestamp != _initialSyncState->stopTimestamp) { invariant(_lastApplied.opTime.isNull()); @@ -800,7 +798,8 @@ void InitialSyncer::_lastOplogEntryFetcherCallbackForStopTimestamp( auto status = _storage->insertDocument( opCtx.get(), _opts.localOplogNS, - TimestampedBSONObj{oplogSeedDoc, SnapshotName(oplogSeedDocTimestamp)}); + TimestampedBSONObj{oplogSeedDoc, SnapshotName(optimeWithHash.opTime.getTimestamp())}, + optimeWithHash.opTime.getTerm()); if (!status.isOK()) { stdx::lock_guard<stdx::mutex> lock(_mutex); onCompletionGuard->setResultAndCancelRemainingWork_inlock(lock, status); |