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:06 UTC
[1/3] incubator-trafodion git commit: [ TRAFODION 1543 ] and other
small changes
Repository: incubator-trafodion
Updated Branches:
refs/heads/master ca5364730 -> b8e46bd2f
[ TRAFODION 1543 ] and other small changes
Project: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/commit/008786ed
Tree: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/tree/008786ed
Diff: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/diff/008786ed
Branch: refs/heads/master
Commit: 008786ed71ded47ef633d4fb221b8e145b8d476e
Parents: dc47dd1
Author: Amanda Moran <am...@apache.com>
Authored: Wed Oct 21 19:12:11 2015 +0000
Committer: Amanda Moran <am...@apache.com>
Committed: Wed Oct 21 19:12:11 2015 +0000
----------------------------------------------------------------------
install/installer/traf_add_user | 4 --
install/installer/traf_cloudera_mods98 | 7 ++++
install/installer/traf_config_check | 2 +-
install/installer/traf_config_setup | 2 +-
install/installer/traf_getHadoopNodes | 27 +++++++++++--
install/installer/traf_hortonworks_mods98 | 8 +++-
install/installer/trafodion_config_default | 32 ++++++++++------
install/installer/trafodion_install | 51 ++++++++++++++-----------
8 files changed, 88 insertions(+), 45 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/008786ed/install/installer/traf_add_user
----------------------------------------------------------------------
diff --git a/install/installer/traf_add_user b/install/installer/traf_add_user
index 00620bc..9dcf1a3 100755
--- a/install/installer/traf_add_user
+++ b/install/installer/traf_add_user
@@ -27,7 +27,6 @@
#=========================================
# Default values
typeset TRAF_GROUP="trafodion"
-typeset QPIDPORT="65500"
export PDSH="pdsh -R exec"
export PDSH_SSH_CMD="ssh -q -n %h"
@@ -166,9 +165,6 @@ fi
sudo chmod 600 $TRAF_USER_DIR/.ssh/config
#fi
-echo "***INFO: creating .qpidports file"
-sudo su $TRAF_USER --command="echo $QPIDPORT > $TRAF_USER_DIR/.qpidports"
-
# Create .bashrc for this user
echo "***INFO: creating .bashrc file"
sed -e "s@export NODE_LIST=.*@export NODE_LIST=\"$NODE_LIST\"@" <$TRAF_WORKDIR/installer/bashrc_default >$TRAF_WORKDIR/bashrc_${TRAF_USER}_temp1
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/008786ed/install/installer/traf_cloudera_mods98
----------------------------------------------------------------------
diff --git a/install/installer/traf_cloudera_mods98 b/install/installer/traf_cloudera_mods98
index 4839e28..ed7ac9e 100755
--- a/install/installer/traf_cloudera_mods98
+++ b/install/installer/traf_cloudera_mods98
@@ -378,3 +378,10 @@ if [ $? != 0 ]; then
exit -1
fi
+MODS_COMPLETE="Y"
+sudo chmod 777 $TRAF_CONFIG
+sed -i '/MODS_COMPLETE\=/d' $TRAF_CONFIG
+echo "export MODS_COMPLETE=\"$MODS_COMPLETE\"" >> $TRAF_CONFIG
+sudo chmod 777 $TRAF_CONFIG
+source $TRAF_CONFIG
+
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/008786ed/install/installer/traf_config_check
----------------------------------------------------------------------
diff --git a/install/installer/traf_config_check b/install/installer/traf_config_check
index 638fbcd..84233d7 100755
--- a/install/installer/traf_config_check
+++ b/install/installer/traf_config_check
@@ -621,7 +621,7 @@ function checkSQROOT {
if [[ -z $SQ_ROOT ]]; then
errorFound=1
echo "SQ ROOT" >> $ERROR_LOG
- echo "***ERROR: SQ_ROOT variable not set in config file"
+ echo "***ERROR: SQ_ROOT variable not set in config file" >> $ERROR_LOG
fi
}
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/008786ed/install/installer/traf_config_setup
----------------------------------------------------------------------
diff --git a/install/installer/traf_config_setup b/install/installer/traf_config_setup
index a34ff02..069f718 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 concurrent sessions to start, default [$DCS_SERVERS_PARM]: "
+echo -n "Total number of client concurrent sessions per machine, default [$DCS_SERVERS_PARM]: "
read answer
if [ ! -z $answer ]; then
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/008786ed/install/installer/traf_getHadoopNodes
----------------------------------------------------------------------
diff --git a/install/installer/traf_getHadoopNodes b/install/installer/traf_getHadoopNodes
index 7eadecb..ed0b15f 100755
--- a/install/installer/traf_getHadoopNodes
+++ b/install/installer/traf_getHadoopNodes
@@ -1,4 +1,25 @@
#!/bin/bash
+# @@@ START COPYRIGHT @@@
+#
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements. See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership. The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License. You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied. See the License for the
+# specific language governing permissions and limitations
+# under the License.
+#
+# @@@ END COPYRIGHT @@@
+#
source /etc/trafodion/trafodion_config
TRAF_CONFIG=/etc/trafodion/trafodion_config
@@ -69,6 +90,7 @@ if [[ -z $HADOOP_NODES ]]; then
fi
echo "***INFO: $HADOOP_TYPE list of nodes: $HADOOP_NODES"
+hadoop_node_count=$(echo $HADOOP_NODES | wc -w)
sudo chmod 777 $TRAF_CONFIG
sed -i '/HADOOP_NODES\=/d' $TRAF_CONFIG
@@ -80,9 +102,8 @@ sudo chmod 777 $TRAF_CONFIG
sed -i '/HADOOP_PATH\=/d' $TRAF_CONFIG
echo "export HADOOP_PATH=\"$HADOOP_PATH\"" >> $TRAF_CONFIG
sudo chmod 777 $TRAF_CONFIG
-
-
-hadoop_node_count=$(echo $HADOOP_NODES | wc -w)
+sed -i '/hadoop_node_count\=/d' $TRAF_CONFIG
+echo "export hadoop_node_count=\"$hadoop_node_count\"" >> $TRAF_CONFIG
for node in $HADOOP_NODES
do
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/008786ed/install/installer/traf_hortonworks_mods98
----------------------------------------------------------------------
diff --git a/install/installer/traf_hortonworks_mods98 b/install/installer/traf_hortonworks_mods98
index bcb6628..077a750 100755
--- a/install/installer/traf_hortonworks_mods98
+++ b/install/installer/traf_hortonworks_mods98
@@ -540,4 +540,10 @@ fi
# clean up files generated by Ambari's config.sh script
ssh -q -n $AMBARI_HOST 'rm $HOME/doSet_version*'
-exit
+MODS_COMPLETE="Y"
+sudo chmod 777 $TRAF_CONFIG
+sed -i '/MODS_COMPLETE\=/d' $TRAF_CONFIG
+echo "export MODS_COMPLETE=\"$MODS_COMPLETE\"" >> $TRAF_CONFIG
+sudo chmod 777 $TRAF_CONFIG
+source $TRAF_CONFIG
+
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/008786ed/install/installer/trafodion_config_default
----------------------------------------------------------------------
diff --git a/install/installer/trafodion_config_default b/install/installer/trafodion_config_default
index d4164a6..26495f1 100755
--- a/install/installer/trafodion_config_default
+++ b/install/installer/trafodion_config_default
@@ -20,6 +20,7 @@
#
# @@@ END COPYRIGHT @@@
+#====================================================
# Trafodion Configuration File
# This file contains default values for the installer.
@@ -27,12 +28,8 @@
# and then specify this file on the run line of trafodion_install.
# Example:
# ./trafodion_install --config_file <Trafodion-config-file>
+# WARNING: This mode is for advanced users!
#
-# NOTE: most parameters specified through the config file are not checked
-# for validity. Please make sure all values supplied here are correct.
-# It is suggested the the user first run the trafodion_install script and
-# answer all the prompts, then take all the values from
-# /etc/trafodion/trafodion_config and copy them into a copy of this file.
#=====================================================
@@ -40,17 +37,17 @@
#Must be set to 'true' if on a SUSE linux system. If on another type of system
#this must be set to false.
-export SUSE_LINUX=""
+export SUSE_LINUX="false"
# The working directory where Trafodion installer untars files, etc.
# do not change this unless you really know what you are doing
export TRAF_WORKDIR="/usr/lib/trafodion"
# This is the directory where the installer scripts were untarred to
-export LOCAL_WORKDIR="$HOME/installer"
+export LOCAL_WORKDIR="$HOME/<downloadsDirectory>/installer"
# The maximum number of dcs servers, i.e. client connections
-export DCS_SERVERS_PARM="2"
+export DCS_SERVERS_PARM="8"
# "true" if this is an upgrade
export UPGRADE_TRAF="false"
@@ -63,6 +60,7 @@ export TRAF_USER_PASSWORD="traf123"
# a blank separated list of nodes in your cluster
# node names should include full domain names
+#This can not be left blank!
export NODE_LIST=""
# count of nodes in node list
@@ -76,6 +74,10 @@ export MY_NODES=""
# i.e. /opt/home, not /opt/home/trafodion
export HOME_DIR="/home"
+#JAVA HOME must be a JDK. Must include FULL Path. Must be 1.7.0_65 or higher.
+
+export JAVA_HOME=""
+
# If your machine doesn't have external internet access then you must
# specify the location of the EPEL rpm, otherwise leave blank and it
# will be installed from the internet
@@ -94,10 +96,10 @@ export REST_BUILD=""
# Either "cloudera" or "hortonworks" (all lowercase)
export HADOOP_TYPE=""
-# The URL for the Hadoop distro's REST API (i.e. node1.hp.com:8080)
+# The URL for Cloudera/Hortonworks REST API (i.e. node1.hp.com:8080)
export URL=""
-# Hadoop UI admin's userid and password
+# Cloudera/Hortonworks UI admin's userid and password
export ADMIN="admin"
export PASSWORD="admin"
@@ -114,8 +116,14 @@ export HBASE_GROUP="hbase"
# The hadoop HBase service name
export HBASE="hbase"
-# full path of where to isntall Trafodion to
-export SQ_ROOT="$HOME_DIR/$TRAF_USER/traf"
+# full path of where to install Trafodion to
+# Example is used below. If $HOME_DIR or $TRAF_USER have been changed
+# then this will need to be changed.
+# On an upgrade, it is recommend to choose a different directory.
+# First time install : /home/trafodion/traf
+# On Upgrade: /home/trafodion/traf_<date>
+# By doing this the previous version will remain and allow for an easier rollback.
+export SQ_ROOT="home/trafodion/traf"
# Start Trafodion after install completes
export START="N"
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/008786ed/install/installer/trafodion_install
----------------------------------------------------------------------
diff --git a/install/installer/trafodion_install b/install/installer/trafodion_install
index 8246827..9ff2c8d 100755
--- a/install/installer/trafodion_install
+++ b/install/installer/trafodion_install
@@ -44,10 +44,6 @@ Options:
the Trafodion license.
--config_file If provided, all install prompts will be
taken from this file and not prompted for.
- --run_scanner If provided, the Trafodion scanner will run
- to check system configuration.
- --no_scanner If provided, the Trafodion scanner will not
- run to check system configuration.
EOF
}
@@ -385,8 +381,6 @@ else
exit -1
;;
esac
- else
- echo "***INFO: Trafodion scanner will not be run."
fi
fi
@@ -720,26 +714,31 @@ echo "******************************"
echo " TRAFODION MODS"
echo "******************************"
echo
-if [[ $HADOOP_TYPE == "cloudera" ]]; then
- echo "***INFO: Cloudera installed will run traf_cloudera_mods98" 2>&1 | tee -a $INSTALL_LOG
- $LOCAL_WORKDIR/traf_cloudera_mods98 2>&1 | tee -a $INSTALL_LOG
- if [ ${PIPESTATUS[0]} != "0" ]; then
- echo "***ERROR: traf_cloudera_mods98 exited with error." | tee -a $INSTALL_LOG
- echo "***ERROR: Please check log files." | tee -a $INSTALL_LOG
- echo "***ERROR: Exiting...." | tee -a $INSTALL_LOG
- exit -1
+
+if [[ $MODS_COMPLETE != "Y" ]]; then
+ if [[ $HADOOP_TYPE == "cloudera" ]]; then
+ echo "***INFO: Cloudera installed will run traf_cloudera_mods98" 2>&1 | tee -a $INSTALL_LOG
+ $LOCAL_WORKDIR/traf_cloudera_mods98 2>&1 | tee -a $INSTALL_LOG
+ if [ ${PIPESTATUS[0]} != "0" ]; then
+ echo "***ERROR: traf_cloudera_mods98 exited with error." | tee -a $INSTALL_LOG
+ echo "***ERROR: Please check log files." | tee -a $INSTALL_LOG
+ echo "***ERROR: Exiting...." | tee -a $INSTALL_LOG
+ exit -1
+ fi
fi
-fi
-if [[ $HADOOP_TYPE == "hortonworks" ]]; then
- echo "***INFO: Hortonworks installed will run traf_hortonworks_mods98" 2>&1 | tee -a $INSTALL_LOG
- $LOCAL_WORKDIR/traf_hortonworks_mods98 2>&1 | tee -a $INSTALL_LOG
- if [ ${PIPESTATUS[0]} != "0" ]; then
- echo "***ERROR: traf_hortonworks_mods98 exited with error." | tee -a $INSTALL_LOG
- echo "***ERROR: Please check log files." | tee -a $INSTALL_LOG
- echo "***ERROR: Exiting...." | tee -a $INSTALL_LOG
- exit -1
+ if [[ $HADOOP_TYPE == "hortonworks" ]]; then
+ echo "***INFO: Hortonworks installed will run traf_hortonworks_mods98" 2>&1 | tee -a $INSTALL_LOG
+ $LOCAL_WORKDIR/traf_hortonworks_mods98 2>&1 | tee -a $INSTALL_LOG
+ if [ ${PIPESTATUS[0]} != "0" ]; then
+ echo "***ERROR: traf_hortonworks_mods98 exited with error." | tee -a $INSTALL_LOG
+ echo "***ERROR: Please check log files." | tee -a $INSTALL_LOG
+ echo "***ERROR: Exiting...." | tee -a $INSTALL_LOG
+ exit -1
+ fi
fi
+else
+ echo "***INFO: Trafodion Mods has completed successfully in a previous run."
fi
echo "***INFO: Trafodion Mods ran successfully."
@@ -765,6 +764,12 @@ if [ ${PIPESTATUS[0]} != "0" ]; then
fi
#==============================================
+MODS_COMPLETE="N"
+sudo chmod 777 $TRAF_CONFIG
+sed -i '/MODS_COMPLETE\=/d' $TRAF_CONFIG
+echo "export MODS_COMPLETE=\"$MODS_COMPLETE\"" >> $TRAF_CONFIG
+sudo chmod 777 $TRAF_CONFIG
+source $TRAF_CONFIG
echo
echo "*********************************"
echo " TRAFODION INSTALLATION COMPLETE"
[2/3] incubator-trafodion git commit: Rephrased question and bug fix
Posted by su...@apache.org.
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
[3/3] incubator-trafodion git commit: Merge remote branch
'origin/pr/139/head' into mrg_69
Posted by su...@apache.org.
Merge remote branch 'origin/pr/139/head' into mrg_69
Project: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/commit/b8e46bd2
Tree: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/tree/b8e46bd2
Diff: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/diff/b8e46bd2
Branch: refs/heads/master
Commit: b8e46bd2fa4c3bb944d4edf7274cf05f30d1e679
Parents: ca53647 fe5d2c2
Author: Suresh Subbiah <su...@apache.org>
Authored: Fri Oct 23 03:48:45 2015 +0000
Committer: Suresh Subbiah <su...@apache.org>
Committed: Fri Oct 23 03:48:45 2015 +0000
----------------------------------------------------------------------
install/installer/traf_add_user | 4 --
install/installer/traf_cloudera_mods98 | 7 ++++
install/installer/traf_config_check | 12 +++---
install/installer/traf_config_setup | 2 +-
install/installer/traf_getHadoopNodes | 27 +++++++++++--
install/installer/traf_hortonworks_mods98 | 8 +++-
install/installer/trafodion_config_default | 32 ++++++++++------
install/installer/trafodion_install | 51 ++++++++++++++-----------
8 files changed, 93 insertions(+), 50 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/b8e46bd2/install/installer/traf_getHadoopNodes
----------------------------------------------------------------------
diff --cc install/installer/traf_getHadoopNodes
index 787901a,ed0b15f..9aa8da1
--- a/install/installer/traf_getHadoopNodes
+++ b/install/installer/traf_getHadoopNodes
@@@ -1,27 -1,25 +1,48 @@@
+#
+# @@@ START COPYRIGHT @@@
+#
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements. See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership. The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License. You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied. See the License for the
+# specific language governing permissions and limitations
+# under the License.
+#
+# @@@ END COPYRIGHT @@@
+#
+
#!/bin/bash
+ # @@@ START COPYRIGHT @@@
+ #
+ # Licensed to the Apache Software Foundation (ASF) under one
+ # or more contributor license agreements. See the NOTICE file
+ # distributed with this work for additional information
+ # regarding copyright ownership. The ASF licenses this file
+ # to you under the Apache License, Version 2.0 (the
+ # "License"); you may not use this file except in compliance
+ # with the License. You may obtain a copy of the License at
+ #
+ # http://www.apache.org/licenses/LICENSE-2.0
+ #
+ # Unless required by applicable law or agreed to in writing,
+ # software distributed under the License is distributed on an
+ # "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ # KIND, either express or implied. See the License for the
+ # specific language governing permissions and limitations
+ # under the License.
+ #
+ # @@@ END COPYRIGHT @@@
+ #
source /etc/trafodion/trafodion_config
TRAF_CONFIG=/etc/trafodion/trafodion_config