You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@trafodion.apache.org by ar...@apache.org on 2015/12/15 19:50:52 UTC
[1/8] incubator-trafodion git commit: Fix for passwordless ssh and
EPEL issue
Repository: incubator-trafodion
Updated Branches:
refs/heads/master 063694c5d -> dd1b373c5
Fix for passwordless ssh and EPEL issue
Project: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/commit/9f0a61ba
Tree: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/tree/9f0a61ba
Diff: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/diff/9f0a61ba
Branch: refs/heads/master
Commit: 9f0a61bab4478c18c91259aedad19ebe310598d2
Parents: 07b73d9
Author: Amanda Moran <am...@apache.com>
Authored: Wed Dec 9 00:20:08 2015 +0000
Committer: Amanda Moran <am...@apache.com>
Committed: Wed Dec 9 00:20:08 2015 +0000
----------------------------------------------------------------------
install/installer/traf_add_user | 23 ++++++---
install/installer/traf_createPasswordLessSSH | 63 +++++++++++++++++++++++
install/installer/traf_package_setup | 60 +++++++--------------
3 files changed, 100 insertions(+), 46 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/9f0a61ba/install/installer/traf_add_user
----------------------------------------------------------------------
diff --git a/install/installer/traf_add_user b/install/installer/traf_add_user
index 9dcf1a3..a3ca012 100755
--- a/install/installer/traf_add_user
+++ b/install/installer/traf_add_user
@@ -208,15 +208,26 @@ fi
#=================================================
# Cycle through all nodes to create known_hosts file, even if only one node
echo "***INFO: Creating known_hosts file for all nodes"
+NODES_SHORT=""
for node in $NODE_LIST
-do
- sudo su $TRAF_USER --command "ssh -q -oStrictHostKeyChecking=no $node hostname"
- if [ $? -ne 0 ]; then
- echo "***ERROR: Unable to ssh to node $node"
- exit -1
- fi
+do
+ newNode=$(ssh -q -n $node hostname -s)
+
+ NODES_SHORT="$NODES_SHORT $newNode"
done
+NODES_LONG=""
+for node in $NODE_LIST
+do
+ newNode=$(ssh -q -n $node hostname -f)
+
+ NODES_LONG="$NODES_LONG $newNode"
+done
+
+./traf_createPasswordLessSSH --nodes "$NODE_LIST"
+./traf_createPasswordLessSSH --nodes "$NODES_SHORT"
+./traf_createPasswordLessSSH --nodes "$NODES_LONG"
+
if [ "$node_count" -ne 1 ]; then
# Copy known_hosts file to all other nodes
sudo su $TRAF_USER --command "$PDCP $MY_NODES -x $HOSTNAME $TRAF_USER_DIR/.ssh/known_hosts $TRAF_USER_DIR/.ssh"
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/9f0a61ba/install/installer/traf_createPasswordLessSSH
----------------------------------------------------------------------
diff --git a/install/installer/traf_createPasswordLessSSH b/install/installer/traf_createPasswordLessSSH
new file mode 100755
index 0000000..da672a4
--- /dev/null
+++ b/install/installer/traf_createPasswordLessSSH
@@ -0,0 +1,63 @@
+#!/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 @@@
+
+export TRAF_CONFIG="/etc/trafodion/trafodion_config"
+source $TRAF_CONFIG
+
+export NODES=""
+
+while [[ $# -gt 0 ]]; do
+ case "$1" in
+ --nodes)
+ NODES=$2
+ shift
+ ;;
+ *)
+ echo "***ERROR: unknown parameter '$1'"
+ print_usage
+ exit -1
+ esac
+ shift
+done
+
+
+
+for node in $NODES
+do
+ sudo su $TRAF_USER --command "ssh -q -oStrictHostKeyChecking=no $node hostname"
+ sudo su $TRAF_USER --command "ssh -q -oStrictHostKeyChecking=no localhost hostname"
+ if [ $? -ne 0 ]; then
+ echo "***ERROR: Unable to ssh to node $node"
+ exit -1
+ fi
+
+ for nodes in $NODES
+ do
+ sudo su $TRAF_USER --command "ssh -q -oStrictHostKeyChecking=no $node ssh -q -oStrictHostKeyChecking=no $nodes hostname"
+ if [ $? -ne 0 ]; then
+ echo "***ERROR: Unable to ssh to node $node"
+ exit -1
+ fi
+ done
+done
+
+
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/9f0a61ba/install/installer/traf_package_setup
----------------------------------------------------------------------
diff --git a/install/installer/traf_package_setup b/install/installer/traf_package_setup
index 3c6eb3c..7f515f1 100755
--- a/install/installer/traf_package_setup
+++ b/install/installer/traf_package_setup
@@ -70,47 +70,28 @@ if [[ $SUSE_LINUX == "false" ]]; then
if [[ $EPEL_INSTALLED == 0 ]]; then
echo "***INFO: ... EPEL rpm"
- if [[ "$EPEL_RPM" != "" ]]; then
- if [ $node_count -ne 1 ]; then
- for node in $NODE_LIST
- do
- scp -q $EPEL_RPM $(whoami)@$node:$HOME
- if [[ $? -gt 1 ]]; then
- echo "***ERROR: Unable to find $EPEL_RPM or unable to copy."
- exit -1
- fi
- done
- else
- cp -rf $EPEL_RPM $HOME
- fi
- else
- if [[ $internetAccess == "true" ]]; then
- epel_rpm="epel-release-6-8.noarch.rpm"
- wget http://download.fedoraproject.org/pub/epel/6/x86_64/$epel_rpm
- if [ $node_count -ne 1 ]; then
- for node in $NODE_LIST
- do
- scp -q $LOCAL_WORKDIR/$epel_rpm $(whoami)@$node:$HOME
- if [[ $? -gt 1 ]]; then
- echo "***ERROR: Unable to find $EPEL_RPM or unable to copy."
- exit -1
- fi
- done
- else
- cp -rf $epel_rpm $HOME
- fi
+ epel_rpm="epel-release-6-8.noarch.rpm"
+ echo "***INFO: Downloading EPEL repo, since not installed."
+
+ wget http://download.fedoraproject.org/pub/epel/6/x86_64/$epel_rpm
+ if [ $? != 0 ]; then
+ echo "***ERROR: Can't download EPEL rpm $epel_rpm"
+ echo "***ERROR: Will need to download and install EPEL rpm on each node of cluster"
+ echo
+ exit -1
+ fi
- if [ $? != 0 ]; then
- echo "***ERROR: Can't download EPEL rpm $epel_rpm"
- echo "***ERROR: Please check http_proxy settings in .bashrc file"
- echo
+ if [ $node_count -ne 1 ]; then
+ for node in $NODE_LIST
+ do
+ scp -q $LOCAL_WORKDIR/$epel_rpm $(whoami)@$node:$HOME
+ if [[ $? -gt 1 ]]; then
+ echo "***ERROR: Unable to find $EPEL_RPM or unable to copy."
exit -1
- fi
- else
- echo "***ERROR: No EPEL RPM installed"
- echo "***ERROR: No internet access to do automatic install."
- exit -1
- fi
+ fi
+ done
+ else
+ cp -rf $epel_rpm $HOME
fi
fi
@@ -125,7 +106,6 @@ if [[ $SUSE_LINUX == "false" ]]; then
fi
fi
done
-
else
echo
echo
[5/8] incubator-trafodion git commit: Merge branch 'master' of
github.com:apache/incubator-trafodion into installbugfixes
Posted by ar...@apache.org.
Merge branch 'master' of github.com:apache/incubator-trafodion into installbugfixes
Project: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/commit/e2d04fb1
Tree: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/tree/e2d04fb1
Diff: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/diff/e2d04fb1
Branch: refs/heads/master
Commit: e2d04fb103bdde13230fd2f87220c25fc4583e3e
Parents: 5059a84 52afc68
Author: Amanda Moran <am...@apache.com>
Authored: Fri Dec 11 19:48:14 2015 +0000
Committer: Amanda Moran <am...@apache.com>
Committed: Fri Dec 11 19:48:14 2015 +0000
----------------------------------------------------------------------
core/Makefile | 4 +-
core/sqf/sql/scripts/install_local_drill | 114 +++
core/sqf/sql/scripts/install_local_hadoop | 41 +-
.../transactional/TrxTransactionState.java | 114 +--
core/sql/bin/SqlciErrors.txt | 1 +
core/sql/common/ExprNode.cpp | 1 +
core/sql/common/OperTypeEnum.h | 24 +-
core/sql/optimizer/GroupAttr.cpp | 179 +++++
core/sql/optimizer/GroupAttr.h | 4 +
core/sql/optimizer/ImplRule.cpp | 16 +-
core/sql/optimizer/ItemConstr.h | 39 ++
core/sql/optimizer/ItemExpr.cpp | 36 +-
core/sql/optimizer/ItemExpr.h | 4 +-
core/sql/optimizer/OptPhysRelExpr.cpp | 3 +-
core/sql/optimizer/PhyProp.cpp | 2 +-
core/sql/optimizer/RelRoutine.cpp | 55 +-
core/sql/optimizer/UdfDllInteraction.cpp | 10 +-
core/sql/optimizer/ValueDesc.cpp | 194 ++++--
core/sql/optimizer/ValueDesc.h | 14 +-
core/sql/pom.xml | 5 +
core/sql/regress/compGeneral/EXPECTED071 | 47 ++
core/sql/regress/compGeneral/TEST071 | 22 +
core/sql/regress/executor/EXPECTED130 | 28 +-
core/sql/regress/executor/TEST016 | 5 +
core/sql/regress/executor/TEST130 | 7 +-
core/sql/regress/seabase/EXPECTED010 | 84 +++
core/sql/regress/seabase/TEST010 | 4 +
core/sql/regress/seabase/TEST014 | 1 +
core/sql/regress/tools/runregr_udr.ksh | 7 +
core/sql/regress/udr/EXPECTED002 | 48 +-
core/sql/regress/udr/TEST002 | 18 +
core/sql/sqlci/SqlCmd.cpp | 1 +
core/sql/sqludr/doxygen_tmudr.1.6.config | 4 +-
core/sql/sqludr/sqludr.cpp | 2 +-
core/sql/sqludr/sqludr.h | 16 +-
.../trafodion/sql/udr/UDRInvocationInfo.java | 17 +-
.../org/trafodion/sql/udr/predef/JDBCUDR.java | 690 +++++++++++++++++++
docs/src/site/markdown/website.md | 15 +-
.../trafodion/phoenix/end2end/BatchTest.java | 130 +++-
39 files changed, 1744 insertions(+), 262 deletions(-)
----------------------------------------------------------------------
[8/8] incubator-trafodion git commit: [TRAFODION 1547][TRAFODION
1476] PR-217 Fix for passwordless ssh, EPEL and DCS HA setup
Posted by ar...@apache.org.
[TRAFODION 1547][TRAFODION 1476] PR-217 Fix for passwordless ssh, EPEL and DCS HA setup
Project: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/commit/dd1b373c
Tree: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/tree/dd1b373c
Diff: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/diff/dd1b373c
Branch: refs/heads/master
Commit: dd1b373c588353d97d62c165f54c7fdb942594bd
Parents: 063694c 0027991
Author: Arvind Narain <ar...@apache.org>
Authored: Tue Dec 15 18:48:46 2015 +0000
Committer: Arvind Narain <ar...@apache.org>
Committed: Tue Dec 15 18:48:46 2015 +0000
----------------------------------------------------------------------
install/installer/dcs_installer | 50 +++++++++++++
install/installer/traf_add_sudoAccess | 54 ++++++++++++++
install/installer/traf_add_user | 23 ++++--
install/installer/traf_config_setup | 87 ++++++++++++++++++++++-
install/installer/traf_createPasswordLessSSH | 63 ++++++++++++++++
install/installer/traf_package_setup | 60 ++++++----------
install/installer/trafodion_config_default | 11 +++
7 files changed, 301 insertions(+), 47 deletions(-)
----------------------------------------------------------------------
[6/8] incubator-trafodion git commit: Fixes from comments
Posted by ar...@apache.org.
Fixes from comments
Project: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/commit/eaaeb331
Tree: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/tree/eaaeb331
Diff: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/diff/eaaeb331
Branch: refs/heads/master
Commit: eaaeb3317cd3a78ff63dded706d59883a15a4883
Parents: e2d04fb
Author: Amanda Moran <am...@apache.com>
Authored: Fri Dec 11 20:03:55 2015 +0000
Committer: Amanda Moran <am...@apache.com>
Committed: Fri Dec 11 20:03:55 2015 +0000
----------------------------------------------------------------------
install/installer/dcs_installer | 2 +-
install/installer/traf_config_setup | 8 ++++----
install/installer/trafodion_config_default | 2 ++
3 files changed, 7 insertions(+), 5 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/eaaeb331/install/installer/dcs_installer
----------------------------------------------------------------------
diff --git a/install/installer/dcs_installer b/install/installer/dcs_installer
index aea2b7b..2e4d825 100755
--- a/install/installer/dcs_installer
+++ b/install/installer/dcs_installer
@@ -146,7 +146,7 @@ echo "***INFO: untarring build file $DCS_BUILD_FILE"
tar -xzf $DCS_BUILD_FILE
# get the dcs install directory name which is imbedded in the tar file
-DCS_DIR=$(tar -tf $DCS_BUILD_FILE | grep LICENSE | sed -e "s@\(^.*\)/LICENSE.txt@\1@")
+DCS_DIR=$(tar -tf $DCS_BUILD_FILE | grep --max-count=1 bin | sed -e "s@\(^.*\)/bin/@\1@"")
DCS_DIR=$DCS_INSTALL_PATH/$DCS_DIR
# set env var in sqenvcom.sh for DCS install directory
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/eaaeb331/install/installer/traf_config_setup
----------------------------------------------------------------------
diff --git a/install/installer/traf_config_setup b/install/installer/traf_config_setup
index 23ded39..a00eb6b 100755
--- a/install/installer/traf_config_setup
+++ b/install/installer/traf_config_setup
@@ -474,7 +474,7 @@ echo "export DCS_SERVERS_PARM=\"$DCS_SERVERS_PARM\"" >> $LOCAL_TRAF_CONFIG
#==============================================
#Enable HA
-echo -n "Enable High Avalability (Y/N), default is N: "
+echo -n "Enable High Availability (Y/N), default is N: "
read answer
if [[ ! -z $answer ]]; then
@@ -498,7 +498,7 @@ if [[ "$ENABLE_HA" == "true" ]]; then
if [ -z $answer ]; then
if [[ -z $FLOATING_IP ]]; then
echo "***ERROR: Floating IP address not given."
- echo "***ERROR: Install will contiune but WITHOUT High Avalability"
+ echo "***ERROR: Install will continue but WITHOUT High Availability"
echo "***ERROR: HA can be configured later, or kill this script and start over."
sed -i '/ENABLE_HA\=/d' $LOCAL_TRAF_CONFIG
echo "export ENABLE_HA=\"false\"" >> $LOCAL_TRAF_CONFIG
@@ -519,7 +519,7 @@ if [[ "$ENABLE_HA" == "true" ]]; then
if [ -z $answer ]; then
if [[ -z $INTERFACE ]]; then
echo "***ERROR: Floating IP interface was not given."
- echo "***ERROR: Install will contiune but WITHOUT High Avalability"
+ echo "***ERROR: Install will contiune but WITHOUT High Availability"
echo "***ERROR: HA can be configured later, or kill this script and start over."
sed -i '/ENABLE_HA\=/d' $LOCAL_TRAF_CONFIG
echo "export ENABLE_HA=\"false\"" >> $LOCAL_TRAF_CONFIG
@@ -539,7 +539,7 @@ if [[ "$ENABLE_HA" == "true" ]]; then
if [[ -z "$answer" ]]; then
if [[ -z "$BACKUP_DCS_NODES" ]]; then
echo "***ERROR: Backup DCS Nodes not given."
- echo "***ERROR: Install will contiune but WITHOUT High Avalability"
+ echo "***ERROR: Install will contiune but WITHOUT High Availability"
echo "***ERROR: HA can be configured later, or kill this script and start over."
sed -i '/ENABLE_HA\=/d' $LOCAL_TRAF_CONFIG
echo "export ENABLE_HA=\"false\"" >> $LOCAL_TRAF_CONFIG
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/eaaeb331/install/installer/trafodion_config_default
----------------------------------------------------------------------
diff --git a/install/installer/trafodion_config_default b/install/installer/trafodion_config_default
index d5554bb..6dd2b52 100755
--- a/install/installer/trafodion_config_default
+++ b/install/installer/trafodion_config_default
@@ -152,3 +152,5 @@ export FLOATING_IP=""
#If HA enabled the set the DCS Backup nodes
export BACKUP_DCS_NODES=""
+#If HA enabled then set INTERFACE to match the interface of the floating ip
+export INTERFACE=""
[4/8] incubator-trafodion git commit: Merge branch 'master' of
github.com:apache/incubator-trafodion into installbugfixes
Posted by ar...@apache.org.
Merge branch 'master' of github.com:apache/incubator-trafodion into installbugfixes
Project: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/commit/5059a84a
Tree: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/tree/5059a84a
Diff: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/diff/5059a84a
Branch: refs/heads/master
Commit: 5059a84afc93609ceb3e40997001ebd6d46c40a6
Parents: eab5e35 2d69b73
Author: Amanda Moran <am...@apache.com>
Authored: Thu Dec 10 18:01:19 2015 +0000
Committer: Amanda Moran <am...@apache.com>
Committed: Thu Dec 10 18:01:19 2015 +0000
----------------------------------------------------------------------
.../transactional/TrxRegionEndpoint.java | 296 ++++++++++++++-----
.../transactional/TrxTransactionState.java | 57 +++-
core/sql/bin/SqlciErrors.txt | 2 +-
core/sql/executor/ExExeUtilGet.cpp | 2 +
core/sql/regress/catman1/EXPECTED135 | 2 +
core/sql/sqlcomp/CmpSeabaseDDLauth.cpp | 15 +
core/sql/sqlcomp/CmpSeabaseDDLauth.h | 2 +-
core/sql/sqlcomp/PrivMgrRoles.cpp | 11 +-
docs/.gitignore | 1 +
install/.gitignore | 1 +
10 files changed, 301 insertions(+), 88 deletions(-)
----------------------------------------------------------------------
[7/8] incubator-trafodion git commit: Typo
Posted by ar...@apache.org.
Typo
Project: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/commit/00279912
Tree: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/tree/00279912
Diff: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/diff/00279912
Branch: refs/heads/master
Commit: 0027991242ee0c05155e52c72be016fc0986e014
Parents: eaaeb33
Author: Amanda Moran <am...@apache.com>
Authored: Fri Dec 11 21:40:48 2015 +0000
Committer: Amanda Moran <am...@apache.com>
Committed: Fri Dec 11 21:40:48 2015 +0000
----------------------------------------------------------------------
install/installer/dcs_installer | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/00279912/install/installer/dcs_installer
----------------------------------------------------------------------
diff --git a/install/installer/dcs_installer b/install/installer/dcs_installer
index 2e4d825..07f5a06 100755
--- a/install/installer/dcs_installer
+++ b/install/installer/dcs_installer
@@ -146,7 +146,8 @@ echo "***INFO: untarring build file $DCS_BUILD_FILE"
tar -xzf $DCS_BUILD_FILE
# get the dcs install directory name which is imbedded in the tar file
-DCS_DIR=$(tar -tf $DCS_BUILD_FILE | grep --max-count=1 bin | sed -e "s@\(^.*\)/bin/@\1@"")
+DCS_DIR=$(tar -tf $DCS_BUILD_FILE | grep --max-count=1 bin | sed -e "s@\(^.*\)/bin/@\1@")
+
DCS_DIR=$DCS_INSTALL_PATH/$DCS_DIR
# set env var in sqenvcom.sh for DCS install directory
[3/8] incubator-trafodion git commit: [[TRAFODION 1689]] and
[[TRAFODION 1690]]
Posted by ar...@apache.org.
[[TRAFODION 1689]] and [[TRAFODION 1690]]
Fixes for DCS HA and DCS_DIR bug
Project: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/commit/eab5e35b
Tree: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/tree/eab5e35b
Diff: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/diff/eab5e35b
Branch: refs/heads/master
Commit: eab5e35bf7e01885563f3487205184269d0a8e84
Parents: ec5e643
Author: Amanda Moran <am...@apache.com>
Authored: Wed Dec 9 23:04:58 2015 +0000
Committer: Amanda Moran <am...@apache.com>
Committed: Wed Dec 9 23:04:58 2015 +0000
----------------------------------------------------------------------
install/installer/dcs_installer | 53 ++++++++++++++-
install/installer/traf_add_sudoAccess | 54 +++++++++++++++
install/installer/traf_config_setup | 87 ++++++++++++++++++++++++-
install/installer/trafodion_config_default | 9 +++
4 files changed, 200 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/eab5e35b/install/installer/dcs_installer
----------------------------------------------------------------------
diff --git a/install/installer/dcs_installer b/install/installer/dcs_installer
index 902b314..aea2b7b 100755
--- a/install/installer/dcs_installer
+++ b/install/installer/dcs_installer
@@ -25,6 +25,16 @@
# Install DCS on a Trafodion cluster
#==========================================
+export TRAF_CONFIG="/etc/trafodion/trafodion_config"
+
+if [ $node_count -eq 1 ]; then
+ TRAF_PDSH=""
+ TRAF_PDCP=""
+else
+ TRAF_PDSH="pdsh -R exec $MY_NODES $PDSH_SSH_CMD"
+ TRAF_PDCP="pdcp -R ssh $MY_NODES"
+fi
+
function print_usage {
cat << EOF
This script will install/configure the specified DCS build.
@@ -136,8 +146,7 @@ echo "***INFO: untarring build file $DCS_BUILD_FILE"
tar -xzf $DCS_BUILD_FILE
# get the dcs install directory name which is imbedded in the tar file
-DCS_DIR=$(tar -tf $DCS_BUILD_FILE | grep --max-count=1 bin | sed -e "s@\(^.*\)/bin/@\1@")
-
+DCS_DIR=$(tar -tf $DCS_BUILD_FILE | grep LICENSE | sed -e "s@\(^.*\)/LICENSE.txt@\1@")
DCS_DIR=$DCS_INSTALL_PATH/$DCS_DIR
# set env var in sqenvcom.sh for DCS install directory
@@ -181,6 +190,36 @@ cat dcs-site.xml | sed -e "s@</configuration>@ <property>\n <name>dcs.dns.in
cp dcs-site.temp dcs-site.xml
rm dcs-site.temp 2>/dev/null
+if [[ "$ENABLE_HA" == "true" ]]; then
+ rm dcs-site.temp 2>/dev/null
+ cat dcs-site.xml | sed -e "s@</configuration>@ <property>\n <name>dcs.master.floating.ip</name>\n <value>true</value>\n </property>\n</configuration>@" > dcs-site.temp
+ cp dcs-site.temp dcs-site.xml
+ rm dcs-site.temp 2>/dev/null
+
+ rm dcs-site.temp 2>/dev/null
+ cat dcs-site.xml | sed -e "s@</configuration>@ <property>\n <name>dcs.master.floating.ip.external.interface</name>\n <value>$INTERFACE</value>\n </property>\n</configuration>@" > dcs-site.temp
+ cp dcs-site.temp dcs-site.xml
+ rm dcs-site.temp 2>/dev/null
+
+ rm dcs-site.temp 2>/dev/null
+ cat dcs-site.xml | sed -e "s@</configuration>@ <property>\n <name>dcs.master.floating.ip.external.ip.address</name>\n <value>$FLOATING_IP</value>\n </property>\n</configuration>@" > dcs-site.temp
+ cp dcs-site.temp dcs-site.xml
+ rm dcs-site.temp 2>/dev/null
+fi
+
+if [[ "$ENABLE_HA" == "true" ]]; then
+ echo "***INFO: modifying $DCS_DIR/conf/backup-masters file"
+
+ for node in $BACKUP_DCS_NODES
+ do
+ echo $node >> $DCS_DIR/conf/backup-masters
+ done
+
+ if [[ $node_count -gt 1 ]]; then
+ $TRAF_PDCP $DCS_DIR/conf/backup-masters $DCS_DIR/conf/backup-masters
+ fi
+fi
+
echo "***INFO: creating $DCS_DIR/conf/servers file"
rm servers 2>/dev/null
@@ -198,5 +237,15 @@ do
(( count++ ))
done
+if [[ "$ENABLE_HA" == "true" ]]; then
+ newHName="HNAME=$FLOATING_IP:23400"
+ sed -i -e "s/HNAME=localhost:23400/$newHName/g" $SQ_ROOT/trafci/bin/trafci
+
+ if [[ $node_count -gt 1 ]]; then
+ $TRAF_PDCP $SQ_ROOT/trafci/bin/trafci $SQ_ROOT/trafci/bin/trafci
+ fi
+fi
+
+
echo "***INFO: End of DCS install."
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/eab5e35b/install/installer/traf_add_sudoAccess
----------------------------------------------------------------------
diff --git a/install/installer/traf_add_sudoAccess b/install/installer/traf_add_sudoAccess
new file mode 100755
index 0000000..eda398b
--- /dev/null
+++ b/install/installer/traf_add_sudoAccess
@@ -0,0 +1,54 @@
+#!/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 @@@
+
+TRAF_CONFIG=/etc/trafodion/trafodion_config
+source $TRAF_CONFIG
+
+if [ $node_count -eq 1 ]; then
+ TRAF_PDSH=""
+ TRAF_PDCP=""
+else
+ TRAF_PDSH="pdsh -R exec $MY_NODES $PDSH_SSH_CMD"
+ TRAF_PDCP="pdcp -R ssh $MY_NODES"
+fi
+
+
+sudoFile="trafodion"
+echo "***INFO: Creating $TRAF_USER sudo access file"
+echo
+
+echo "## Trafodion Floating IP commands" > $sudoFile
+echo "Cmnd_Alias IP = /sbin/ip" >> $sudoFile
+echo "Cmnd_Alias ARP = /sbin/arping" >> $sudoFile
+
+echo "## Allow Trafodion id to run commands needed to configure floating IP" >> $sudoFile
+echo "%trafodion ALL = NOPASSWD: IP, ARP" >> $sudoFile
+
+
+if [[ $node_count -gt "1" ]]; then
+ $TRAF_PDCP $sudoFile $HOME
+ $TRAF_PDSH sudo cp $HOME/$sudoFile /etc/sudoers.d/
+ $TRAF_PDSH sudo rm -f $HOME/$sudoFile
+else
+ sudo cp $TRAF_USR /etc/sudoers.d
+fi
+
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/eab5e35b/install/installer/traf_config_setup
----------------------------------------------------------------------
diff --git a/install/installer/traf_config_setup b/install/installer/traf_config_setup
index 6dd7dfe..23ded39 100755
--- a/install/installer/traf_config_setup
+++ b/install/installer/traf_config_setup
@@ -58,6 +58,9 @@ INIT_TRAFODION="N"
START="N"
SQCONFIG=""
DCS_SERVERS_PARM="2"
+ENABLE_HA="false"
+FLOATING_IP=""
+BACKUP_DCS_NODES=""
LDAP_SECURITY="N"
SCANNER_MODE="N"
@@ -257,6 +260,7 @@ package=$(tar -tzf $TRAF_PACKAGE | grep build-version.txt | wc -l )
if [ $package -eq 0 ]; then
# assume user specified a trafodion core tar file
+ UTT_INSTALL="Y"
TRAF_BUILD=$TRAF_PACKAGE
TRAF_PACKAGE=""
@@ -307,6 +311,7 @@ if [ $package -eq 0 ]; then
else
# user specifed a package file
+ UTT_INSTALL="N"
TRAF_BUILD=""
DCS_BUILD=""
REST_BUILD=""
@@ -317,6 +322,7 @@ echo "export TRAF_PACKAGE=\"$TRAF_PACKAGE\"" >> $LOCAL_TRAF_CONFIG
echo "export TRAF_BUILD=\"$TRAF_BUILD\"" >> $LOCAL_TRAF_CONFIG
echo "export DCS_BUILD=\"$DCS_BUILD\"" >> $LOCAL_TRAF_CONFIG
echo "export REST_BUILD=\"$REST_BUILD\"" >> $LOCAL_TRAF_CONFIG
+echo "export UTT_INSTALL=\"$UTT_INSTALL\"" >> $LOCAL_TRAF_CONFIG
#==============================================
#Hadoop user name
@@ -456,7 +462,7 @@ fi
#DCS Servers
DCS_SERVERS_PARM=$(($node_count * 8))
-echo -n "Total number of client connections per node, default [$DCS_SERVERS_PARM]: "
+echo -n "Total number of client connections per cluster, default [$DCS_SERVERS_PARM]: "
read answer
if [ ! -z $answer ]; then
@@ -466,6 +472,85 @@ fi
echo "export DCS_SERVERS_PARM=\"$DCS_SERVERS_PARM\"" >> $LOCAL_TRAF_CONFIG
#==============================================
+#Enable HA
+
+echo -n "Enable High Avalability (Y/N), default is N: "
+read answer
+
+if [[ ! -z $answer ]]; then
+ if [[ "${answer}" =~ ^[Yy]$ ]]; then
+ ENABLE_HA="true"
+ else
+ ENABLE_HA="false"
+ fi
+else
+ ENABLE_HA="false"
+fi
+
+echo "export ENABLE_HA=\"$ENABLE_HA\"" >> $LOCAL_TRAF_CONFIG
+
+#==============================================
+#Add Floating IP if HA Enabled
+if [[ "$ENABLE_HA" == "true" ]]; then
+ echo -n "Enter Floating IP address for DCS HA, default [$FLOATING_IP]: "
+ read answer
+
+ if [ -z $answer ]; then
+ if [[ -z $FLOATING_IP ]]; then
+ echo "***ERROR: Floating IP address not given."
+ echo "***ERROR: Install will contiune but WITHOUT High Avalability"
+ echo "***ERROR: HA can be configured later, or kill this script and start over."
+ sed -i '/ENABLE_HA\=/d' $LOCAL_TRAF_CONFIG
+ echo "export ENABLE_HA=\"false\"" >> $LOCAL_TRAF_CONFIG
+ fi
+ else
+ FLOATING_IP="$answer"
+ fi
+ echo "export FLOATING_IP=\"$FLOATING_IP\"" >> $LOCAL_TRAF_CONFIG
+fi
+
+
+#==============================================
+#Add Floating IP if HA Enabled
+if [[ "$ENABLE_HA" == "true" ]]; then
+ echo -n "Enter interface for Floating IP address (example: eth0), default [$INTERFACE]: "
+ read answer
+
+ if [ -z $answer ]; then
+ if [[ -z $INTERFACE ]]; then
+ echo "***ERROR: Floating IP interface was not given."
+ echo "***ERROR: Install will contiune but WITHOUT High Avalability"
+ echo "***ERROR: HA can be configured later, or kill this script and start over."
+ sed -i '/ENABLE_HA\=/d' $LOCAL_TRAF_CONFIG
+ echo "export ENABLE_HA=\"false\"" >> $LOCAL_TRAF_CONFIG
+ fi
+ else
+ INTERFACE="$answer"
+ fi
+ echo "export INTERFACE=\"$INTERFACE\"" >> $LOCAL_TRAF_CONFIG
+fi
+
+#==============================================
+#Add Backup DCS Master nodes if HA Enabled
+if [[ "$ENABLE_HA" == "true" ]]; then
+ echo -n "Enter DCS Backup Master Nodes for DCS HA, default [$BACKUP_DCS_NODES]: "
+ read answer
+
+ if [[ -z "$answer" ]]; then
+ if [[ -z "$BACKUP_DCS_NODES" ]]; then
+ echo "***ERROR: Backup DCS Nodes not given."
+ echo "***ERROR: Install will contiune but WITHOUT High Avalability"
+ echo "***ERROR: HA can be configured later, or kill this script and start over."
+ sed -i '/ENABLE_HA\=/d' $LOCAL_TRAF_CONFIG
+ echo "export ENABLE_HA=\"false\"" >> $LOCAL_TRAF_CONFIG
+ fi
+ else
+ BACKUP_DCS_NODES="$answer"
+ fi
+ echo "export BACKUP_DCS_NODES=\"$BACKUP_DCS_NODES\"" >> $LOCAL_TRAF_CONFIG
+fi
+
+#==============================================
#Simple security
if [[ $SCANNER_MODE == "N" ]]; then
echo -n "Enable simple LDAP security (Y/N), default is N: "
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/eab5e35b/install/installer/trafodion_config_default
----------------------------------------------------------------------
diff --git a/install/installer/trafodion_config_default b/install/installer/trafodion_config_default
index 26495f1..d5554bb 100755
--- a/install/installer/trafodion_config_default
+++ b/install/installer/trafodion_config_default
@@ -143,3 +143,12 @@ export LDAP_SECURITY="N"
#Name of LDAP Config file
export LDAP_AUTH_FILE="traf_authentication_config_${HOSTNAME}"
+#HA configuraton enabled, if want to enable set to true and add valid floating IP address.
+export ENABLE_HA="false"
+
+#Floating IP address for HA configuration only if ENABLE_HA is set to true
+export FLOATING_IP=""
+
+#If HA enabled the set the DCS Backup nodes
+export BACKUP_DCS_NODES=""
+
[2/8] incubator-trafodion git commit: Merge branch 'master' of
github.com:apache/incubator-trafodion into installbugfixes
Posted by ar...@apache.org.
Merge branch 'master' of github.com:apache/incubator-trafodion into installbugfixes
Project: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/commit/ec5e6437
Tree: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/tree/ec5e6437
Diff: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/diff/ec5e6437
Branch: refs/heads/master
Commit: ec5e64374aadac69c157e83bc09ff25ba3f8f7d5
Parents: 9f0a61b 15aa140
Author: Amanda Moran <am...@apache.com>
Authored: Wed Dec 9 22:53:07 2015 +0000
Committer: Amanda Moran <am...@apache.com>
Committed: Wed Dec 9 22:53:07 2015 +0000
----------------------------------------------------------------------
core/sql/arkcmp/CmpContext.cpp | 18 ++--
core/sql/sqlcomp/CmpDescribe.cpp | 151 ++++++++++++++++++++++------------
2 files changed, 107 insertions(+), 62 deletions(-)
----------------------------------------------------------------------