diff options
| author | dwight <dwight@10gen.com> | 2011-09-18 15:35:46 -0400 |
|---|---|---|
| committer | dwight <dwight@10gen.com> | 2011-09-18 15:35:46 -0400 |
| commit | e00aa7eb3223e7b6dcc55af521fccd51e10b0b11 (patch) | |
| tree | 2b2b35bc0f3e59fa8c870b068d437a3cc642ecf4 /db/repl | |
| parent | 4fd059498f0b908d011bef5f4511315a1c554cd4 (diff) | |
| download | mongo-e00aa7eb3223e7b6dcc55af521fccd51e10b0b11.tar.gz | |
cleaning minor
Diffstat (limited to 'db/repl')
| -rw-r--r-- | db/repl/rs_initialsync.cpp | 2 | ||||
| -rw-r--r-- | db/repl/rs_sync.cpp | 3 |
2 files changed, 1 insertions, 4 deletions
diff --git a/db/repl/rs_initialsync.cpp b/db/repl/rs_initialsync.cpp index e9ef781d3bc..a1405726cfd 100644 --- a/db/repl/rs_initialsync.cpp +++ b/db/repl/rs_initialsync.cpp @@ -194,7 +194,7 @@ namespace mongo { assert( !mvoptime.isNull() ); assert( mvoptime >= startingTS ); - /* apply relevant portion of the oplog + /* apply startingTS..mvoptime portion of the oplog */ { isyncassert( str::stream() << "initial sync source must remain readable throughout our initial sync [2] state now: " << source->state().toString() , source->state().readable() ); diff --git a/db/repl/rs_sync.cpp b/db/repl/rs_sync.cpp index b29328b5935..e9103534778 100644 --- a/db/repl/rs_sync.cpp +++ b/db/repl/rs_sync.cpp @@ -116,9 +116,6 @@ namespace mongo { { ts = o["ts"]._opTime(); - /* if we have become primary, we dont' want to apply things from elsewhere - anymore. assumePrimary is in the db lock so we are safe as long as - we check after we locked above. */ if( (source->state() != MemberState::RS_PRIMARY && source->state() != MemberState::RS_SECONDARY) || replSetForceInitialSyncFailure ) { |