diff options
| -rw-r--r-- | jstests/noPassthrough/awaitable_hello.js | 16 | ||||
| -rw-r--r-- | src/mongo/client/server_discovery_monitor.cpp | 1 | ||||
| -rw-r--r-- | src/mongo/db/repl/hello.idl | 4 | ||||
| -rw-r--r-- | src/mongo/db/repl/replication_info.cpp | 8 | ||||
| -rw-r--r-- | src/mongo/s/commands/cluster_hello_cmd.cpp | 8 |
5 files changed, 0 insertions, 37 deletions
diff --git a/jstests/noPassthrough/awaitable_hello.js b/jstests/noPassthrough/awaitable_hello.js index bf3eb3dd379..ab1b01f8040 100644 --- a/jstests/noPassthrough/awaitable_hello.js +++ b/jstests/noPassthrough/awaitable_hello.js @@ -28,10 +28,6 @@ function runTest(db, cmd, logFailpoint) { assert.commandWorked( db.runCommand({[cmd]: 1, topologyVersion: topologyVersionField, maxAwaitTimeMS: 0})); - // Check that commands with the optional awaitable flag also succeeds. - assert.commandWorked(db.runCommand( - {[cmd]: 1, awaitable: true, topologyVersion: topologyVersionField, maxAwaitTimeMS: 0})); - // Ensure the command waits for at least maxAwaitTimeMS before returning, and doesn't appear in // slow query log even if it takes many seconds. assert.commandWorked(db.adminCommand({clearLog: 'global'})); @@ -194,18 +190,6 @@ function runTest(db, cmd, logFailpoint) { maxAwaitTimeMS: -1, }), [31373, 51759, kIDLParserComparisonError]); - - // Check that the command fails if the awaitable flag is present but either the topologyVersion, - // the maxAwaitTimeMS, or both are missing. - assert.commandFailedWithCode(db.runCommand({[cmd]: 1, awaitable: true}), [5135800, 5135801]); - assert.commandFailedWithCode(db.runCommand({ - [cmd]: 1, - awaitable: true, - topologyVersion: topologyVersionField, - }), - [5135800, 5135801]); - assert.commandFailedWithCode(db.runCommand({[cmd]: 1, awaitable: true, maxAwaitTimeMS: 0}), - [5135800, 5135801]); } // Set command log verbosity to 0 to avoid logging *all* commands in the "slow query" log. diff --git a/src/mongo/client/server_discovery_monitor.cpp b/src/mongo/client/server_discovery_monitor.cpp index ad2e9953ee1..02957400c80 100644 --- a/src/mongo/client/server_discovery_monitor.cpp +++ b/src/mongo/client/server_discovery_monitor.cpp @@ -242,7 +242,6 @@ StatusWith<TaskExecutor::CallbackHandle> SingleServerDiscoveryMonitor::_schedule BSONObjBuilder bob; bob.append("isMaster", 1); - bob.append("awaitable", 1); bob.append("maxAwaitTimeMS", maxAwaitTimeMS); bob.append("topologyVersion", _topologyVersion->toBSON()); diff --git a/src/mongo/db/repl/hello.idl b/src/mongo/db/repl/hello.idl index e2ac86e1b76..51d594cdd0c 100644 --- a/src/mongo/db/repl/hello.idl +++ b/src/mongo/db/repl/hello.idl @@ -205,10 +205,6 @@ commands: reply_type: HelloCommandReply strict: true fields: - awaitable: - type: safeBool - optional: true - unstable: true forShell: type: safeBool default: false diff --git a/src/mongo/db/repl/replication_info.cpp b/src/mongo/db/repl/replication_info.cpp index ba7c3131844..269be023d79 100644 --- a/src/mongo/db/repl/replication_info.cpp +++ b/src/mongo/db/repl/replication_info.cpp @@ -359,14 +359,6 @@ public: curOp->pauseTimer(); timerGuard.emplace([curOp]() { curOp->resumeTimer(); }); } else { - // The awaitable field is optional, but if it exists, it requires both other fields. - // Note that the awaitable field only exists to make filtering out these operations - // via currentOp queries easier and is not otherwise explicitly used. - uassert(5135800, - "A request marked awaitable must contain both 'topologyVersion' and " - "'maxAwaitTimeMS'", - !cmd.getAwaitable() || !cmd.getAwaitable()); - uassert(31368, (clientTopologyVersion ? "A request with a 'topologyVersion' must include 'maxAwaitTimeMS'" diff --git a/src/mongo/s/commands/cluster_hello_cmd.cpp b/src/mongo/s/commands/cluster_hello_cmd.cpp index 69040ef342d..6b8db0c0353 100644 --- a/src/mongo/s/commands/cluster_hello_cmd.cpp +++ b/src/mongo/s/commands/cluster_hello_cmd.cpp @@ -129,14 +129,6 @@ public: curOp->pauseTimer(); timerGuard.emplace([curOp]() { curOp->resumeTimer(); }); } else { - // The awaitable field is optional, but if it exists, it requires both other fields. - // Note that the awaitable field only exists to make filtering out these operations - // via currentOp queries easier and is not otherwise explicitly used. - uassert(5135801, - "A request marked awaitable must contain both 'topologyVersion' and " - "'maxAwaitTimeMS'", - !cmd.getAwaitable() || !cmd.getAwaitable().get()); - uassert(51760, (clientTopologyVersion ? "A request with a 'topologyVersion' must include 'maxAwaitTimeMS'" |