summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authormatt dannenberg <matt.dannenberg@10gen.com>2014-05-27 08:14:28 -0400
committermatt dannenberg <matt.dannenberg@10gen.com>2014-05-27 09:13:26 -0400
commita97c9b1a30d60f8a9dca16969747f3f59400cb18 (patch)
treea46888c981e57bd4dc2cbf7e2cec1dfb1b679b90 /src
parentdf9cb2c79f98f5ab5471a95b36e7689600d686d2 (diff)
downloadmongo-a97c9b1a30d60f8a9dca16969747f3f59400cb18.tar.gz
SERVER-13856 remove unnecessary usage of repl:: from the repl directory
Diffstat (limited to 'src')
-rw-r--r--src/mongo/db/repl/health.cpp2
-rw-r--r--src/mongo/db/repl/heartbeat.cpp6
-rw-r--r--src/mongo/db/repl/oplog.cpp2
-rw-r--r--src/mongo/db/repl/repl_set_impl.cpp2
-rw-r--r--src/mongo/db/repl/repl_set_impl.h2
-rw-r--r--src/mongo/db/repl/replset_commands.cpp2
-rw-r--r--src/mongo/db/repl/rs.cpp2
-rw-r--r--src/mongo/db/repl/rs_initialsync.cpp8
-rw-r--r--src/mongo/db/repl/rs_sync.cpp4
-rw-r--r--src/mongo/db/repl/sync_source_feedback.cpp2
10 files changed, 16 insertions, 16 deletions
diff --git a/src/mongo/db/repl/health.cpp b/src/mongo/db/repl/health.cpp
index e4695b1d4d3..aed8a4baa9b 100644
--- a/src/mongo/db/repl/health.cpp
+++ b/src/mongo/db/repl/health.cpp
@@ -456,7 +456,7 @@ namespace repl {
b.append("set", name());
b.appendTimeT("date", time(0));
b.append("myState", myState.s);
- const Member *syncTarget = repl::BackgroundSync::get()->getSyncTarget();
+ const Member *syncTarget = BackgroundSync::get()->getSyncTarget();
if ( syncTarget &&
(myState != MemberState::RS_PRIMARY) &&
(myState != MemberState::RS_SHUNNED) ) {
diff --git a/src/mongo/db/repl/heartbeat.cpp b/src/mongo/db/repl/heartbeat.cpp
index ca692540d9b..006998a57ef 100644
--- a/src/mongo/db/repl/heartbeat.cpp
+++ b/src/mongo/db/repl/heartbeat.cpp
@@ -141,7 +141,7 @@ namespace repl {
result.append("hbmsg", theReplSet->hbmsg());
result.append("time", (long long) time(0));
result.appendDate("opTime", theReplSet->lastOpTimeWritten.asDate());
- const Member *syncTarget = repl::BackgroundSync::get()->getSyncTarget();
+ const Member *syncTarget = BackgroundSync::get()->getSyncTarget();
if (syncTarget) {
result.append("syncingTo", syncTarget->fullName());
}
@@ -248,11 +248,11 @@ namespace repl {
// this ensures that will have bgsync's s_instance at all points where it is needed
// so that we needn't check for its existence
- repl::BackgroundSync* sync = repl::BackgroundSync::get();
+ BackgroundSync* sync = BackgroundSync::get();
boost::thread t(startSyncThread);
- boost::thread producer(stdx::bind(&repl::BackgroundSync::producerThread, sync));
+ boost::thread producer(stdx::bind(&BackgroundSync::producerThread, sync));
theReplSet->syncSourceFeedback.go();
// member heartbeats are started in ReplSetImpl::initFromConfig
diff --git a/src/mongo/db/repl/oplog.cpp b/src/mongo/db/repl/oplog.cpp
index 84a3f3ef336..5996e180401 100644
--- a/src/mongo/db/repl/oplog.cpp
+++ b/src/mongo/db/repl/oplog.cpp
@@ -151,7 +151,7 @@ namespace repl {
theReplSet->lastH = h;
ctx.getClient()->setLastOp( ts );
- repl::BackgroundSync::notify();
+ BackgroundSync::notify();
}
}
diff --git a/src/mongo/db/repl/repl_set_impl.cpp b/src/mongo/db/repl/repl_set_impl.cpp
index b9f76e98e21..01f78853e04 100644
--- a/src/mongo/db/repl/repl_set_impl.cpp
+++ b/src/mongo/db/repl/repl_set_impl.cpp
@@ -115,7 +115,7 @@ namespace {
// Wait for replication to stop and buffer to be consumed
LOG(1) << "replSet waiting for replication to finish before becoming primary" << endl;
- repl::BackgroundSync::get()->stopReplicationAndFlushBuffer();
+ BackgroundSync::get()->stopReplicationAndFlushBuffer();
// Lock here to prevent stepping down & becoming primary from getting interleaved
LOG(1) << "replSet waiting for global write lock";
diff --git a/src/mongo/db/repl/repl_set_impl.h b/src/mongo/db/repl/repl_set_impl.h
index 5dd34332c51..1fc7529dd2d 100644
--- a/src/mongo/db/repl/repl_set_impl.h
+++ b/src/mongo/db/repl/repl_set_impl.h
@@ -281,7 +281,7 @@ namespace repl {
private:
bool _syncDoInitialSync_clone(Cloner &cloner, const char *master,
const list<string>& dbs, bool dataPass);
- bool _syncDoInitialSync_applyToHead( repl::SyncTail& syncer, OplogReader* r ,
+ bool _syncDoInitialSync_applyToHead( SyncTail& syncer, OplogReader* r ,
const Member* source, const BSONObj& lastOp,
BSONObj& minValidOut);
void _syncDoInitialSync();
diff --git a/src/mongo/db/repl/replset_commands.cpp b/src/mongo/db/repl/replset_commands.cpp
index 2cba0ca3081..5605d962987 100644
--- a/src/mongo/db/repl/replset_commands.cpp
+++ b/src/mongo/db/repl/replset_commands.cpp
@@ -83,7 +83,7 @@ namespace repl {
}
if (cmdObj.hasElement("sethbmsg")) {
- repl::sethbmsg(cmdObj["sethbmsg"].String());
+ sethbmsg(cmdObj["sethbmsg"].String());
return true;
}
diff --git a/src/mongo/db/repl/rs.cpp b/src/mongo/db/repl/rs.cpp
index d7abe4482ed..798269c7c29 100644
--- a/src/mongo/db/repl/rs.cpp
+++ b/src/mongo/db/repl/rs.cpp
@@ -139,7 +139,7 @@ namespace repl {
}
void ReplSet::shutdown() {
- repl::BackgroundSync::shutdown();
+ BackgroundSync::shutdown();
}
void replLocalAuth() {
diff --git a/src/mongo/db/repl/rs_initialsync.cpp b/src/mongo/db/repl/rs_initialsync.cpp
index e35b4b6745e..f3120fb246a 100644
--- a/src/mongo/db/repl/rs_initialsync.cpp
+++ b/src/mongo/db/repl/rs_initialsync.cpp
@@ -275,7 +275,7 @@ namespace repl {
* this function syncs to this value (inclusive)
* @return if applying the oplog succeeded
*/
- bool ReplSetImpl::_syncDoInitialSync_applyToHead( repl::SyncTail& syncer, OplogReader* r,
+ bool ReplSetImpl::_syncDoInitialSync_applyToHead( SyncTail& syncer, OplogReader* r,
const Member* source, const BSONObj& lastOp ,
BSONObj& minValid ) {
/* our cloned copy will be strange until we apply oplog events that occurred
@@ -358,8 +358,8 @@ namespace repl {
* closer to the latest op time before it can transition to secondary state.
*/
void ReplSetImpl::_syncDoInitialSync() {
- repl::InitialSync init(repl::BackgroundSync::get());
- repl::SyncTail tail(repl::BackgroundSync::get());
+ InitialSync init(BackgroundSync::get());
+ SyncTail tail(BackgroundSync::get());
sethbmsg("initial sync pending",0);
// if this is the first node, it may have already become primary
@@ -488,7 +488,7 @@ namespace repl {
// If we just cloned & there were no ops applied, we still want the primary to know where
// we're up to
- repl::BackgroundSync::notify();
+ BackgroundSync::notify();
changeState(MemberState::RS_RECOVERING);
sethbmsg("initial sync done",0);
diff --git a/src/mongo/db/repl/rs_sync.cpp b/src/mongo/db/repl/rs_sync.cpp
index 5baa2017220..2fd1aa5b0f4 100644
--- a/src/mongo/db/repl/rs_sync.cpp
+++ b/src/mongo/db/repl/rs_sync.cpp
@@ -171,7 +171,7 @@ namespace repl {
}
// record the previous member we were syncing from
- const Member *prev = repl::BackgroundSync::get()->getSyncTarget();
+ const Member *prev = BackgroundSync::get()->getSyncTarget();
if (prev) {
result.append("prevSyncTarget", prev->fullName());
}
@@ -227,7 +227,7 @@ namespace repl {
}
/* we have some data. continue tailing. */
- repl::SyncTail tail(repl::BackgroundSync::get());
+ SyncTail tail(BackgroundSync::get());
tail.oplogApplication();
}
diff --git a/src/mongo/db/repl/sync_source_feedback.cpp b/src/mongo/db/repl/sync_source_feedback.cpp
index 9045a069b51..8a8ac1da5f9 100644
--- a/src/mongo/db/repl/sync_source_feedback.cpp
+++ b/src/mongo/db/repl/sync_source_feedback.cpp
@@ -255,7 +255,7 @@ namespace repl {
if (state.primary() || state.fatal() || state.startup()) {
continue;
}
- const Member* target = repl::BackgroundSync::get()->getSyncTarget();
+ const Member* target = BackgroundSync::get()->getSyncTarget();
if (_syncTarget != target) {
_resetConnection();
_syncTarget = target;