summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--src/mongo/client/embedded/SConscript1
-rw-r--r--src/mongo/client/embedded/libmongodbcapi_test.cpp6
-rw-r--r--src/mongo/db/commands/SConscript1
-rw-r--r--src/mongo/db/commands/sleep_command.cpp131
-rw-r--r--src/mongo/db/commands/test_commands.cpp92
5 files changed, 133 insertions, 98 deletions
diff --git a/src/mongo/client/embedded/SConscript b/src/mongo/client/embedded/SConscript
index eecf1e3387d..38516537b4a 100644
--- a/src/mongo/client/embedded/SConscript
+++ b/src/mongo/client/embedded/SConscript
@@ -160,7 +160,6 @@ capiTest = capiTestEnv.Program(
],
LIBDEPS=[
'$BUILD_DIR/mongo/base',
- '$BUILD_DIR/mongo/db/commands/shell_protocol',
'$BUILD_DIR/mongo/db/commands/test_commands_enabled',
'$BUILD_DIR/mongo/db/server_options_core',
'$BUILD_DIR/mongo/rpc/protocol',
diff --git a/src/mongo/client/embedded/libmongodbcapi_test.cpp b/src/mongo/client/embedded/libmongodbcapi_test.cpp
index 49700732031..2575c217a2c 100644
--- a/src/mongo/client/embedded/libmongodbcapi_test.cpp
+++ b/src/mongo/client/embedded/libmongodbcapi_test.cpp
@@ -526,7 +526,6 @@ TEST_F(MongodbCAPITest, RunListCommands) {
"aggregate",
"authenticate",
"buildInfo",
- "captrunc",
"clearLog",
"cloneCollectionAsCapped",
"collMod",
@@ -548,7 +547,6 @@ TEST_F(MongodbCAPITest, RunListCommands) {
"dropDatabase",
"dropIndexes",
"echo",
- "emptycapped",
"endSessions",
"explain",
"features",
@@ -563,7 +561,6 @@ TEST_F(MongodbCAPITest, RunListCommands) {
"getPrevError",
"getShardMap",
"getnonce",
- "godinsert",
"hostInfo",
"insert",
"isMaster",
@@ -606,8 +603,7 @@ TEST_F(MongodbCAPITest, RunListCommands) {
"startSession",
"trimMemory",
"update",
- "validate",
- "whatsmyuri"};
+ "validate"};
std::sort(whitelist.begin(), whitelist.end());
mongo::BSONObj listCommandsObj = mongo::fromjson("{ listCommands: 1 }");
diff --git a/src/mongo/db/commands/SConscript b/src/mongo/db/commands/SConscript
index ba1bdc9f7db..a56c11d262f 100644
--- a/src/mongo/db/commands/SConscript
+++ b/src/mongo/db/commands/SConscript
@@ -216,6 +216,7 @@ env.Library(
"rename_collection_cmd.cpp",
"repair_cursor.cpp",
"run_aggregate.cpp",
+ "sleep_command.cpp",
"validate.cpp",
"write_commands/write_commands.cpp",
],
diff --git a/src/mongo/db/commands/sleep_command.cpp b/src/mongo/db/commands/sleep_command.cpp
new file mode 100644
index 00000000000..ecf04ba6519
--- /dev/null
+++ b/src/mongo/db/commands/sleep_command.cpp
@@ -0,0 +1,131 @@
+/**
+* Copyright (C) 2018 MongoDB Inc.
+*
+* This program is free software: you can redistribute it and/or modify
+* it under the terms of the GNU Affero General Public License, version 3,
+* as published by the Free Software Foundation.
+*
+* This program is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+* GNU Affero General Public License for more details.
+*
+* You should have received a copy of the GNU Affero General Public License
+* along with this program. If not, see <http://www.gnu.org/licenses/>.
+*
+* As a special exception, the copyright holders give permission to link the
+* code of portions of this program with the OpenSSL library under certain
+* conditions as described in each individual source file and distribute
+* linked combinations including the program with the OpenSSL library. You
+* must comply with the GNU Affero General Public License in all respects for
+* all of the code used other than as permitted herein. If you modify file(s)
+* with this exception, you may extend this exception to your version of the
+* file(s), but you are not obligated to do so. If you do not wish to do so,
+* delete this exception statement from your version. If you delete this
+* exception statement from all source files in the program, then also delete
+* it in the license file.
+*/
+
+#define MONGO_LOG_DEFAULT_COMPONENT ::mongo::logger::LogComponent::kCommand
+
+#include "mongo/platform/basic.h"
+
+#include "mongo/db/commands.h"
+#include "mongo/db/commands/test_commands_enabled.h"
+#include "mongo/db/concurrency/d_concurrency.h"
+#include "mongo/util/log.h"
+
+namespace mongo {
+
+/* for diagnostic / testing purposes. Enabled via command line. */
+class CmdSleep : public BasicCommand {
+public:
+ virtual bool supportsWriteConcern(const BSONObj& cmd) const override {
+ return false;
+ }
+
+ virtual bool adminOnly() const {
+ return true;
+ }
+
+ AllowedOnSecondary secondaryAllowed(ServiceContext*) const override {
+ return AllowedOnSecondary::kAlways;
+ }
+
+ std::string help() const override {
+ return "internal testing command. Run a no-op command for an arbitrary amount of time. "
+ "If neither 'secs' nor 'millis' is set, command will sleep for 10 seconds. "
+ "If both are set, command will sleep for the sum of 'secs' and 'millis.'\n"
+ " w:<bool> (deprecated: use 'lock' instead) if true, takes a write lock.\n"
+ " lock: r, w, none. If r or w, db will block under a lock. Defaults to r."
+ " 'lock' and 'w' may not both be set.\n"
+ " secs:<seconds> Amount of time to sleep, in seconds.\n"
+ " millis:<milliseconds> Amount of time to sleep, in ms.\n";
+ }
+
+ // No auth needed because it only works when enabled via command line.
+ virtual void addRequiredPrivileges(const std::string& dbname,
+ const BSONObj& cmdObj,
+ std::vector<Privilege>* out) const {}
+
+ void _sleepInReadLock(mongo::OperationContext* opCtx, long long millis) {
+ Lock::GlobalRead lk(opCtx);
+ opCtx->sleepFor(Milliseconds(millis));
+ }
+
+ void _sleepInWriteLock(mongo::OperationContext* opCtx, long long millis) {
+ Lock::GlobalWrite lk(opCtx);
+ opCtx->sleepFor(Milliseconds(millis));
+ }
+
+ CmdSleep() : BasicCommand("sleep") {}
+ bool run(OperationContext* opCtx,
+ const std::string& ns,
+ const BSONObj& cmdObj,
+ BSONObjBuilder& result) {
+ log() << "test only command sleep invoked";
+ long long millis = 0;
+
+ if (cmdObj["secs"] || cmdObj["millis"]) {
+ if (cmdObj["secs"]) {
+ uassert(34344, "'secs' must be a number.", cmdObj["secs"].isNumber());
+ millis += cmdObj["secs"].numberLong() * 1000;
+ }
+ if (cmdObj["millis"]) {
+ uassert(34345, "'millis' must be a number.", cmdObj["millis"].isNumber());
+ millis += cmdObj["millis"].numberLong();
+ }
+ } else {
+ millis = 10 * 1000;
+ }
+
+ if (!cmdObj["lock"]) {
+ // Legacy implementation
+ if (cmdObj.getBoolField("w")) {
+ _sleepInWriteLock(opCtx, millis);
+ } else {
+ _sleepInReadLock(opCtx, millis);
+ }
+ } else {
+ uassert(34346, "Only one of 'w' and 'lock' may be set.", !cmdObj["w"]);
+
+ std::string lock(cmdObj.getStringField("lock"));
+ if (lock == "none") {
+ opCtx->sleepFor(Milliseconds(millis));
+ } else if (lock == "w") {
+ _sleepInWriteLock(opCtx, millis);
+ } else {
+ uassert(34347, "'lock' must be one of 'r', 'w', 'none'.", lock == "r");
+ _sleepInReadLock(opCtx, millis);
+ }
+ }
+
+ // Interrupt point for testing (e.g. maxTimeMS).
+ opCtx->checkForInterrupt();
+
+ return true;
+ }
+};
+
+MONGO_REGISTER_TEST_COMMAND(CmdSleep);
+} // namespace
diff --git a/src/mongo/db/commands/test_commands.cpp b/src/mongo/db/commands/test_commands.cpp
index 74e09ab87ae..a25810fb6ec 100644
--- a/src/mongo/db/commands/test_commands.cpp
+++ b/src/mongo/db/commands/test_commands.cpp
@@ -110,98 +110,6 @@ public:
MONGO_REGISTER_TEST_COMMAND(GodInsert);
-/* for diagnostic / testing purposes. Enabled via command line. */
-class CmdSleep : public BasicCommand {
-public:
- virtual bool supportsWriteConcern(const BSONObj& cmd) const override {
- return false;
- }
-
- virtual bool adminOnly() const {
- return true;
- }
-
- AllowedOnSecondary secondaryAllowed(ServiceContext*) const override {
- return AllowedOnSecondary::kAlways;
- }
-
- std::string help() const override {
- return "internal testing command. Run a no-op command for an arbitrary amount of time. "
- "If neither 'secs' nor 'millis' is set, command will sleep for 10 seconds. "
- "If both are set, command will sleep for the sum of 'secs' and 'millis.'\n"
- " w:<bool> (deprecated: use 'lock' instead) if true, takes a write lock.\n"
- " lock: r, w, none. If r or w, db will block under a lock. Defaults to r."
- " 'lock' and 'w' may not both be set.\n"
- " secs:<seconds> Amount of time to sleep, in seconds.\n"
- " millis:<milliseconds> Amount of time to sleep, in ms.\n";
- }
-
- // No auth needed because it only works when enabled via command line.
- virtual void addRequiredPrivileges(const std::string& dbname,
- const BSONObj& cmdObj,
- std::vector<Privilege>* out) const {}
-
- void _sleepInReadLock(mongo::OperationContext* opCtx, long long millis) {
- Lock::GlobalRead lk(opCtx);
- opCtx->sleepFor(Milliseconds(millis));
- }
-
- void _sleepInWriteLock(mongo::OperationContext* opCtx, long long millis) {
- Lock::GlobalWrite lk(opCtx);
- opCtx->sleepFor(Milliseconds(millis));
- }
-
- CmdSleep() : BasicCommand("sleep") {}
- bool run(OperationContext* opCtx,
- const string& ns,
- const BSONObj& cmdObj,
- BSONObjBuilder& result) {
- log() << "test only command sleep invoked";
- long long millis = 0;
-
- if (cmdObj["secs"] || cmdObj["millis"]) {
- if (cmdObj["secs"]) {
- uassert(34344, "'secs' must be a number.", cmdObj["secs"].isNumber());
- millis += cmdObj["secs"].numberLong() * 1000;
- }
- if (cmdObj["millis"]) {
- uassert(34345, "'millis' must be a number.", cmdObj["millis"].isNumber());
- millis += cmdObj["millis"].numberLong();
- }
- } else {
- millis = 10 * 1000;
- }
-
- if (!cmdObj["lock"]) {
- // Legacy implementation
- if (cmdObj.getBoolField("w")) {
- _sleepInWriteLock(opCtx, millis);
- } else {
- _sleepInReadLock(opCtx, millis);
- }
- } else {
- uassert(34346, "Only one of 'w' and 'lock' may be set.", !cmdObj["w"]);
-
- std::string lock(cmdObj.getStringField("lock"));
- if (lock == "none") {
- opCtx->sleepFor(Milliseconds(millis));
- } else if (lock == "w") {
- _sleepInWriteLock(opCtx, millis);
- } else {
- uassert(34347, "'lock' must be one of 'r', 'w', 'none'.", lock == "r");
- _sleepInReadLock(opCtx, millis);
- }
- }
-
- // Interrupt point for testing (e.g. maxTimeMS).
- opCtx->checkForInterrupt();
-
- return true;
- }
-};
-
-MONGO_REGISTER_TEST_COMMAND(CmdSleep);
-
// Testing only, enabled via command-line.
class CapTrunc : public BasicCommand {
public:
View Lorry Controller Status