diff options
| author | Amitay Isaacs <amitay@gmail.com> | 2012-11-14 15:51:59 +1100 |
|---|---|---|
| committer | Amitay Isaacs <amitay@gmail.com> | 2012-11-14 15:51:59 +1100 |
| commit | 442d9905fea465b8257fa5bdc666eedb4302b121 (patch) | |
| tree | 4c00d9e08cc94004ccaf60680e47b34b5812224f /ctdb/server/ctdb_lock.c | |
| parent | 56ee668a51bb04634a35593052477cfa92b00fc8 (diff) | |
| download | samba-442d9905fea465b8257fa5bdc666eedb4302b121.tar.gz samba-442d9905fea465b8257fa5bdc666eedb4302b121.tar.xz samba-442d9905fea465b8257fa5bdc666eedb4302b121.zip | |
locking: Do not use RECLOCK for tracking DB locks and latencies
RECLOCK is for recovery lock in CTDB. Do not override the meaning for
tracking locks on databases. Database lock latency has nothing to do
with recovery lock latency.
Signed-off-by: Amitay Isaacs <amitay@gmail.com>
(This used to be ctdb commit 54e24a151d2163954e5a2a1c0f41a2b5c19ae44b)
Diffstat (limited to 'ctdb/server/ctdb_lock.c')
| -rw-r--r-- | ctdb/server/ctdb_lock.c | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/ctdb/server/ctdb_lock.c b/ctdb/server/ctdb_lock.c index 81f0eb3dcf7..e78f3fc15fb 100644 --- a/ctdb/server/ctdb_lock.c +++ b/ctdb/server/ctdb_lock.c @@ -53,6 +53,13 @@ enum lock_type { LOCK_ALLDB, }; +static const char * const lock_type_str[] = { + "lock_record", + "lock_db", + "lock_alldb_prio", + "lock_db", +}; + struct lock_request; /* lock_context is the common part for a lock request */ @@ -567,11 +574,10 @@ static void ctdb_lock_handler(struct tevent_context *ev, if (locked) { CTDB_INCREMENT_STAT(lock_ctx->ctdb, locks.num_current); - CTDB_UPDATE_RECLOCK_LATENCY(lock_ctx->ctdb, "lock()", locks.latency, t); CTDB_INCREMENT_STAT(lock_ctx->ctdb, locks.buckets[id]); if (lock_ctx->ctdb_db) { CTDB_INCREMENT_DB_STAT(lock_ctx->ctdb_db, locks.num_current); - CTDB_UPDATE_DB_RECLOCK_LATENCY(lock_ctx->ctdb_db, "lock()", locks.latency, t); + CTDB_UPDATE_DB_LATENCY(lock_ctx->ctdb_db, lock_type_str[lock_ctx->type], locks.latency, t); CTDB_INCREMENT_DB_STAT(lock_ctx->ctdb_db, locks.buckets[id]); } } else { |