From aa1ff305f9bdd97675ceb4ce2b18f4cd623b8a38 Mon Sep 17 00:00:00 2001 From: Amitay Isaacs Date: Tue, 15 Jul 2014 14:38:52 +1000 Subject: [PATCH] ctdb-locking: Decrement pending statistics when lock is scheduled and not when the lock is obtained. Signed-off-by: Amitay Isaacs Reviewed-by: Volker Lendecke --- ctdb/server/ctdb_lock.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/ctdb/server/ctdb_lock.c b/ctdb/server/ctdb_lock.c index 593f48786c5..123b1dcde0a 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); } } -- 2.34.1