From e00aa7eb3223e7b6dcc55af521fccd51e10b0b11 Mon Sep 17 00:00:00 2001 From: dwight Date: Sun, 18 Sep 2011 15:35:46 -0400 Subject: cleaning minor --- db/repl/rs_initialsync.cpp | 2 +- db/repl/rs_sync.cpp | 3 --- 2 files changed, 1 insertion(+), 4 deletions(-) (limited to 'db/repl') 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 ) { -- cgit v1.2.1