Return-Path: X-Original-To: apmail-trafodion-commits-archive@www.apache.org Delivered-To: apmail-trafodion-commits-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id E61EE184BE for ; Sat, 10 Oct 2015 03:49:06 +0000 (UTC) Received: (qmail 89359 invoked by uid 500); 10 Oct 2015 03:49:06 -0000 Delivered-To: apmail-trafodion-commits-archive@trafodion.apache.org Received: (qmail 89324 invoked by uid 500); 10 Oct 2015 03:49:06 -0000 Mailing-List: contact commits-help@trafodion.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: commits@trafodion.apache.org Delivered-To: mailing list commits@trafodion.apache.org Received: (qmail 89314 invoked by uid 99); 10 Oct 2015 03:49:06 -0000 Received: from Unknown (HELO spamd1-us-west.apache.org) (209.188.14.142) by apache.org (qpsmtpd/0.29) with ESMTP; Sat, 10 Oct 2015 03:49:06 +0000 Received: from localhost (localhost [127.0.0.1]) by spamd1-us-west.apache.org (ASF Mail Server at spamd1-us-west.apache.org) with ESMTP id 3E819C1DA3 for ; Sat, 10 Oct 2015 03:49:06 +0000 (UTC) X-Virus-Scanned: Debian amavisd-new at spamd1-us-west.apache.org X-Spam-Flag: NO X-Spam-Score: 1.791 X-Spam-Level: * X-Spam-Status: No, score=1.791 tagged_above=-999 required=6.31 tests=[KAM_ASCII_DIVIDERS=0.8, KAM_LAZY_DOMAIN_SECURITY=1, T_RP_MATCHES_RCVD=-0.01, URIBL_BLOCKED=0.001] autolearn=disabled Received: from mx1-us-west.apache.org ([10.40.0.8]) by localhost (spamd1-us-west.apache.org [10.40.0.7]) (amavisd-new, port 10024) with ESMTP id r5-Ue4HJhq3M for ; Sat, 10 Oct 2015 03:48:54 +0000 (UTC) Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by mx1-us-west.apache.org (ASF Mail Server at mx1-us-west.apache.org) with SMTP id 260B32074F for ; Sat, 10 Oct 2015 03:48:54 +0000 (UTC) Received: (qmail 89281 invoked by uid 99); 10 Oct 2015 03:48:54 -0000 Received: from git1-us-west.apache.org (HELO git1-us-west.apache.org) (140.211.11.23) by apache.org (qpsmtpd/0.29) with ESMTP; Sat, 10 Oct 2015 03:48:54 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id D0C21E04C8; Sat, 10 Oct 2015 03:48:53 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: arvindn@apache.org To: commits@trafodion.incubator.apache.org Date: Sat, 10 Oct 2015 03:48:53 -0000 Message-Id: X-Mailer: ASF-Git Admin Mailer Subject: [1/2] incubator-trafodion git commit: 0000034: Missing fully qualified path for 'ip' from dcs bind script Repository: incubator-trafodion Updated Branches: refs/heads/master 39d9c2975 -> a751675ff 0000034: Missing fully qualified path for 'ip' from dcs bind script Project: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/commit/f9abcd48 Tree: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/tree/f9abcd48 Diff: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/diff/f9abcd48 Branch: refs/heads/master Commit: f9abcd4815369628b45eba39ab04be08f3e557e7 Parents: 0434c60 Author: Anuradha Hegde Authored: Wed Sep 23 06:40:37 2015 +0000 Committer: Anuradha Hegde Committed: Fri Oct 9 20:44:02 2015 +0000 ---------------------------------------------------------------------- dcs/bin/scripts/dcsbind.sh | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/f9abcd48/dcs/bin/scripts/dcsbind.sh ---------------------------------------------------------------------- diff --git a/dcs/bin/scripts/dcsbind.sh b/dcs/bin/scripts/dcsbind.sh index c166f5d..bd983c7 100755 --- a/dcs/bin/scripts/dcsbind.sh +++ b/dcs/bin/scripts/dcsbind.sh @@ -87,8 +87,8 @@ fi function check_node { dcsEcho "checking node $1" - for myinterface in `pdsh -N -w $1 ip link show|awk -F': ' '/^[0-9]+:.*/ {print $2;}'`; do - ip_output=$(pdsh -N -w $1 ip addr show $myinterface) + for myinterface in `pdsh -N -w $1 /sbin/ip link show|awk -F': ' '/^[0-9]+:.*/ {print $2;}'`; do + ip_output=$(pdsh -N -w $1 /sbin/ip addr show $myinterface) if [ $gv_externalip_set -eq 1 -a $external_only -eq 1 ]; then myifport=`echo "$ip_output" | grep $gv_float_external_ip` status=$? @@ -101,8 +101,8 @@ function check_node { unbindip=`echo "$myifport"|awk '{print $2}'` unbindlb=`echo "$myifport"|awk '{print $NF}'` dcsEcho "external ip $gv_float_external_ip is already in use on node $1 bound to interface $myinterface($unbindlb) - unbind..." - dcsEcho "pdsh -S -w $1 sudo ip addr del $unbindip dev $myinterface label $unbindlb" - pdsh -S -w $1 sudo ip addr del $unbindip dev $myinterface label $unbindlb + dcsEcho "pdsh -S -w $1 sudo /sbin/ip addr del $unbindip dev $myinterface label $unbindlb" + pdsh -S -w $1 sudo /sbin/ip addr del $unbindip dev $myinterface label $unbindlb status=$? if [ $status -ne 0 ]; then @@ -124,7 +124,7 @@ function Check_VirtualIP_InUse_Unbind { #check if external ip is in use dcsEcho "check all nodes $allMyNodes" - externalNodes=`pdsh $allMyNodes ip addr show | grep $gv_float_external_ip | awk -F' ' '/^.+:[[:space:]]+.*/ {print $1;}' | cut -d':' -f1 | sed '/^$/d'` + externalNodes=`pdsh $allMyNodes /sbin/ip addr show | grep $gv_float_external_ip | awk -F' ' '/^.+:[[:space:]]+.*/ {print $1;}' | cut -d':' -f1 | sed '/^$/d'` if [ ! -z "$externalNodes" ]; then dcsEcho "find possible node `echo $externalNodes`" external_only=1 @@ -151,7 +151,7 @@ if [ $gv_externalip_set -eq 1 ]; then dcsEcho "external ip is already bound on node $gv_myhostname - skip bind step" else dcsEcho "sudo /sbin/ip addr add $gv_float_external_ip/$mask broadcast $bcast dev $gv_float_external_interface label $gv_float_external_interface:$gv_port" - sudo ip addr add $gv_float_external_ip/$mask broadcast $bcast dev $gv_float_external_interface label $gv_float_external_interface:$gv_port + sudo /sbin/ip addr add $gv_float_external_ip/$mask broadcast $bcast dev $gv_float_external_interface label $gv_float_external_interface:$gv_port status=$? if [ $status -ne 0 ]; then dcsEcho "failed - status is $status"