diff options
| author | matt dannenberg <matt.dannenberg@10gen.com> | 2014-11-13 13:47:30 -0500 |
|---|---|---|
| committer | matt dannenberg <matt.dannenberg@10gen.com> | 2014-11-24 09:01:51 -0500 |
| commit | d6d10d0c21ad2118dce9e3d6c5efcc6bef965d58 (patch) | |
| tree | 33b5fe9533d60d5d0780f9d13169c99331716d61 /src/mongo/db/repl/replset_commands.cpp | |
| parent | 4a5d53cc94bc5ddb72ecfc5dd038b0ede12b27aa (diff) | |
| download | mongo-d6d10d0c21ad2118dce9e3d6c5efcc6bef965d58.tar.gz | |
SERVER-15804 ensure ramlog contains state changes, syncsource changes, and write acceptance changes
Diffstat (limited to 'src/mongo/db/repl/replset_commands.cpp')
| -rw-r--r-- | src/mongo/db/repl/replset_commands.cpp | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/src/mongo/db/repl/replset_commands.cpp b/src/mongo/db/repl/replset_commands.cpp index 40fc8f8b095..23f281a45bb 100644 --- a/src/mongo/db/repl/replset_commands.cpp +++ b/src/mongo/db/repl/replset_commands.cpp @@ -47,7 +47,6 @@ #include "mongo/db/repl/repl_set_heartbeat_response.h" #include "mongo/db/repl/repl_set_seed_list.h" #include "mongo/db/repl/replset_commands.h" -#include "mongo/db/repl/rslog.h" #include "mongo/db/repl/scoped_conn.h" #include "mongo/db/repl/update_position_args.h" #include "mongo/db/storage/storage_engine.h" @@ -71,7 +70,7 @@ namespace repl { std::vector<Privilege>* out) {} CmdReplSetTest() : ReplSetCommand("replSetTest") { } virtual bool run(OperationContext* txn, const string& , BSONObj& cmdObj, int, string& errmsg, BSONObjBuilder& result, bool fromRepl) { - log() << "replSet replSetTest command received: " << cmdObj.toString() << rsLog; + log() << "replSet replSetTest command received: " << cmdObj.toString(); if( cmdObj.hasElement("forceInitialSyncFailure") ) { replSetForceInitialSyncFailure = (unsigned) cmdObj["forceInitialSyncFailure"].Number(); @@ -238,7 +237,7 @@ namespace { if (configObj.isEmpty()) { result.append("info2", "no configuration explicitly specified -- making one"); log() << "replSet info initiate : no configuration specified. " - "Using a default configuration for the set" << rsLog; + "Using a default configuration for the set"; ReplicationCoordinatorExternalStateImpl externalState; std::string name; @@ -265,7 +264,7 @@ namespace { b.appendArray("members", members.obj()); configObj = b.obj(); log() << "replSet created this configuration for initiation : " << - configObj.toString() << rsLog; + configObj.toString(); } if (configObj.getField("version").eoo()) { @@ -695,8 +694,8 @@ namespace { string& errmsg, BSONObjBuilder& result, bool fromRepl) { - DEV log() << "replSet received elect msg " << cmdObj.toString() << rsLog; - else LOG(2) << "replSet received elect msg " << cmdObj.toString() << rsLog; + DEV log() << "replSet received elect msg " << cmdObj.toString(); + else LOG(2) << "replSet received elect msg " << cmdObj.toString(); Status status = getGlobalReplicationCoordinator()->checkReplEnabledForCommand(&result); if (!status.isOK()) |