From 14d9c6179715205fb6ac816d4621dd087f5afbb2 Mon Sep 17 00:00:00 2001 From: Pranith Kumar K Date: Mon, 27 May 2019 11:43:26 +0530 Subject: stack: Make sure to have unique call-stacks in all cases At the moment new stack doesn't populate frame->root->unique in all cases. This makes it difficult to debug hung frames by examining successive state dumps. Fuse and server xlators populate it whenever they can, but other xlators won't be able to assign 'unique' when they need to create a new frame/stack because they don't know what 'unique' fuse/server xlators already used. What we need is for unique to be correct. If a stack with same unique is present in successive statedumps, that means the same operation is still in progress. This makes 'finding hung frames' part of debugging hung frames easier. fixes bz#1714098 Change-Id: I3e9a8f6b4111e260106c48a2ac3a41ef29361b9e Signed-off-by: Pranith Kumar K --- xlators/mount/fuse/src/fuse-bridge.c | 15 ++++++++------- xlators/mount/fuse/src/fuse-helpers.c | 1 - 2 files changed, 8 insertions(+), 8 deletions(-) (limited to 'xlators/mount/fuse') diff --git a/xlators/mount/fuse/src/fuse-bridge.c b/xlators/mount/fuse/src/fuse-bridge.c index e14d0b996da..5fa3ff532f9 100644 --- a/xlators/mount/fuse/src/fuse-bridge.c +++ b/xlators/mount/fuse/src/fuse-bridge.c @@ -3277,11 +3277,11 @@ fuse_release(xlator_t *this, fuse_in_header_t *finh, void *msg, priv = this->private; - fuse_log_eh(this, "RELEASE(): %" PRIu64 ":, fd: %p, gfid: %s", finh->unique, - fd, uuid_utoa(fd->inode->gfid)); + fuse_log_eh(this, "RELEASE(): finh->unique: %" PRIu64 ":, fd: %p, gfid: %s", + finh->unique, fd, uuid_utoa(fd->inode->gfid)); - gf_log("glusterfs-fuse", GF_LOG_TRACE, "%" PRIu64 ": RELEASE %p", - finh->unique, state->fd); + gf_log("glusterfs-fuse", GF_LOG_TRACE, + "finh->unique: %" PRIu64 ": RELEASE %p", finh->unique, state->fd); fuse_fd_ctx_destroy(this, state->fd); fd_unref(fd); @@ -3766,11 +3766,12 @@ fuse_releasedir(xlator_t *this, fuse_in_header_t *finh, void *msg, priv = this->private; - fuse_log_eh(this, "RELEASEDIR (): %" PRIu64 ": fd: %p, gfid: %s", + fuse_log_eh(this, + "RELEASEDIR (): finh->unique: %" PRIu64 ": fd: %p, gfid: %s", finh->unique, state->fd, uuid_utoa(state->fd->inode->gfid)); - gf_log("glusterfs-fuse", GF_LOG_TRACE, "%" PRIu64 ": RELEASEDIR %p", - finh->unique, state->fd); + gf_log("glusterfs-fuse", GF_LOG_TRACE, + "finh->unique: %" PRIu64 ": RELEASEDIR %p", finh->unique, state->fd); fuse_fd_ctx_destroy(this, state->fd); fd_unref(state->fd); diff --git a/xlators/mount/fuse/src/fuse-helpers.c b/xlators/mount/fuse/src/fuse-helpers.c index cf4f8e17c51..5bfc40c9fcb 100644 --- a/xlators/mount/fuse/src/fuse-helpers.c +++ b/xlators/mount/fuse/src/fuse-helpers.c @@ -358,7 +358,6 @@ get_call_frame_for_req(fuse_state_t *state) frame->root->uid = finh->uid; frame->root->gid = finh->gid; frame->root->pid = finh->pid; - frame->root->unique = finh->unique; set_lk_owner_from_uint64(&frame->root->lk_owner, state->lk_owner); } -- cgit