Merge [TRAFODION-1993] PR 482 Several fixes
diff --git a/install/installer/dcs_installer b/install/installer/dcs_installer
index cf5e744..8c9d544 100755
--- a/install/installer/dcs_installer
+++ b/install/installer/dcs_installer
@@ -131,7 +131,9 @@
cd $DCS_INSTALL_PATH
if [[ "$ONE_TAR_INSTALL" == "Y" ]]; then
- DCS_DIR="$SQ_ROOT/dcs*"
+ DCS_DIR=$(ls $SQ_ROOT | grep dcs)
+ DCS_DIR=$SQ_ROOT/$DCS_DIR
+ echo "***INFO: DCS Install Directory: $DCS_DIR"
else
# untar DCS build into install directory
echo "***INFO: untarring build file $DCS_BUILD_FILE"
diff --git a/install/installer/rest_installer b/install/installer/rest_installer
index e3cde2e..7e52448 100755
--- a/install/installer/rest_installer
+++ b/install/installer/rest_installer
@@ -94,7 +94,10 @@
cd $REST_INSTALL_PATH
if [[ "$ONE_TAR_INSTALL" == "Y" ]]; then
- REST_DIR="$SQ_ROOT/rest*"
+ REST_DIR=$(ls $SQ_ROOT | grep rest)
+ REST_DIR=$SQ_ROOT/$REST_DIR
+ echo "***INFO: Rest Install Directory: $REST_DIR"
+
else
# untar REST build into install directory
echo "***INFO: untarring build file $REST_BUILD_FILE"
diff --git a/install/installer/traf_config_check b/install/installer/traf_config_check
index dd883f0..14d5511 100755
--- a/install/installer/traf_config_check
+++ b/install/installer/traf_config_check
@@ -33,6 +33,7 @@
function majorErrorFound {
if [[ "$errorFound" == "1" ]]; then
cat $ERROR_LOG
+ cat /etc/trafodion/trafodion_config
echo
exit -1
fi
@@ -413,7 +414,13 @@
#Checking if using 1.7.0_n
if [[ "${THIS_JVM_VER:18:1}" -eq "0" ]] && [[ "$temp_JAVA" -eq "$JAVA7" ]]; then
if [[ "${THIS_JVM_VER:20:1}" -eq "0" ]] || [[ "${THIS_JVM_VER:20:2}" -lt $JAVA65 ]]; then
- error="true"
+ #If Java is **less** than than 1.7.0_65 the next command will fail.
+ #Install will fail anyways if less than 1.7.0_65
+ #Will not fail if Java is 1.7.0_100 or greater
+ #Temporary fix to support Java 7 upgrades greater than 100
+ if [[ "${THIS_JVM_VER:20:3}" -lt $JAVA_65 ]]; then
+ error="true"
+ fi
fi
fi
@@ -694,8 +701,8 @@
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" ]]; then
+ nameOfVersion=$(ssh -q -n $node grep "Version" $HOME/hbaseVersion.txt | sed 's/,.*//' | sed 's/.*\-//' | grep cdh5.4.*)
#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)
@@ -937,6 +944,7 @@
fi
fi
source $install_features_path
+ cat $install_features_path
sudo chmod 777 $TRAF_CONFIG
echo "export CDH_5_3_HDP_2_2_SUPPORT=\"$CDH_5_3_HDP_2_2_SUPPORT\"" >> $TRAF_CONFIG
