From d5131fc207a36298914bf537b55a544910161b63 Mon Sep 17 00:00:00 2001 From: kay Date: Tue, 16 Oct 2012 17:16:00 -0400 Subject: [PATCH] DOCS-473 db.currentOp doc distinguish btwn v2.2 and prior fields --- source/reference/current-op.txt | 39 +++++++++++++++++++++++++++++++-- 1 file changed, 37 insertions(+), 2 deletions(-) diff --git a/source/reference/current-op.txt b/source/reference/current-op.txt index 24f08d0c4ae..4f01214ad3c 100644 --- a/source/reference/current-op.txt +++ b/source/reference/current-op.txt @@ -156,6 +156,8 @@ Output Reference .. data:: locks + .. versionadded:: 2.2 + The :data:`locks` document reports on the kinds of locks the operation currently holds. The following kinds of locks are possible: @@ -177,6 +179,18 @@ Output Reference :data:`locks.^` reports on the lock state for the database that this operation targets. + :data:`locks` replaces ``lockType`` in earlier versions. + +.. data:: lockType + + *Removed in version 2.2.* + + Identifies the type of lock the operation currently holds. The + possible values are: + + - ``read`` + - ``write`` + .. data:: waitingForLock Returns a boolean value. :data:`waitingForLock` is ``true`` if the @@ -186,8 +200,27 @@ Output Reference .. data:: msg The :data:`msg` provides a message that describes the status and - progress of the operation. In the case of indexing operations, the - field reports the completion percentage. + progress of the operation. In the case of indexing or mapReduce + operations, the field reports the completion percentage. + +.. data:: progress + + Reports on the progress of mapReduce or indexing operations. The + :data:`progress` fields corresponds to the completion percentage in + the :data:`msg` field. The :data:`progress` specifies the following + information: + + .. data:: done + + Reports the number completed. + + .. data:: total + + Reports the total number. + +.. data:: killed + + Reports ``true`` if the operation is killed. .. data:: numYields @@ -201,6 +234,8 @@ Output Reference .. data:: lockStats + .. versionadded:: 2.2 + The :data:`lockStats` document reflects the amount of time the operation has spent both acquiring and holding locks. :data:`lockStats` reports data on a per-lock type, with the