|
 |
cb8e9e |
From 58457c3949cd9b1244263ce67b556ae62818c668 Mon Sep 17 00:00:00 2001
|
|
|
cb8e9e |
From: Rajesh Joseph <rjoseph@redhat.com>
|
|
|
cb8e9e |
Date: Thu, 25 Jun 2015 16:10:29 +0530
|
|
|
cb8e9e |
Subject: [PATCH 174/190] ganesha: volinfo is not persisted after modifying options
|
|
|
cb8e9e |
|
|
|
cb8e9e |
ganesha disables gluster NFS when it is enabled. Gluster NFS
|
|
|
cb8e9e |
is disabled by storing nfs.disable as "on" in volinfo of each
|
|
|
cb8e9e |
volume in the cluster. But volinfo is not persisted after the
|
|
|
cb8e9e |
change.
|
|
|
cb8e9e |
|
|
|
cb8e9e |
Due to which wrong info is passed in handshake leading to volume
|
|
|
cb8e9e |
checksum mismatch.
|
|
|
cb8e9e |
|
|
|
cb8e9e |
Bug: 1235540
|
|
|
cb8e9e |
Change-Id: I3e8bceea731d744744eb55792c1d5ee819848894
|
|
|
cb8e9e |
Reviewed-on: http://review.gluster.org/11412/
|
|
|
cb8e9e |
Signed-off-by: Rajesh Joseph <rjoseph@redhat.com>
|
|
|
cb8e9e |
Reviewed-on: https://code.engineering.redhat.com/gerrit/51703
|
|
|
cb8e9e |
Reviewed-by: Soumya Koduri <skoduri@redhat.com>
|
|
|
cb8e9e |
Tested-by: Soumya Koduri <skoduri@redhat.com>
|
|
|
cb8e9e |
---
|
|
|
cb8e9e |
xlators/mgmt/glusterd/src/glusterd-ganesha.c | 8 ++++++++
|
|
|
cb8e9e |
1 files changed, 8 insertions(+), 0 deletions(-)
|
|
|
cb8e9e |
|
|
|
cb8e9e |
diff --git a/xlators/mgmt/glusterd/src/glusterd-ganesha.c b/xlators/mgmt/glusterd/src/glusterd-ganesha.c
|
|
|
cb8e9e |
index f0b20a0..4d2efb9 100644
|
|
|
cb8e9e |
--- a/xlators/mgmt/glusterd/src/glusterd-ganesha.c
|
|
|
cb8e9e |
+++ b/xlators/mgmt/glusterd/src/glusterd-ganesha.c
|
|
|
cb8e9e |
@@ -661,6 +661,14 @@ start_ganesha (char **op_errstr)
|
|
|
cb8e9e |
ret = dict_set_str (vol_opts, "nfs.disable", "on");
|
|
|
cb8e9e |
if (ret)
|
|
|
cb8e9e |
goto out;
|
|
|
cb8e9e |
+
|
|
|
cb8e9e |
+ ret = glusterd_store_volinfo (volinfo,
|
|
|
cb8e9e |
+ GLUSTERD_VOLINFO_VER_AC_INCREMENT);
|
|
|
cb8e9e |
+ if (ret) {
|
|
|
cb8e9e |
+ *op_errstr = gf_strdup ("Failed to store the "
|
|
|
cb8e9e |
+ "Volume information");
|
|
|
cb8e9e |
+ goto out;
|
|
|
cb8e9e |
+ }
|
|
|
cb8e9e |
}
|
|
|
cb8e9e |
|
|
|
cb8e9e |
ret = priv->nfs_svc.stop (&(priv->nfs_svc), SIGKILL);
|
|
|
cb8e9e |
--
|
|
|
cb8e9e |
1.7.1
|
|
|
cb8e9e |
|