Skip to content

Commit 668327a

Browse files
author
Ed Costello
committed
DOCS-533 minor cleanup & verification of correct locks
1 parent b76c685 commit 668327a

16 files changed

+39
-3
lines changed

source/reference/command/applyOps.txt

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -37,6 +37,8 @@ applyOps (internal)
3737
corresponding expected result in the ``res`` field that must match
3838
in order to apply the oplog entry.
3939

40+
.. include:: /includes/warning-blocking-global.rst
41+
4042
.. write-lock
4143

4244
.. see: DOCS-133; SERVER-4259

source/reference/command/collStats.txt

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -48,3 +48,5 @@ collStats
4848
produce unpredictable and unexpected results in some situations.
4949

5050
.. seealso:: ":doc:`/reference/collection-statistics`."
51+
52+
.. READ lock

source/reference/command/convertToCapped.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,4 +26,4 @@ convertToCapped
2626
indexes on this collection you will need to create these indexes
2727
after the conversion is complete.
2828

29-
.. include:: /includes/warning-blocking-database.rst
29+
.. include:: /includes/warning-blocking-global.rst

source/reference/command/dataSize.txt

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -22,3 +22,5 @@ dataSize
2222

2323
The amount of time required to return :dbcommand:`dataSize` depends on the
2424
amount of data in the collection.
25+
26+
.. read-lock

source/reference/command/dbStats.txt

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -27,3 +27,5 @@ dbStats
2727
a wrapper around this functionality. See the
2828
":doc:`/reference/database-statistics`" document for an overview of
2929
this output.
30+
31+
.. read-lock

source/reference/command/emptyCapped.txt

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,3 +15,5 @@ emptycapped
1515

1616
This command removes all records from the capped collection named
1717
``events``.
18+
19+
.. include:: /includes/warning-blocking-database.rst

source/reference/command/filemd5.txt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,3 +16,4 @@ filemd5
1616

1717
{ filemd5: ObjectId("4f1f10e37671b50e4ecd2776"), root: "fs" }
1818

19+
.. read-lock

source/reference/command/findAndModify.txt

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -87,3 +87,5 @@ findAndModify
8787
cluster. :dbcommand:`findAndModify` operations issued against
8888
:program:`mongos` instances for non-sharded collections function
8989
normally.
90+
91+
.. include:: /includes/warning-blocking-database.rst

source/reference/command/reIndex.txt

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -26,3 +26,5 @@ reIndex
2626
.. code-block:: javascript
2727

2828
db.collection.reIndex();
29+
30+
.. include:: /includes/warning-blocking-database.rst

source/reference/command/renameCollection.txt

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -42,3 +42,5 @@ renameCollection
4242

4343
.. warning:: You cannot use :dbcommand:`renameCollection` with
4444
sharded collections.
45+
46+
.. include:: /includes/warning-blocking-global.rst

source/reference/command/replSetReconfig.txt

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -49,4 +49,11 @@ replSetReconfig
4949
the members of the replica set. When this happens, the set will
5050
drop all current connections.
5151

52+
53+
.. note::
54+
55+
The :dbcommand:`replSetReconfig` command will obtain a mutually
56+
exclusive lock to prevent multiple replSetReconfig operations
57+
from occurring at the same time.
58+
5259
.. slave-ok, admin-only

source/reference/command/resync.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,6 @@ resync
1111
that this command is relevant to master-slave replication only. It does
1212
no apply to replica sets.
1313

14-
.. include:: /includes/warning-blocking-database.rst
14+
.. include:: /includes/warning-blocking-global.rst
1515

1616
.. write-lock, slave-ok, admin-only.

source/reference/command/shardingState.txt

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,4 +14,6 @@ shardingState
1414

1515
{ shardingState: 1 }
1616

17+
.. include:: /includes/warning-blocking-database.rst
18+
1719
.. admin-only

source/reference/command/sleep.txt

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,5 +22,11 @@ sleep (internal)
2222
seconds. Without arguments, :dbcommand:`sleep`, causes a "read
2323
lock" for 100 seconds.
2424

25-
.. include:: /includes/warning-blocking-global.rst
25+
.. warning::
2626

27+
This command obtains a global read or write lock depending on
28+
the options specified and will block other operations until
29+
it has completed.
30+
31+
32+
.. read-lock, write-lock, global-lock

source/reference/command/top.txt

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -48,3 +48,5 @@ top
4848

4949
You must issue the :dbcommand:`buildInfo` command against the
5050
``admin`` database.
51+
52+
.. read-lock

source/reference/command/validate.txt

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -41,3 +41,5 @@ validate
4141
impact on the performance of your MongoDB instance.
4242

4343
.. TODO link to the document with these statistics
44+
45+
.. read-lock

0 commit comments

Comments
 (0)