diff options
author | matt dannenberg <matt.dannenberg@10gen.com> | 2015-09-16 08:23:33 -0400 |
---|---|---|
committer | matt dannenberg <matt.dannenberg@10gen.com> | 2015-09-17 05:25:25 -0400 |
commit | b7ac467dbe15275ffcd51f446f9b42491f29e922 (patch) | |
tree | b39273bb2e55c9f20c60adf2837b6bad5ce33ecf /src/mongo/db/repl/bgsync.cpp | |
parent | aa190f0e2b34d29231b2ddd6660e641821071c1f (diff) | |
download | mongo-b7ac467dbe15275ffcd51f446f9b42491f29e922.tar.gz |
SERVER-19905 consistently use t as the field name for the term portion of an OpTime
Diffstat (limited to 'src/mongo/db/repl/bgsync.cpp')
-rw-r--r-- | src/mongo/db/repl/bgsync.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/mongo/db/repl/bgsync.cpp b/src/mongo/db/repl/bgsync.cpp index 7a8c76ffb4a..40afe9f7356 100644 --- a/src/mongo/db/repl/bgsync.cpp +++ b/src/mongo/db/repl/bgsync.cpp @@ -101,7 +101,7 @@ Status checkRemoteOplogStart(stdx::function<StatusWith<BSONObj>()> getNextOperat "we are ahead of the sync source, will try to roll back"); } BSONObj o = result.getValue(); - OpTime opTime = fassertStatusOK(28778, OpTime::parseFromBSON(o)); + OpTime opTime = fassertStatusOK(28778, OpTime::parseFromOplogEntry(o)); long long hash = o["h"].numberLong(); if (opTime != lastOpTimeFetched || hash != lastHashFetched) { return Status(ErrorCodes::OplogStartMissing, @@ -509,7 +509,7 @@ void BackgroundSync::_fetcherCallback(const StatusWith<Fetcher::QueryResponse>& { stdx::unique_lock<stdx::mutex> lock(_mutex); _lastFetchedHash = o["h"].numberLong(); - _lastOpTimeFetched = fassertStatusOK(28770, OpTime::parseFromBSON(o)); + _lastOpTimeFetched = fassertStatusOK(28770, OpTime::parseFromOplogEntry(o)); LOG(3) << "lastOpTimeFetched: " << _lastOpTimeFetched; } } |