Repository: incubator-trafodion Updated Branches: refs/heads/master 72e5aa91b -> 35342a4b9
Fixing a few small bugs Project: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/commit/4fe01b86 Tree: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/tree/4fe01b86 Diff: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/diff/4fe01b86 Branch: refs/heads/master Commit: 4fe01b8622cc6a3f28f3dc31187c950e9774916e Parents: 2980764 Author: Amanda Moran <[email protected]> Authored: Thu Sep 8 22:24:27 2016 +0000 Committer: Amanda Moran <[email protected]> Committed: Thu Sep 8 22:24:27 2016 +0000 ---------------------------------------------------------------------- install/installer/bashrc_default | 2 +- install/installer/traf_cloudera_mods | 6 +-- install/installer/traf_config_check | 28 ++++++------- install/installer/trafodion_install | 65 ++++++++++++++++--------------- 4 files changed, 52 insertions(+), 49 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/4fe01b86/install/installer/bashrc_default ---------------------------------------------------------------------- diff --git a/install/installer/bashrc_default b/install/installer/bashrc_default index e79f230..81eb9df 100755 --- a/install/installer/bashrc_default +++ b/install/installer/bashrc_default @@ -69,7 +69,7 @@ if [ -f $MY_SQROOT/sqenv.sh ]; then source ./sqenv.sh popd >/dev/null export MANPATH=$MANPATH:$MPI_ROOT/share/man - setup_my_nodes + #setup_my_nodes fi #------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/4fe01b86/install/installer/traf_cloudera_mods ---------------------------------------------------------------------- diff --git a/install/installer/traf_cloudera_mods b/install/installer/traf_cloudera_mods index ae0d993..7d83f08 100755 --- a/install/installer/traf_cloudera_mods +++ b/install/installer/traf_cloudera_mods @@ -57,11 +57,11 @@ fi cd $UNTAR_DIR if [[ $CDH_5_3_HDP_2_2_SUPPORT == "N" ]]; then - if [[ $CDH_VERSION == "5.4" ]]; then + if [[ $cdhVersion == "5.4" ]]; then hbase_trx_jar="hbase-trx-cdh5_4-*.jar" - elif [[ $CDH_VERSION == "5.5" ]]; then + elif [[ $cdhVersion == "5.5" ]]; then hbase_trx_jar="hbase-trx-cdh5_5-*.jar" - elif [[ $CDH_VERSION == "5.7" ]]; then + elif [[ $cdhVersion == "5.7" ]]; then hbase_trx_jar="hbase-trx-cdh5_7-*.jar" fi else http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/4fe01b86/install/installer/traf_config_check ---------------------------------------------------------------------- diff --git a/install/installer/traf_config_check b/install/installer/traf_config_check index cc791ec..8e6d9b0 100755 --- a/install/installer/traf_config_check +++ b/install/installer/traf_config_check @@ -588,9 +588,9 @@ function setHBaseDistro { if [[ $HADOOP_TYPE == "apache" ]]; then HBASE_DISTRO="APACHE"$APACHE_VERSION elif [[ $HADOOP_TYPE == "hortonworks" ]]; then - HBASE_DISTRO="HDP"$HDP_VERSION + HBASE_DISTRO="HDP"$hdpVersion elif [[ $HADOOP_TYPE == "cloudera" ]]; then - HBASE_DISTRO="CDH"$CDH_VERSION + HBASE_DISTRO="CDH"$cdhVersion fi export HBASE_DISTRO @@ -679,7 +679,7 @@ function checkClouderaVersion { hbaseVersion=$(ssh -q -n $node grep "Version" $HOME/hbaseVersion.txt | awk {'print$2'} | sed 's/,.*//' ) cdhVersion=$(echo $hbaseVersion | grep -o "cdh[0-9]\.[0-9]\.[0-9]") #get cdh version,eg:5.5 or 5.7 -CDH_VERSION=${cdhVersion:3:3} +cdhVersion=${cdhVersion:3:3} if [[ $CDH_5_3_HDP_2_2_SUPPORT == "N" ]]; then #Check that Cloudera 5.2 or 5.3 are not installed. if [[ "$CDH_5_4_SUPPORT" == "Y" ]] || [[ "$CDH_5_5_SUPPORT" == "Y" ]] || [[ "$CDH_5_7_SUPPORT" == "Y" ]]; then @@ -726,8 +726,8 @@ echo "***INFO: nameOfVersion=$nameOfVersion" sudo chmod 777 $TRAF_CONFIG sed -i '/hbaseVersion\=/d' $TRAF_CONFIG echo "export hbaseVersion=\"$hbaseVersion\"" >> $TRAF_CONFIG -sed -i '/CDH_VERSION\=/d' $TRAF_CONFIG -echo "export CDH_VERSION=\"$CDH_VERSION\"" >> $TRAF_CONFIG +sed -i '/cdhVersion\=/d' $TRAF_CONFIG +echo "export cdhVersion=\"$cdhVersion\"" >> $TRAF_CONFIG source $TRAF_CONFIG } @@ -735,13 +735,13 @@ source $TRAF_CONFIG function checkHDPVersion { hbaseVersion=$(ssh -q -n $node grep "Version" $HOME/hbaseVersion.txt | sed 's/,.*//' | awk {'print$2'}) #get hdp version,eg:2.1 or 2.3 -HDP_VERSION=${hbaseVersion:6:3} +hdpVersion=${hbaseVersion:6:3} if [[ $CDH_5_3_HDP_2_2_SUPPORT == "N" ]]; then if [[ $HDP_2_3_SUPPORT == "N" ]]; then #Check that Hortonworks 2.1 is not installed - nameOfVersion=$( echo ${HDP_VERSION} | grep 2.1) + nameOfVersion=$( echo ${hdpVersion} | grep 2.1) if [[ -z $nameOfVersion ]]; then - versionInstalled=$( echo ${HDP_VERSION} | grep [1-3].[3-9].* | wc -l) + versionInstalled=$( echo ${hdpVersion} | grep [1-3].[3-9].* | wc -l) if [[ $versionInstalled -gt "0" ]]; then errorFound=1 echo "HADOOP VERSION" >> $ERROR_LOG @@ -751,10 +751,10 @@ if [[ $CDH_5_3_HDP_2_2_SUPPORT == "N" ]]; then fi fi else - nameOfVersion=$( echo ${HDP_VERSION} | grep 2.[3-4]) + nameOfVersion=$( echo ${hdpVersion} | grep 2.[3-4]) #Check that HDP 2.[n>3].* is not installed. if [[ -z $nameOfVersion ]]; then - versionInstalled=$( echo ${HDP_VERSION} | grep [1-3].[0-9].* | wc -l) + versionInstalled=$( echo ${hdpVersion} | grep [1-3].[0-9].* | wc -l) if [[ $versionInstalled -gt "0" ]]; then errorFound=1 echo "HADOOP VERSION" >> $ERROR_LOG @@ -765,10 +765,10 @@ if [[ $CDH_5_3_HDP_2_2_SUPPORT == "N" ]]; then fi fi else - nameOfVersion=$( echo ${HDP_VERSION} | grep 2.2) + nameOfVersion=$( echo ${hdpVersion} | grep 2.2) #Check that HDP 2.[n>2].* is not installed. if [[ -z $nameOfVersion ]]; then - versionInstalled=$( echo ${HDP_VERSION} | grep [1-3].[0-9].* | wc -l) + versionInstalled=$( echo ${hdpVersion} | grep [1-3].[0-9].* | wc -l) if [[ $versionInstalled -gt "0" ]]; then errorFound=1 echo "HADOOP VERSION" >> $ERROR_LOG @@ -786,8 +786,8 @@ echo "***INFO: HADOOP_PATH=$HADOOP_PATH" sudo chmod 777 $TRAF_CONFIG sed -i '/hbaseVersion\=/d' $TRAF_CONFIG echo "export hbaseVersion=\"$hbaseVersion\"" >> $TRAF_CONFIG -sed -i '/HDP_VERSION\=/d' $TRAF_CONFIG -echo "export HDP_VERSION=\"$HDP_VERSION\"" >> $TRAF_CONFIG +sed -i '/hdpVersion\=/d' $TRAF_CONFIG +echo "export hdpVersion=\"$hdpVersion\"" >> $TRAF_CONFIG source $TRAF_CONFIG } http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/4fe01b86/install/installer/trafodion_install ---------------------------------------------------------------------- diff --git a/install/installer/trafodion_install b/install/installer/trafodion_install index f9ebf55..5dccbae 100755 --- a/install/installer/trafodion_install +++ b/install/installer/trafodion_install @@ -126,13 +126,13 @@ do exit -1 fi if [[ $supportedHBase12 -eq "1" ]]; then - CDH_VERSION="5.7" + cdhVersion="5.7" else cdhVersion=$(ssh -q -n $node grep "Version" $HOME/hbaseVersion.txt | grep "cdh5.4.*" | wc -l) if [[ "$cdhVersion" -ge "1" ]]; then - CDH_VERSION="5.4" + cdhVersion="5.4" else - CDH_VERSION="5.5" + cdhVersion="5.5" fi fi else @@ -169,8 +169,8 @@ sed -i '/HDFS\=/d' $TRAF_CONFIG echo "export HDFS=\"$HDFS\"" >> $TRAF_CONFIG sed -i '/ZOOKEEPER\=/d' $TRAF_CONFIG echo "export ZOOKEEPER=\"$ZOOKEEPER\"" >> $TRAF_CONFIG -sed -i '/CDH_VERSION\=/d' $TRAF_CONFIG -echo "export CDH_VERSION=\"$CDH_VERSION\"" >> $TRAF_CONFIG +sed -i '/cdhVersion\=/d' $TRAF_CONFIG +echo "export cdhVersion=\"$cdhVersion\"" >> $TRAF_CONFIG sudo chmod 777 $TRAF_CONFIG sudo rm -rf hbaseVersion.txt @@ -307,39 +307,42 @@ userForTrafodion=`grep "$TRAF_USER:" /etc/passwd | wc -l` if [[ "$userForTrafodion" != "0" ]]; then - isTrafUp=$(sudo su $TRAF_USER --login --command "sqcheck" 2>/dev/null) - returnCode=$? + if [[ -e $SQ_ROOT/sql/scripts/sqcheck ]]; then - if [[ "$returnCode" -ne "255" ]]; then - echo "***ERROR: Trafodion is still has processes running." - echo -n "Stop Trafodion (Y/N), default is N: " - read answer + isTrafUp=$(sudo su $TRAF_USER --login --command "sqcheck" 2>/dev/null) + returnCode=$? - if [ -z $answer ]; then - echo "***ERROR: Please stop Trafodion then rerun trafodion_install" - echo "***ERROR: Change to trafodion userid then do a 'sqstop'" - exit -1 - else - if [[ "${answer}" =~ ^[Yy]$ ]]; then - echo "***INFO: Stopping Trafodion instance." - sudo su $TRAF_USER --login --command "sqstop" - sudo su $TRAF_USER --login --command "ckillall" - sudo su $TRAF_USER --login --command "dcsstop" - sudo su $TRAF_USER --login --command "reststop" - else + if [[ "$returnCode" -ne "255" ]]; then + echo "***ERROR: Trafodion is still has processes running." + echo -n "Stop Trafodion (Y/N), default is N: " + read answer + + if [ -z $answer ]; then echo "***ERROR: Please stop Trafodion then rerun trafodion_install" - echo "***ERROR: Change to trafodion user id then do a 'sqstop'" + echo "***ERROR: Change to trafodion userid then do a 'sqstop'" exit -1 + else + if [[ "${answer}" =~ ^[Yy]$ ]]; then + echo "***INFO: Stopping Trafodion instance." + sudo su $TRAF_USER --login --command "sqstop" + sudo su $TRAF_USER --login --command "ckillall" + sudo su $TRAF_USER --login --command "dcsstop" + sudo su $TRAF_USER --login --command "reststop" + else + echo "***ERROR: Please stop Trafodion then rerun trafodion_install" + echo "***ERROR: Change to trafodion user id then do a 'sqstop'" + exit -1 + fi fi fi - fi - #This is here until sqstop or ckillall stops dcs and rest - isDcsStopped=$(sudo su $TRAF_USER --login --command "jps" | wc -w) - if [[ "$isDcsStopped" -gt "2" ]]; then - echo "***ERROR: DCS and Rest may still be running, will try to stop them." - sudo su $TRAF_USER --login --command "dcsstop" - sudo su $TRAF_USER --login --command "reststop" + #This is here until sqstop or ckillall stops dcs and rest + isDcsStopped=$(sudo su $TRAF_USER --login --command "jps" | wc -w) + if [[ "$isDcsStopped" -gt "2" ]]; then + echo "***ERROR: DCS and Rest may still be running, will try to stop them." + sudo su $TRAF_USER --login --command "dcsstop" + sudo su $TRAF_USER --login --command "reststop" + fi fi fi
