summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKrutika Dhananjay <kdhananj@redhat.com>2016-12-28 14:32:12 +0530
committerPranith Kumar Karampuri <pkarampu@redhat.com>2017-01-13 01:29:25 -0800
commitb2ead317933a48ce00f3ee1460080cf4ad16ec9b (patch)
tree75fe434856db421628441fd3baaa0fe166bf1b75
parentec3322bc932d2277873dc337b19c88381df78106 (diff)
mount/fuse: Fix the place where graph switch event is logged
Backport of: http://review.gluster.org/16302 Change-Id: I3c8577b87db02a2a6ce6159e7d04cf58a2bda0c1 BUG: 1411614 Signed-off-by: Krutika Dhananjay <kdhananj@redhat.com> Reviewed-on: http://review.gluster.org/16367 NetBSD-regression: NetBSD Build System <jenkins@build.gluster.org> CentOS-regression: Gluster Build System <jenkins@build.gluster.org> Smoke: Gluster Build System <jenkins@build.gluster.org> Reviewed-by: Raghavendra G <rgowdapp@redhat.com>
-rw-r--r--xlators/mount/fuse/src/fuse-bridge.c7
1 files changed, 4 insertions, 3 deletions
diff --git a/xlators/mount/fuse/src/fuse-bridge.c b/xlators/mount/fuse/src/fuse-bridge.c
index 81fff39..82af5f5 100644
--- a/xlators/mount/fuse/src/fuse-bridge.c
+++ b/xlators/mount/fuse/src/fuse-bridge.c
@@ -4732,6 +4732,7 @@ fuse_graph_sync (xlator_t *this)
fuse_private_t *priv = NULL;
int need_first_lookup = 0;
int ret = 0;
+ int new_graph_id = 0;
xlator_t *old_subvol = NULL, *new_subvol = NULL;
uint64_t winds_on_old_subvol = 0;
@@ -4744,6 +4745,7 @@ fuse_graph_sync (xlator_t *this)
old_subvol = priv->active_subvol;
new_subvol = priv->active_subvol = priv->next_graph->top;
+ new_graph_id = priv->next_graph->id;
priv->next_graph = NULL;
need_first_lookup = 1;
@@ -4762,6 +4764,8 @@ unlock:
pthread_mutex_unlock (&priv->sync_mutex);
if (need_first_lookup) {
+ gf_log ("fuse", GF_LOG_INFO, "switched to graph %d",
+ new_graph_id);
fuse_first_lookup (this);
}
@@ -5167,9 +5171,6 @@ fuse_graph_setup (xlator_t *this, glusterfs_graph_t *graph)
prev_graph->top, NULL);
}
- gf_log ("fuse", GF_LOG_INFO, "switched to graph %d",
- ((graph) ? graph->id : 0));
-
return ret;
unlock:
pthread_mutex_unlock (&priv->sync_mutex);