diff options
| author | Amitay Isaacs <amitay@gmail.com> | 2014-07-15 14:38:52 +1000 |
|---|---|---|
| committer | Volker Lendecke <vl@samba.org> | 2014-08-04 17:59:52 +0200 |
| commit | aa1ff305f9bdd97675ceb4ce2b18f4cd623b8a38 (patch) | |
| tree | 3994d11ec38d1b6cd3bcc8d08ef9a218555b0b0b | |
| parent | dce68a21416dd3dc016ed6a7c884b1314ffca121 (diff) | |
| download | samba-aa1ff305f9bdd97675ceb4ce2b18f4cd623b8a38.tar.gz samba-aa1ff305f9bdd97675ceb4ce2b18f4cd623b8a38.tar.xz samba-aa1ff305f9bdd97675ceb4ce2b18f4cd623b8a38.zip | |
ctdb-locking: Decrement pending statistics when lock is scheduled
and not when the lock is obtained.
Signed-off-by: Amitay Isaacs <amitay@gmail.com>
Reviewed-by: Volker Lendecke <vl@samba.org>
| -rw-r--r-- | ctdb/server/ctdb_lock.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/ctdb/server/ctdb_lock.c b/ctdb/server/ctdb_lock.c index 593f48786c..123b1dcde0 100644 --- a/ctdb/server/ctdb_lock.c +++ b/ctdb/server/ctdb_lock.c @@ -444,10 +444,8 @@ static void ctdb_lock_handler(struct tevent_context *ev, } /* Update statistics */ - CTDB_DECREMENT_STAT(lock_ctx->ctdb, locks.num_pending); CTDB_INCREMENT_STAT(lock_ctx->ctdb, locks.num_calls); if (lock_ctx->ctdb_db) { - CTDB_DECREMENT_DB_STAT(lock_ctx->ctdb_db, locks.num_pending); CTDB_INCREMENT_DB_STAT(lock_ctx->ctdb_db, locks.num_calls); } @@ -798,9 +796,11 @@ static void ctdb_lock_schedule(struct ctdb_context *ctdb) /* Move the context from pending to current */ DLIST_REMOVE(ctdb->lock_pending, lock_ctx); DLIST_ADD_END(ctdb->lock_current, lock_ctx, NULL); + CTDB_DECREMENT_STAT(lock_ctx->ctdb, locks.num_pending); CTDB_INCREMENT_STAT(lock_ctx->ctdb, locks.num_current); if (lock_ctx->ctdb_db) { lock_ctx->ctdb_db->lock_num_current++; + CTDB_DECREMENT_DB_STAT(lock_ctx->ctdb_db, locks.num_pending); CTDB_INCREMENT_DB_STAT(lock_ctx->ctdb_db, locks.num_current); } } |