diff options
author | Jason Carey <jcarey@argv.me> | 2017-11-03 16:07:49 -0400 |
---|---|---|
committer | Jason Carey <jcarey@argv.me> | 2017-11-06 14:54:05 -0500 |
commit | dc04d7d6f22e6542f9f20cf33cd40015cefcf530 (patch) | |
tree | f8a18b8589411bc2df0eb5307a189e1d07ac1a52 /src/mongo/scripting | |
parent | df03dc67fa491b944dd1e6c366f4a19cf6b38032 (diff) | |
download | mongo-dc04d7d6f22e6542f9f20cf33cd40015cefcf530.tar.gz |
SERVER-31828 endSession in js should end sessions
endSessions is of the form
{ endSessions: [] },
not
{ endSessions: 1, lsids: []}.
fix it up and add a test
Diffstat (limited to 'src/mongo/scripting')
-rw-r--r-- | src/mongo/scripting/mozjs/end_sessions.idl | 7 | ||||
-rw-r--r-- | src/mongo/scripting/mozjs/session.cpp | 10 |
2 files changed, 2 insertions, 15 deletions
diff --git a/src/mongo/scripting/mozjs/end_sessions.idl b/src/mongo/scripting/mozjs/end_sessions.idl index 1cd8036ab59..2b2c8e69ce5 100644 --- a/src/mongo/scripting/mozjs/end_sessions.idl +++ b/src/mongo/scripting/mozjs/end_sessions.idl @@ -29,9 +29,4 @@ structs: description: "A struct representing an endSessions command" strict: true fields: - endSessions: int - ids: array<object> - "$clusterTime": - cpp_name: clusterTime - type: object - optional: true + endSessions: array<object> diff --git a/src/mongo/scripting/mozjs/session.cpp b/src/mongo/scripting/mozjs/session.cpp index 858524669c2..4c8fa2eded7 100644 --- a/src/mongo/scripting/mozjs/session.cpp +++ b/src/mongo/scripting/mozjs/session.cpp @@ -76,15 +76,7 @@ void endSession(SessionHolder* holder) { EndSessions es; - es.setEndSessions(1); - es.setIds({holder->lsid}); - if (holder->client->isMongos()) { - auto clusterTime = MongoBase::getClusterTime(); - - if (!clusterTime.isEmpty()) { - es.setClusterTime(clusterTime); - } - } + es.setEndSessions({holder->lsid}); BSONObj out; holder->client->runCommand("admin", es.toBSON(), out); |