summaryrefslogtreecommitdiffstats
path: root/glusterfsd
diff options
context:
space:
mode:
authorAnand Avati <avati@redhat.com>2013-06-17 06:19:47 -0700
committerVijay Bellur <vbellur@redhat.com>2013-06-21 02:40:05 -0700
commit4cde70a0e5be0a5e49e42c48365f3c0b205f9741 (patch)
tree25579b4603e1538c53fe75a6be51478dd0ec3f9f /glusterfsd
parentbc27b7a9e44f2af647b87ab393b0fd1cacd211cf (diff)
glusterfsd: consider xlator type too in topology check
When cluster.nufa option is enabled, we only change the translator type, but leave the translator name as-is. This results in the topology change check to conclude that a graph switch is not needed. Change-Id: I4f4d0cec2bd4796c95274f0328584a4e7b8b5cd3 BUG: 975599 Signed-off-by: Anand Avati <avati@redhat.com> Reviewed-on: http://review.gluster.org/5244 Reviewed-by: Krishnan Parthasarathi <kparthas@redhat.com> Tested-by: Gluster Build System <jenkins@build.gluster.com> Reviewed-by: Raghavendra Bhat <raghavendra@redhat.com>
Diffstat (limited to 'glusterfsd')
-rw-r--r--glusterfsd/src/glusterfsd-mgmt.c9
1 files changed, 9 insertions, 0 deletions
diff --git a/glusterfsd/src/glusterfsd-mgmt.c b/glusterfsd/src/glusterfsd-mgmt.c
index 873844f..d2a95a6 100644
--- a/glusterfsd/src/glusterfsd-mgmt.c
+++ b/glusterfsd/src/glusterfsd-mgmt.c
@@ -1366,6 +1366,15 @@ xlator_equal_rec (xlator_t *xl1, xlator_t *xl2)
ret = -1;
goto out;
}
+
+ /* type could have changed even if xlator names match,
+ e.g cluster/distrubte and cluster/nufa share the same
+ xlator name
+ */
+ if (strcmp (xl1->type, xl2->type)) {
+ ret = -1;
+ goto out;
+ }
out :
return ret;
}