trafodion-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From sure...@apache.org
Subject [06/50] [abbrv] incubator-trafodion git commit: addNode_step1 can be run more than once now
Date Wed, 31 May 2017 18:47:07 GMT
addNode_step1 can be run more than once now


Project: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/commit/4363341a
Tree: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/tree/4363341a
Diff: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/diff/4363341a

Branch: refs/heads/master
Commit: 4363341afff11ef2152eef62b9aa57b25bcbcd4e
Parents: 61d9365
Author: Amanda Moran <amanda@apache.com>
Authored: Thu Aug 11 22:07:20 2016 +0000
Committer: Amanda Moran <amanda@apache.com>
Committed: Thu Aug 11 22:07:20 2016 +0000

----------------------------------------------------------------------
 install/installer/addNode_step1 | 22 ++++++++++++----------
 install/installer/addNode_step2 |  4 ++--
 2 files changed, 14 insertions(+), 12 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/4363341a/install/installer/addNode_step1
----------------------------------------------------------------------
diff --git a/install/installer/addNode_step1 b/install/installer/addNode_step1
index 475b52c..58fe80d 100755
--- a/install/installer/addNode_step1
+++ b/install/installer/addNode_step1
@@ -140,16 +140,18 @@ source $TRAF_CONFIG
 
 for node in $NEW_NODES
 do
-  NODE_LIST="$NODE_LIST $node"
-  MY_NODES="$MY_NODES -w $node"
-  ALL_NODE_LIST="$ALL_NODE_LIST $node"
-  ALL_NODES="$ALL_NODES -w $node"
-  HADOOP_NODES="$HADOOP_NODES $node"
-  MY_HADOOP_NODES="$MY_HADOOP_NODES -w $node"
-  HDFS_NODES="$HDFS_NODES $node"
-  MY_HDFS_NODES="$MY_HDFS_NODES -w $node"
-  HBASE_NODES="$HBASE_NODES $node"
-  MY_HBASE_NODES="$MY_HBASE_NODES -w $node"
+  if [[ ! $NODE_LIST  =~ .*$node.* ]]; then
+     NODE_LIST="$NODE_LIST $node"
+     MY_NODES="$MY_NODES -w $node"
+     ALL_NODE_LIST="$ALL_NODE_LIST $node"
+     ALL_NODES="$ALL_NODES -w $node"
+     HADOOP_NODES="$HADOOP_NODES $node"
+     MY_HADOOP_NODES="$MY_HADOOP_NODES -w $node"
+     HDFS_NODES="$HDFS_NODES $node"
+     MY_HDFS_NODES="$MY_HDFS_NODES -w $node"
+     HBASE_NODES="$HBASE_NODES $node"
+     MY_HBASE_NODES="$MY_HBASE_NODES -w $node"
+  fi
 done
 
 hadoop_node_count=$(echo $HADOOP_NODES | wc -w)

http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/4363341a/install/installer/addNode_step2
----------------------------------------------------------------------
diff --git a/install/installer/addNode_step2 b/install/installer/addNode_step2
index 0b4db3b..2eeba96 100755
--- a/install/installer/addNode_step2
+++ b/install/installer/addNode_step2
@@ -236,7 +236,7 @@ function copyAll {
 source $TRAF_CONFIG
 echo 
 echo "***IMPORTANT: Copying files to $NEW_NODES"
-echo "***IMPORTANT: This will take some time, it's alot of file. Please wait...."
+echo "***IMPORTANT: This will take some time, it's a lot of file. Please wait...."
 echo 
 sudo mkdir -p $HOME/tmpTraf/
 $TRAF_NEW_PDSH sudo rm -rf $HOME_DIR/$TRAF_USER/.ssh
@@ -385,7 +385,7 @@ copyTrafbashrc
 copyAll
 trafAcceptKeys
 editDCSServers
-if [[ "$ENABLE_HA" == "true"]]; then 
+if [[ "$ENABLE_HA" == "true" ]]; then 
    editDCSBackUp
 fi
 addTraftoHBase


Mime
View raw message