diff options
| author | matt dannenberg <matt.dannenberg@10gen.com> | 2015-04-09 10:01:45 -0400 |
|---|---|---|
| committer | matt dannenberg <matt.dannenberg@10gen.com> | 2015-04-17 11:27:21 -0400 |
| commit | 5a29fa08eeea0ece229102dcd4e7b6580c7acd1d (patch) | |
| tree | 15d965b370cee5c9bca32f91c3d944ccc04d7038 /src/mongo/s/s_only.cpp | |
| parent | ea32e99a4e06930b2cae7b03882e3fda3333934b (diff) | |
| download | mongo-5a29fa08eeea0ece229102dcd4e7b6580c7acd1d.tar.gz | |
SERVER-15860 Switch replication metadata ops to be replication-specific, rather than using commands
Diffstat (limited to 'src/mongo/s/s_only.cpp')
| -rw-r--r-- | src/mongo/s/s_only.cpp | 14 |
1 files changed, 6 insertions, 8 deletions
diff --git a/src/mongo/s/s_only.cpp b/src/mongo/s/s_only.cpp index 9b5aab2c495..e33d19a0653 100644 --- a/src/mongo/s/s_only.cpp +++ b/src/mongo/s/s_only.cpp @@ -111,9 +111,8 @@ namespace mongo { int queryOptions, const char *ns, BSONObj& cmdObj, - BSONObjBuilder& result, - bool fromRepl ) { - execCommandClientBasic(txn, c, *txn->getClient(), queryOptions, ns, cmdObj, result, fromRepl); + BSONObjBuilder& result) { + execCommandClientBasic(txn, c, *txn->getClient(), queryOptions, ns, cmdObj, result); } void Command::execCommandClientBasic(OperationContext* txn, @@ -122,8 +121,7 @@ namespace mongo { int queryOptions, const char *ns, BSONObj& cmdObj, - BSONObjBuilder& result, - bool fromRepl ) { + BSONObjBuilder& result) { std::string dbname = nsToDatabase(ns); if (cmdObj.getBoolField("help")) { @@ -136,7 +134,7 @@ namespace mongo { return; } - Status status = _checkAuthorization(c, &client, dbname, cmdObj, fromRepl); + Status status = _checkAuthorization(c, &client, dbname, cmdObj); if (!status.isOK()) { appendCommandStatus(result, status); return; @@ -147,7 +145,7 @@ namespace mongo { std::string errmsg; bool ok; try { - ok = c->run( txn, dbname , cmdObj, queryOptions, errmsg, result, false ); + ok = c->run(txn, dbname , cmdObj, queryOptions, errmsg, result); } catch (const DBException& e) { ok = false; @@ -191,7 +189,7 @@ namespace mongo { } OperationContext* noTxn = NULL; // mongos doesn't use transactions SERVER-13931 - execCommandClientBasic(noTxn, c, cc(), queryOptions, ns, jsobj, anObjBuilder, false); + execCommandClientBasic(noTxn, c, cc(), queryOptions, ns, jsobj, anObjBuilder); } } //namespace mongo |