summaryrefslogtreecommitdiff
path: root/src/mongo/db/write_concern.cpp
diff options
context:
space:
mode:
authormatt dannenberg <matt.dannenberg@10gen.com>2014-05-23 09:31:48 -0400
committermatt dannenberg <matt.dannenberg@10gen.com>2014-05-27 05:44:51 -0400
commite4735eb2de26e12c8048fdd85340f086bd8ab447 (patch)
treea1ed2cd67a705ad1acb72c562f2e942d250b4eec /src/mongo/db/write_concern.cpp
parentc27f26b7b49714649800a7d602fead7d57ca3805 (diff)
downloadmongo-e4735eb2de26e12c8048fdd85340f086bd8ab447.tar.gz
SERVER-14043 s/namespace replset/namespace repl/
Diffstat (limited to 'src/mongo/db/write_concern.cpp')
-rw-r--r--src/mongo/db/write_concern.cpp14
1 files changed, 7 insertions, 7 deletions
diff --git a/src/mongo/db/write_concern.cpp b/src/mongo/db/write_concern.cpp
index 596a582595f..e2975ff103f 100644
--- a/src/mongo/db/write_concern.cpp
+++ b/src/mongo/db/write_concern.cpp
@@ -53,8 +53,8 @@ namespace mongo {
}
const bool isConfigServer = serverGlobalParams.configsvr;
- const bool isMasterSlaveNode = replset::anyReplEnabled() && !replset::theReplSet;
- const bool isReplSetNode = replset::anyReplEnabled() && replset::theReplSet;
+ const bool isMasterSlaveNode = repl::anyReplEnabled() && !repl::theReplSet;
+ const bool isReplSetNode = repl::anyReplEnabled() && repl::theReplSet;
if ( isConfigServer || ( !isMasterSlaveNode && !isReplSetNode ) ) {
@@ -167,12 +167,12 @@ namespace mongo {
return Status::OK();
}
- if (!replset::anyReplEnabled() || serverGlobalParams.configsvr) {
+ if (!repl::anyReplEnabled() || serverGlobalParams.configsvr) {
// no replication check needed (validated above)
return Status::OK();
}
- const bool isMasterSlaveNode = replset::anyReplEnabled() && !replset::theReplSet;
+ const bool isMasterSlaveNode = repl::anyReplEnabled() && !repl::theReplSet;
if ( writeConcern.wMode == "majority" && isMasterSlaveNode ) {
// with master/slave, majority is equivalent to w=1
return Status::OK();
@@ -189,11 +189,11 @@ namespace mongo {
while ( 1 ) {
if ( writeConcern.wNumNodes > 0 ) {
- if (replset::opReplicatedEnough(replOpTime, writeConcern.wNumNodes)) {
+ if (repl::opReplicatedEnough(replOpTime, writeConcern.wNumNodes)) {
break;
}
}
- else if (replset::opReplicatedEnough(replOpTime, writeConcern.wMode)) {
+ else if (repl::opReplicatedEnough(replOpTime, writeConcern.wMode)) {
break;
}
@@ -217,7 +217,7 @@ namespace mongo {
}
// Add stats
- result->writtenTo = replset::getHostsWrittenTo(replOpTime);
+ result->writtenTo = repl::getHostsWrittenTo(replOpTime);
result->wTime = gleTimerHolder.recordMillis();
return replStatus;