From 6f02dd76d760cc493e0988bfe047a1b74ca518eb Mon Sep 17 00:00:00 2001 From: Meghana M Date: Fri, 10 Jul 2015 04:23:31 +0530 Subject: [PATCH 232/234] NFS-Ganesha : Add-node does not copy "exports" directory correctly Add-node logic has to copy the "exports" directory into the new node in the same path. There was an error in copying to the correct path. Fixing it. This is a backport of the patch merged upstream, http://review.gluster.org/#/c/11618/ Change-Id: I6781e978e3ee815dc91a5f3b293082002433c24b BUG: 1241366 Signed-off-by: Meghana Madhusudhan Reviewed-on: https://code.engineering.redhat.com/gerrit/52815 Reviewed-by: Soumya Koduri Tested-by: Soumya Koduri --- extras/ganesha/scripts/ganesha-ha.sh | 12 ++++++------ 1 files changed, 6 insertions(+), 6 deletions(-) diff --git a/extras/ganesha/scripts/ganesha-ha.sh b/extras/ganesha/scripts/ganesha-ha.sh index 9e03eb6..9c82c09 100644 --- a/extras/ganesha/scripts/ganesha-ha.sh +++ b/extras/ganesha/scripts/ganesha-ha.sh @@ -243,7 +243,7 @@ grep Export_Id | cut -d " " -f8` if [ -e ${SECRET_PEM} ]; then while [[ ${3} ]]; do - current_host=`echo ${3} | cut -d "." -f 1` + current_host=`echo ${3} | cut -d "." -f 1` if [ ${short_host} != ${current_host} ]; then scp -oPasswordAuthentication=no -oStrictHostKeyChecking=no -i \ ${SECRET_PEM} ${HA_CONFDIR}/exports/export.$VOL.conf \ @@ -282,21 +282,21 @@ string:"EXPORT(Path=/$VOL)" copy_export_config () { local new_node=${1} - local tganesha_conf=$(mktemp -u) + local tganesha_conf=$(mktemp) local tganesha_exports=$(mktemp -d) - + local short_host=$(hostname -s) # avoid prompting for password, even with password-less scp # scp $host1:$file $host2:$file prompts for the password scp -oPasswordAuthentication=no -oStrictHostKeyChecking=no -i \ -${SECRET_PEM} ${HA_VOL_SERVER}:${GANESHA_CONF} ${tganesha_conf} +${SECRET_PEM} ${HA_VOL_SERVER}:${GANESHA_CONF} $short_host:${tganesha_conf} scp -oPasswordAuthentication=no -oStrictHostKeyChecking=no -i \ ${SECRET_PEM} ${tganesha_conf} ${new_node}:${GANESHA_CONF} rm -f ${tganesha_conf} scp -r -oPasswordAuthentication=no -oStrictHostKeyChecking=no -i \ -${SECRET_PEM} ${HA_VOL_SERVER}:${HA_CONFDIR}/exports/ ${tganesha_exports} +${SECRET_PEM} ${HA_VOL_SERVER}:${HA_CONFDIR}/exports/ $short_host:${tganesha_exports} scp -r -oPasswordAuthentication=no -oStrictHostKeyChecking=no -i \ -${SECRET_PEM} ${tganesha_exports} ${new_node}:${HA_CONFDIR}/ +${SECRET_PEM} ${tganesha_exports}/exports ${new_node}:${HA_CONFDIR}/ rm -rf ${tganesha_exports} } -- 1.7.1