You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@trafodion.apache.org by su...@apache.org on 2015/10/23 05:49:07 UTC
[2/3] incubator-trafodion git commit: Rephrased question and bug fix
Rephrased question and bug fix
Project: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/commit/fe5d2c2b
Tree: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/tree/fe5d2c2b
Diff: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/diff/fe5d2c2b
Branch: refs/heads/master
Commit: fe5d2c2bfdfca819f39c4e94dba6f9e47e0f3012
Parents: 008786e
Author: Amanda Moran <am...@apache.com>
Authored: Wed Oct 21 20:39:19 2015 +0000
Committer: Amanda Moran <am...@apache.com>
Committed: Wed Oct 21 20:39:19 2015 +0000
----------------------------------------------------------------------
install/installer/traf_config_check | 10 +++++-----
install/installer/traf_config_setup | 2 +-
2 files changed, 6 insertions(+), 6 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/fe5d2c2b/install/installer/traf_config_check
----------------------------------------------------------------------
diff --git a/install/installer/traf_config_check b/install/installer/traf_config_check
index 84233d7..c267fb8 100755
--- a/install/installer/traf_config_check
+++ b/install/installer/traf_config_check
@@ -473,16 +473,16 @@ function checkClouderaVersion {
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" ]]; then
- nameOfVersion=$(ssh -q -n $node grep "Version" hbaseVersion.txt | sed 's/,.*//' | sed 's/.*\-//' | grep cdh5.4.*)
+ 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" hbaseVersion.txt | sed 's/,.*//' | sed 's/.*\-//' | grep cdh[5-6].[0-9].* | wc -l)
+ versionInstalled=$(ssh -q -n $node grep "Version" $HOME/hbaseVersion.txt | sed 's/,.*//' | sed 's/.*\-//' | grep cdh[5-6].[0-9].* | wc -l)
if [[ $versionInstalled -gt "0" ]]; then
errorFound=1
echo "HADOOP VERSION" >> $ERROR_LOG
echo "***ERROR: Trafodion and Cloudera versions may not be compatible" >> $ERROR_LOG
echo "***ERROR: Detected Cloudera version:" >> $ERROR_LOG
- ssh -q -n $node cat hbaseVersion.txt >> $ERROR_LOG
+ ssh -q -n $node cat $HOME/hbaseVersion.txt >> $ERROR_LOG
fi
fi
else
@@ -761,6 +761,8 @@ checkHomeDir
checkEPEL
+checkHadoopSupport
+
checkHadoopUserPass
checkHadoopURL
@@ -777,6 +779,4 @@ checkDCS
checkLDAP
-checkHadoopSupport
-
majorErrorFound
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/fe5d2c2b/install/installer/traf_config_setup
----------------------------------------------------------------------
diff --git a/install/installer/traf_config_setup b/install/installer/traf_config_setup
index 069f718..bf62c8f 100755
--- a/install/installer/traf_config_setup
+++ b/install/installer/traf_config_setup
@@ -470,7 +470,7 @@ fi
#DCS Servers
DCS_SERVERS_PARM=$(($node_count * 8))
-echo -n "Total number of client concurrent sessions per machine, default [$DCS_SERVERS_PARM]: "
+echo -n "Total number of client connections per node, default [$DCS_SERVERS_PARM]: "
read answer
if [ ! -z $answer ]; then