From 5069a6d9e9300a33ec2d01ca14ac508bcf348c48 Mon Sep 17 00:00:00 2001 From: skerschb Date: Fri, 15 Jun 2018 16:08:46 -0400 Subject: [PATCH 1/2] DOCS-11622:sharded kill --- source/reference/command/killOp.txt | 8 ++++++++ source/reference/method/db.killOp.txt | 7 +++++++ source/release-notes/4.0.txt | 4 ++++ 3 files changed, 19 insertions(+) diff --git a/source/reference/command/killOp.txt b/source/reference/command/killOp.txt index 8a31e87958d..547e0e0f911 100644 --- a/source/reference/command/killOp.txt +++ b/source/reference/command/killOp.txt @@ -39,6 +39,14 @@ Definition .. include:: /includes/extracts/warning-terminating-ops-command.rst + +.. versionchanged:: 4.0 + + The ``killOp`` command can be run on a :binary:`~bin.mongos` and can + kill queries that span shards in a cluster. For information on how + to list sharding operationsthat are active on a mongos, see the + ``localOps`` parameter in :pipeline:`$currentOp`. + Access Control -------------- diff --git a/source/reference/method/db.killOp.txt b/source/reference/method/db.killOp.txt index 436d63318eb..00b01612279 100644 --- a/source/reference/method/db.killOp.txt +++ b/source/reference/method/db.killOp.txt @@ -27,6 +27,13 @@ Description .. include:: /includes/extracts/warning-terminating-ops-method.rst +.. versionchanged:: 4.0 + + The ``db.killOp()`` method can be run on a :binary:`~bin.mongos` and can + kill queries that are running on more than one shard in a cluster. + For information on how to list sharding operationsthat are active on + a mongos, see the ``localOps`` parameter in :pipeline:`$currentOp`. + Access Control -------------- diff --git a/source/release-notes/4.0.txt b/source/release-notes/4.0.txt index f6335b2e7ba..e813ea77184 100644 --- a/source/release-notes/4.0.txt +++ b/source/release-notes/4.0.txt @@ -735,6 +735,10 @@ Commands - ``uuids`` field that contains the collections and their corresponding UUIDs. + +- The command :dbcommand:`killOp` now supports termination of queries that are + running on a :binary:`~bin.mongos`. When run on the ``mongos``, :dbcommand:`killOp` + can kill queries that are running in more than one shard. Network Layer Improvements ~~~~~~~~~~~~~~~~~~~~~~~~~~ From c0908236eaffb34a04376be6b9b89804e1761064 Mon Sep 17 00:00:00 2001 From: skerschb Date: Fri, 22 Jun 2018 11:43:24 -0400 Subject: [PATCH 2/2] DOCS-11622: sharded kill --- source/reference/command/killOp.txt | 2 +- source/reference/method/db.killOp.txt | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/source/reference/command/killOp.txt b/source/reference/command/killOp.txt index 547e0e0f911..b402be1b407 100644 --- a/source/reference/command/killOp.txt +++ b/source/reference/command/killOp.txt @@ -44,7 +44,7 @@ Definition The ``killOp`` command can be run on a :binary:`~bin.mongos` and can kill queries that span shards in a cluster. For information on how - to list sharding operationsthat are active on a mongos, see the + to list sharding operations that are active on a mongos, see the ``localOps`` parameter in :pipeline:`$currentOp`. Access Control diff --git a/source/reference/method/db.killOp.txt b/source/reference/method/db.killOp.txt index 00b01612279..cc89c382671 100644 --- a/source/reference/method/db.killOp.txt +++ b/source/reference/method/db.killOp.txt @@ -31,7 +31,7 @@ Description The ``db.killOp()`` method can be run on a :binary:`~bin.mongos` and can kill queries that are running on more than one shard in a cluster. - For information on how to list sharding operationsthat are active on + For information on how to list sharding operations that are active on a mongos, see the ``localOps`` parameter in :pipeline:`$currentOp`. Access Control