diff options
author | Tommaso Tocci <tommaso.tocci@mongodb.com> | 2020-10-01 13:46:39 +0200 |
---|---|---|
committer | Evergreen Agent <no-reply@evergreen.mongodb.com> | 2020-10-01 12:55:27 +0000 |
commit | f880b32be6c6081ca0eb6599fd14b8fad5a5813c (patch) | |
tree | 827fd25908add62d0b11340cb3632da6b57ea918 /src/mongo/s | |
parent | bfd22982681e0af44f52b586b432091174d17945 (diff) | |
download | mongo-f880b32be6c6081ca0eb6599fd14b8fad5a5813c.tar.gz |
Revert "SERVER-50375 Thoroughly test that mongos forwards API parameters"
This reverts commit e66093f0a8ee3cd95dea9480028a6da814bb1854.
Diffstat (limited to 'src/mongo/s')
-rw-r--r-- | src/mongo/s/commands/cluster_kill_op.cpp | 5 | ||||
-rw-r--r-- | src/mongo/s/commands/kill_sessions_remote.cpp | 8 |
2 files changed, 4 insertions, 9 deletions
diff --git a/src/mongo/s/commands/cluster_kill_op.cpp b/src/mongo/s/commands/cluster_kill_op.cpp index 2ce1ecf79ef..1d4927b0f79 100644 --- a/src/mongo/s/commands/cluster_kill_op.cpp +++ b/src/mongo/s/commands/cluster_kill_op.cpp @@ -38,7 +38,6 @@ #include "mongo/bson/bsonobjbuilder.h" #include "mongo/bson/util/bson_extract.h" #include "mongo/client/connpool.h" -#include "mongo/db/api_parameters.h" #include "mongo/db/audit.h" #include "mongo/db/auth/authorization_session.h" #include "mongo/db/commands.h" @@ -112,10 +111,8 @@ private: result.append("shardid", opId); ScopedDbConnection conn(shard->getConnString()); - BSONObjBuilder bob(BSON("killOp" << 1 << "op" << opId)); - APIParameters::get(opCtx).appendInfo(&bob); // intentionally ignore return value - that is how legacy killOp worked. - conn->runCommand(OpMsgRequest::fromDBAndBody("admin", bob.obj())); + conn->runCommand(OpMsgRequest::fromDBAndBody("admin", BSON("killOp" << 1 << "op" << opId))); conn.done(); // The original behavior of killOp on mongos is to always return success, regardless of diff --git a/src/mongo/s/commands/kill_sessions_remote.cpp b/src/mongo/s/commands/kill_sessions_remote.cpp index 0102de0d580..d9b5ce26ccf 100644 --- a/src/mongo/s/commands/kill_sessions_remote.cpp +++ b/src/mongo/s/commands/kill_sessions_remote.cpp @@ -119,11 +119,9 @@ SessionKiller::Result killSessionsRemote(OperationContext* opCtx, // Generate the kill command. KillAllSessionsByPatternCmd cmd; - std::vector<KillAllSessionsByPattern> patterns{matcher.getPatterns().size()}; - for (auto& item : matcher.getPatterns()) { - patterns.push_back(std::move(item.pattern)); - } - cmd.setKillAllSessionsByPattern(std::move(patterns)); + cmd.setKillAllSessionsByPattern(std::vector<KillAllSessionsByPattern>{ + matcher.getPatterns().begin(), matcher.getPatterns().end()}); + return parallelExec(opCtx, cmd.toBSON(), urbg); } |