trafodion-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ama...@apache.org
Subject [1/2] incubator-trafodion git commit: Additional install changes to support TRAFODION-2067
Date Mon, 01 Aug 2016 20:54:11 GMT
Repository: incubator-trafodion
Updated Branches:
  refs/heads/master c855e1fe7 -> 16acab573


Additional install changes to support TRAFODION-2067


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

Branch: refs/heads/master
Commit: 57c992c96ee8b2bc954e7e6f911ae73ba16c727d
Parents: 5cc5945
Author: Amanda Moran <amanda@apache.com>
Authored: Thu Jul 28 21:05:37 2016 +0000
Committer: Amanda Moran <amanda@apache.com>
Committed: Thu Jul 28 21:05:37 2016 +0000

----------------------------------------------------------------------
 install/installer/traf_config_check | 15 +++++++++++++--
 install/installer/trafodion_install | 29 +++++++++++++++++++----------
 2 files changed, 32 insertions(+), 12 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/57c992c9/install/installer/traf_config_check
----------------------------------------------------------------------
diff --git a/install/installer/traf_config_check b/install/installer/traf_config_check
index f504896..81b11b7 100755
--- a/install/installer/traf_config_check
+++ b/install/installer/traf_config_check
@@ -735,8 +735,8 @@ cdhVersion=$(ssh -q -n $node grep "Version" $HOME/hbaseVersion.txt | grep
-o "cd
 CDH_VERSION=${cdhVersion:3:5}
 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" ]]; then
-      nameOfVersion=$(ssh -q -n $node grep "Version" $HOME/hbaseVersion.txt | sed 's/,.*//'
| sed 's/.*\-//' | grep cdh5.[4-6].*)
+   if [[ "$CDH_5_4_SUPPORT" == "Y" ]] || [[ "$CDH_5_5_SUPPORT" == "Y" ]] || [[ "$CDH_5_7_SUPPORT"
== "Y" ]]; then
+      nameOfVersion=$(ssh -q -n $node grep "Version" $HOME/hbaseVersion.txt | sed 's/,.*//'
| sed 's/.*\-//' | grep cdh5.[4-8].*)
       #Check that Cloudera 5.[n>4].* is not installed.
       if [[ -z $nameOfVersion ]]; then
          versionInstalled=$(ssh -q -n $node grep "Version" $HOME/hbaseVersion.txt | sed 's/,.*//'
| sed 's/.*\-//' | grep cdh[5-9].[7-9].* | wc -l)
@@ -1028,6 +1028,15 @@ if [[ ! -z $install_features_path ]]; then
    sudo chmod 777 $TRAF_CONFIG
    echo "export CDH_5_3_HDP_2_2_SUPPORT=\"$CDH_5_3_HDP_2_2_SUPPORT\"" >> $TRAF_CONFIG
    sudo chmod 777 $TRAF_CONFIG
+   if [[ -z $CDH_5_7_SUPPORT ]]; then
+      sudo chmod 777 $TRAF_CONFIG
+      echo "export CDH_5_7_SUPPORT=\"N\"" >> $TRAF_CONFIG
+      sudo chmod 777 $TRAF_CONFIG
+   else
+      sudo chmod 777 $TRAF_CONFIG
+      echo "export CDH_5_7_SUPPORT=\"$CDH_5_5_SUPPORT\"" >> $TRAF_CONFIG
+      sudo chmod 777 $TRAF_CONFIG
+   fi
    if [[ -z $CDH_5_5_SUPPORT ]]; then
       sudo chmod 777 $TRAF_CONFIG
       echo "export CDH_5_5_SUPPORT=\"N\"" >> $TRAF_CONFIG
@@ -1068,12 +1077,14 @@ else
    CDH_5_3_HDP_2_2_SUPPORT="N"
    CDH_5_4_SUPPORT="N"
    CDH_5_5_SUPPORT="N"
+   CDH_5_7_SUPPORT="N"
    HDP_2_3_SUPPORT="N"
    APACHE_1_0_X_SUPPORT="N"
    sudo chmod 777 $TRAF_CONFIG
    echo "export CDH_5_3_HDP_2_2_SUPPORT=\"$CDH_5_3_HDP_2_2_SUPPORT\"" >> $TRAF_CONFIG
    echo "export CDH_5_4_SUPPORT=\"$CDH_5_4_SUPPORT\"" >> $TRAF_CONFIG
    echo "export CDH_5_5_SUPPORT=\"$CDH_5_5_SUPPORT\"" >> $TRAF_CONFIG
+   echo "export CDH_5_7_SUPPORT=\"$CDH_5_7_SUPPORT\"" >> $TRAF_CONFIG
    echo "export HDP_2_3_SUPPORT=\"$HDP_2_3_SUPPORT\"" >> $TRAF_CONFIG
    echo "export APACHE_1_0_X_SUPPORT=\"$APACHE_1_0_X_SUPPORT\"" >> $TRAF_CONFIG
    sudo chmod 777 $TRAF_CONFIG

http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/57c992c9/install/installer/trafodion_install
----------------------------------------------------------------------
diff --git a/install/installer/trafodion_install b/install/installer/trafodion_install
index bd12188..096abf7 100755
--- a/install/installer/trafodion_install
+++ b/install/installer/trafodion_install
@@ -119,16 +119,25 @@ do
       if [[ $HADOOP_TYPE == "cloudera" ]]; then
          if [[ $CDH_5_3_HDP_2_2_SUPPORT == "N" ]]; then
             if [[ $CDH_5_4_SUPPORT == "Y" ]] || [[ $CDH_5_5_SUPPORT == "Y" ]]; then
-               supportedHBase=$(echo $version | grep "1.0.0" | wc -l)
-               if [[ $supportedHBase -eq "0" ]]; then
-                  echo "***ERROR: HBase installed must be 1.0.0 on node $node"
-                  exit -1
-               fi
-               cdhVersion=$(ssh -q -n $node grep "Version" $HOME/hbaseVersion.txt | grep
"cdh5.4.*" | wc -l)
-               if [[ "$cdhVersion" -ge "1" ]]; then
-                  CDH_VERSION="5.4"
-               else
-                  CDH_VERSION="5.5"
+               if [[ $CDH_5_7_SUPPORT == "Y" ]]; then
+                  supportedHBase=$(echo $version | grep "1.2" | wc -l)
+                  if [[ $supportedHBase -eq "0" ]]; then
+                     echo "***ERROR: HBase installed must be 1.2 on node $node"
+                     exit -1
+                  fi
+                  CDH_VERSION="5.7"
+               else 
+                  supportedHBase=$(echo $version | grep "1.0.0" | wc -l)
+                  if [[ $supportedHBase -eq "0" ]]; then
+                     echo "***ERROR: HBase installed must be 1.0.0 on node $node"
+                     exit -1
+                  fi
+                  cdhVersion=$(ssh -q -n $node grep "Version" $HOME/hbaseVersion.txt | grep
"cdh5.4.*" | wc -l)
+                  if [[ "$cdhVersion" -ge "1" ]]; then
+                     CDH_VERSION="5.4"
+                  else
+                     CDH_VERSION="5.5"
+                  fi
                fi
             else
                supportedHBase=$(echo $version | grep "0.98.1" | wc -l)


Mime
View raw message