diff options
| author | Meghana Madhusudhan <mmadhusu@redhat.com> | 2015-05-06 10:08:54 +0530 |
|---|---|---|
| committer | Vijay Bellur <vbellur@redhat.com> | 2015-05-07 10:29:29 -0700 |
| commit | cfe56c96ff435f916a7017f3252717cf0df151d9 (patch) | |
| tree | 4e68f1af7f487eb3780550163ccebdd03a3295b9 | |
| parent | 04a72476789d06c0e55b73f953ff1ad68739ebd4 (diff) | |
NFS-Ganesha : Do not empty global config file when cluster is torn
The global config file will need new blocks to support client lock recovery.
Current cleanup function empties the entire file. Deleting only "include"
lines in the config file.
This is the backport of the patch,
http://review.gluster.org/#/c/10630/
Change-Id: I15f7a7aa7bc4f2362abd15b28a8b709d93dc3d37
BUG: 1218857
Signed-off-by: Meghana Madhusudhan <mmadhusu@redhat.com>
Reviewed-on: http://review.gluster.org/10593
Reviewed-by: jiffin tony Thottan <jthottan@redhat.com>
Reviewed-by: Niels de Vos <ndevos@redhat.com>
Tested-by: Gluster Build System <jenkins@build.gluster.com>
| -rwxr-xr-x | extras/ganesha/scripts/ganesha-ha.sh | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/extras/ganesha/scripts/ganesha-ha.sh b/extras/ganesha/scripts/ganesha-ha.sh index 950aeb0362a..e8160f4c99e 100755 --- a/extras/ganesha/scripts/ganesha-ha.sh +++ b/extras/ganesha/scripts/ganesha-ha.sh @@ -198,7 +198,7 @@ cleanup_ganesha_config () rm -rf ${HA_CONFDIR}/exports/*.conf rm -rf ${HA_CONFDIR}/.export_added rm -rf /etc/cluster/cluster.conf* - > $CONF + sed -r -i -e '/^%include[[:space:]]+".+\.conf"$/d' $CONF } |