You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@trafodion.apache.org by am...@apache.org on 2016/10/20 21:44:15 UTC
[1/3] incubator-trafodion git commit: Merge branch 'master' of
github.com:apache/incubator-trafodion into bugFixesHacktober
Repository: incubator-trafodion
Updated Branches:
refs/heads/master 624bafbd0 -> 901cebd7d
Merge branch 'master' of github.com:apache/incubator-trafodion into bugFixesHacktober
Project: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/commit/8a8c67a7
Tree: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/tree/8a8c67a7
Diff: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/diff/8a8c67a7
Branch: refs/heads/master
Commit: 8a8c67a76cd63513c834b5aa2e362ba5472fe18f
Parents: 986dba8 43b005f
Author: Amanda Moran <am...@apache.com>
Authored: Wed Oct 12 17:07:53 2016 +0000
Committer: Amanda Moran <am...@apache.com>
Committed: Wed Oct 12 17:07:53 2016 +0000
----------------------------------------------------------------------
.../SqlCompilerDebugger/ItemExpressionView.cpp | 4 +-
core/sql/arkcmp/CmpContext.cpp | 7 +-
core/sql/arkcmp/CmpStatement.cpp | 2 +
core/sql/arkcmp/CmpStoredProc.cpp | 2 +-
core/sql/arkcmp/cmpargs.cpp | 2 +-
core/sql/bin/SqlciErrors.txt | 2 +-
core/sql/cli/Context.cpp | 21 +-
core/sql/cli/Globals.cpp | 17 +-
core/sql/comexe/ComTdbSort.h | 10 +-
core/sql/common/BloomFilter.cpp | 2 +-
core/sql/common/ColIndList.h | 4 +-
core/sql/common/Collections.cpp | 1 -
core/sql/common/Collections.h | 47 ++-
core/sql/common/ComExeTrace.cpp | 1 +
core/sql/common/Ipc.h | 4 +-
core/sql/common/NAMemory.cpp | 2 +-
core/sql/common/NATestpoint.cpp | 3 +-
core/sql/common/NATraceList.h | 2 +-
core/sql/executor/ExHbaseAccess.cpp | 1 +
core/sql/executor/ExHbaseDDL.cpp | 2 +-
core/sql/executor/ex_sort.cpp | 16 +-
core/sql/exp/ExpLOB.h | 4 +-
core/sql/exp/ExpPCodeOptimizations.cpp | 2 +-
core/sql/exp/ExpPCodeOptsBulk.cpp | 4 +-
core/sql/exp/ExpPCodeOptsNativeExpr.cpp | 2 +-
core/sql/exp/exp_tuple_desc.cpp | 17 +-
core/sql/export/ComDiags.cpp | 4 +-
core/sql/generator/GenExplain.cpp | 2 +-
core/sql/generator/GenKey.cpp | 2 +-
core/sql/generator/GenRelGrby.cpp | 2 +-
core/sql/generator/GenRelJoin.cpp | 2 +-
core/sql/generator/GenRelMisc.cpp | 3 +-
core/sql/generator/GenRelScan.cpp | 2 +-
core/sql/generator/GenRelUpdate.cpp | 12 +-
core/sql/generator/GenResources.cpp | 2 +-
core/sql/generator/Generator.cpp | 16 +-
core/sql/langman/LmRoutineJava.cpp | 3 +-
core/sql/langman/LmUtility.cpp | 2 +-
core/sql/nskgmake/sort/Makefile | 3 +-
core/sql/optimizer/Analyzer.cpp | 15 +-
core/sql/optimizer/Analyzer.h | 5 +
core/sql/optimizer/BindItemExpr.cpp | 6 +-
core/sql/optimizer/BindRI.cpp | 2 +-
core/sql/optimizer/BindRelExpr.cpp | 11 +-
core/sql/optimizer/BindWA.cpp | 1 +
core/sql/optimizer/BindWA.h | 2 +-
core/sql/optimizer/CacheWA.cpp | 3 +
core/sql/optimizer/ColStatDesc.cpp | 20 +-
core/sql/optimizer/ControlDB.cpp | 8 +-
core/sql/optimizer/EncodedValue.cpp | 3 +-
core/sql/optimizer/HDFSHook.cpp | 2 +-
core/sql/optimizer/HbaseSearchSpec.h | 52 +--
core/sql/optimizer/ItemFuncUDF.h | 11 +-
core/sql/optimizer/ItemOther.h | 2 +-
core/sql/optimizer/LargeScopeRules.cpp | 4 +-
core/sql/optimizer/MJVIndexBuilder.cpp | 12 +-
core/sql/optimizer/MVCandidates.cpp | 10 +-
core/sql/optimizer/MVInfo.cpp | 13 +-
core/sql/optimizer/MVJoinGraph.cpp | 5 +-
core/sql/optimizer/MjvBuilder.cpp | 2 +-
core/sql/optimizer/MultiJoin.cpp | 2 +-
core/sql/optimizer/MvRefreshBuilder.cpp | 4 +-
core/sql/optimizer/NAClusterInfo.cpp | 2 +-
core/sql/optimizer/NATable.cpp | 8 +-
core/sql/optimizer/NATable.h | 9 +-
core/sql/optimizer/NodeMap.cpp | 2 +-
core/sql/optimizer/NormRelExpr.cpp | 8 +-
core/sql/optimizer/NormWA.cpp | 4 +-
core/sql/optimizer/NormWA.h | 8 +
core/sql/optimizer/OptItemExpr.cpp | 2 +-
core/sql/optimizer/OptLogRelExpr.cpp | 2 +-
core/sql/optimizer/OptRange.cpp | 4 +-
core/sql/optimizer/QRDescGenerator.cpp | 2 +-
core/sql/optimizer/QRDescGenerator.h | 5 +-
core/sql/optimizer/RETDesc.cpp | 10 +-
core/sql/optimizer/Refresh.cpp | 2 +-
core/sql/optimizer/RelExeUtil.h | 3 +-
core/sql/optimizer/RelExpr.cpp | 29 +-
core/sql/optimizer/RelPackedRows.cpp | 2 +-
core/sql/optimizer/RelRoutine.cpp | 2 +-
core/sql/optimizer/RelScan.h | 7 +-
core/sql/optimizer/Rule.cpp | 4 +-
core/sql/optimizer/ScanOptimizer.cpp | 4 +-
core/sql/optimizer/SchemaDB.cpp | 2 +-
core/sql/optimizer/SearchKey.cpp | 6 +-
core/sql/optimizer/Stats.cpp | 3 +-
core/sql/optimizer/Stats.h | 12 +-
core/sql/optimizer/TableNameMap.h | 3 +-
core/sql/optimizer/TransRule.cpp | 2 +-
core/sql/optimizer/VEGTable.cpp | 6 +-
core/sql/optimizer/ValueDesc.cpp | 2 +-
core/sql/optimizer/memo.cpp | 2 +-
core/sql/parser/ElemDDLHbaseOptions.h | 3 +-
core/sql/parser/SqlParserAux.cpp | 6 +-
core/sql/parser/StmtDDLCreate.cpp | 6 +-
core/sql/parser/sqlparser.y | 36 +--
core/sql/qmscommon/Range.cpp | 3 +-
core/sql/qmscommon/Range.h | 3 +-
core/sql/regress/compGeneral/DIFF042.KNOWN | 36 +--
core/sql/regress/compGeneral/EXPECTED001.SB | 2 +-
core/sql/runtimestats/ssmpipc.cpp | 2 +-
core/sql/sort/Qsort.h | 5 +-
core/sql/sort/Record.cpp | 14 +-
core/sql/sort/Record.h | 8 +
core/sql/sort/SortTopN.cpp | 318 +++++++++++++++++++
core/sql/sort/SortTopN.h | 89 ++++++
core/sql/sort/SortUtil.cpp | 78 +++--
core/sql/sort/SortUtil.h | 2 +-
core/sql/sort/SortUtilCfg.cpp | 43 +--
core/sql/sort/SortUtilCfg.h | 11 +-
core/sql/sqlcomp/CmpDescribe.cpp | 4 +-
core/sql/sqlcomp/CmpSeabaseDDLcommon.cpp | 10 +-
core/sql/sqlcomp/CmpSeabaseDDLindex.cpp | 8 +-
core/sql/sqlcomp/CmpSeabaseDDLrepos.cpp | 4 +-
core/sql/sqlcomp/CmpSeabaseDDLtable.cpp | 36 +--
core/sql/sqlcomp/CmpSeabaseDDLview.cpp | 4 +-
core/sql/sqlcomp/DefaultConstants.h | 1 +
core/sql/sqlcomp/PrivMgrDesc.h | 8 +-
core/sql/sqlcomp/PrivMgrPrivileges.cpp | 8 +-
core/sql/sqlcomp/QCache.cpp | 2 +-
core/sql/sqlcomp/QCache.h | 1 +
core/sql/sqlcomp/nadefaults.cpp | 2 +
core/sql/sqlcomp/parser.cpp | 5 +-
core/sql/sqlmsg/GetErrorMessage.cpp | 2 +-
.../java/org/trafodion/sql/HBaseClient.java | 13 +-
core/sql/udrserv/spinfo.cpp | 3 +-
core/sql/ustat/hs_cli.cpp | 2 +-
core/sql/ustat/hs_parser.cpp | 4 +-
.../src/asciidoc/_chapters/binder_msgs.adoc | 102 +++---
docs/messages_guide/src/asciidoc/index.adoc | 1 +
130 files changed, 1009 insertions(+), 464 deletions(-)
----------------------------------------------------------------------
[3/3] incubator-trafodion git commit: Merge [ TRAFODION 2001] PR-769
Posted by am...@apache.org.
Merge [ TRAFODION 2001] PR-769
Project: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/commit/901cebd7
Tree: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/tree/901cebd7
Diff: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/diff/901cebd7
Branch: refs/heads/master
Commit: 901cebd7de2d3cc40b9a9a70efd4d3effc6c53bd
Parents: 624bafb b349f40
Author: Amanda Moran <am...@apache.org>
Authored: Thu Oct 20 21:43:43 2016 +0000
Committer: Amanda Moran <am...@apache.org>
Committed: Thu Oct 20 21:43:43 2016 +0000
----------------------------------------------------------------------
install/installer/addNode_step1 | 89 ++++++++++++-
install/installer/addNode_step2 | 119 +++++++++--------
install/installer/deleteNode | 244 -----------------------------------
3 files changed, 143 insertions(+), 309 deletions(-)
----------------------------------------------------------------------
[2/3] incubator-trafodion git commit: [TRAFODION 2001] Need to revert
to old version of elasticity for installer
Posted by am...@apache.org.
[TRAFODION 2001] Need to revert to old version of elasticity for installer
Project: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/commit/b349f404
Tree: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/tree/b349f404
Diff: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/diff/b349f404
Branch: refs/heads/master
Commit: b349f4046dd64d7f349057a2916b18e036e46a3c
Parents: 8a8c67a
Author: Amanda Moran <am...@apache.com>
Authored: Wed Oct 19 22:20:05 2016 +0000
Committer: Amanda Moran <am...@apache.com>
Committed: Wed Oct 19 22:20:05 2016 +0000
----------------------------------------------------------------------
install/installer/addNode_step1 | 89 ++++++++++++-
install/installer/addNode_step2 | 119 +++++++++--------
install/installer/deleteNode | 244 -----------------------------------
3 files changed, 143 insertions(+), 309 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/b349f404/install/installer/addNode_step1
----------------------------------------------------------------------
diff --git a/install/installer/addNode_step1 b/install/installer/addNode_step1
index 58fe80d..ce3ee52 100755
--- a/install/installer/addNode_step1
+++ b/install/installer/addNode_step1
@@ -54,7 +54,7 @@ if [[ $ENALBE_HA == "true" ]]; then
NEW_BACKUP_DCS_NODES="$answer"
for node in $NEW_BACKUP_DCS_NODES
do
- BACKUP_DCS_NODES="$BACKUP_DCS_NODES $node"
+ BACKUP_DCS_NODES="$BACKUP_DCS_NODES $node"
done
sudo chmod 777 $TRAF_CONFIG
sed -i '/\<NEW_BACKUP_DCS_NODES\>/d' $TRAF_CONFIG
@@ -62,13 +62,14 @@ if [[ $ENALBE_HA == "true" ]]; then
sudo chmod 777 $TRAF_CONFIG
sed -i '/\<BACKUP_DCS_NODES\>/d' $TRAF_CONFIG
echo "export BACKUP_DCS_NODES=\"$BACKUP_DCS_NODES\"" >> $TRAF_CONFIG
- sudo chmod 777 $TRAF_CONFIG
+ sudo chmod 777 $TRAF_CONFIG
fi
fi
}
+
function addNewNodesConfig {
source $TRAF_CONFIG
@@ -85,7 +86,7 @@ do
exit -1
fi
NEW_NODES="$NEW_NODES $newNode"
-
+
done
for node in $NEW_NODES
@@ -93,6 +94,7 @@ do
MY_NEW_NODES="$MY_NEW_NODES -w $node"
done
+
echo $MY_NEW_NODES
export PDSH_SSH_CMD="ssh -q -n %h"
@@ -200,6 +202,84 @@ sudo chmod 777 $TRAF_CONFIG
}
+function removeNodeExclude {
+
+source $TRAF_CONFIG
+temp=""
+
+for node in $TRAF_EXCLUDE_LIST
+do
+ if [[ ! $NODES =~ .*$node.* ]]; then
+ temp="$temp $node"
+ fi
+
+done
+excludeCount=$(echo $TRAF_EXCLUDE_LIST | wc -w)
+tempCount=$(echo $temp | wc -w)
+
+
+if [[ "$excludeCount" -eq "$tempCount" ]]; then
+#New node name
+ changeNodeName
+ NAME_CHANGE="true"
+ sudo chmod 777 $TRAF_CONFIG
+ sed -i '/NAME_CHANGE\=/d' $TRAF_CONFIG
+ echo "export NAME_CHANGE=\"$NAME_CHANGE\"" >> $TRAF_CONFIG
+ sudo chmod 777 $TRAF_CONFIG
+else
+ TRAF_EXCLUDE_LIST=$temp
+ sudo chmod 777 $TRAF_CONFIG
+ sed -i '/TRAF_EXCLUDE_LIST\=/d' $TRAF_CONFIG
+ echo "export TRAF_EXCLUDE_LIST=\"$TRAF_EXCLUDE_LIST\"" >> $TRAF_CONFIG
+ sudo chmod 777 $TRAF_CONFIG
+fi
+
+}
+
+function changeNodeName {
+
+source $TRAF_CONFIG
+
+for node in $NODES
+do
+
+ export oldNODENAME=$(echo $TRAF_EXCLUDE_LIST | head -n1 | awk '{print $1;}')
+ temp=""
+
+ for nodes in $TRAF_EXCLUDE_LIST
+ do
+ if [[ "$oldNODENAME" != $nodes ]]; then
+ temp="$temp $nodes"
+ fi
+ done
+ export TRAF_EXCLUDE_LIST=$temp
+
+ oldToNew="$oldNODENAME $node"
+ echo
+ echo "********************************************************************"
+ echo "***VERY IMPORTANT: User must change old user name to a new user name."
+ echo "***VERY IMPORTANT: open another session and sudo su trafodion"
+ echo "***VERY IMPORTANT: sqshell -a"
+ echo "***VERY IMPORTANT: node name $oldToNew"
+ sleep 5
+ echo -n "***VERY IMPORTANT: Press any key when complete."
+ read answer
+ echo
+ echo "********************************************************************"
+
+ sudo sed -i -e "s/\<$oldNODENAME\>/$node/g" $SQ_ROOT/tmp/cluster.conf
+ sudo sed -i -e "s/\<$oldNODENAME\>/$node/g" $SQ_ROOT/sql/scripts/sqconfig
+ sudo rm -rf $SQ_ROOT/tmp/se*
+ sudo rm -rf $SQ_ROOT/sql/scripts/se*
+ sudo chmod 777 $TRAF_CONFIG
+ sed -i '/TRAF_EXCLUDE_LIST\=/d' $TRAF_CONFIG
+ echo "export TRAF_EXCLUDE_LIST=\"$TRAF_EXCLUDE_LIST\"" >> $TRAF_CONFIG
+ sudo chmod 777 $TRAF_CONFIG
+
+done
+
+}
+
function createConfigDir {
$TRAF_NEW_PDSH sudo mkdir -p /etc/trafodion
@@ -244,10 +324,10 @@ $TRAF_NEW_PDSH rm -rf trafodion-util*
}
+
function printMessage {
source $TRAF_CONFIG
-echo
echo "***IMPORTANT: Go restart HBase on new nodes"
echo "***IMPORTANT: Wait until that is done... then..."
echo "***IMPORTANT: Ready to run addNode_step2"
@@ -262,6 +342,7 @@ checkForHA
addNewNodesConfig
copyHBaseTrx
createNewNodes
+removeNodeExclude
createConfigDir
copyConfig
checkHBaseTrx
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/b349f404/install/installer/addNode_step2
----------------------------------------------------------------------
diff --git a/install/installer/addNode_step2 b/install/installer/addNode_step2
index 6213b71..26ad9f1 100755
--- a/install/installer/addNode_step2
+++ b/install/installer/addNode_step2
@@ -153,8 +153,8 @@ function editTrafbashrc {
source $TRAF_CONFIG
sudo chmod 777 $HOME_DIR/$TRAF_USER/.bashrc
-sudo sed -i -e "/export NODE_LIST/d" $HOME_DIR/$TRAF_USER/.bashrc
-sudo sed -i -e "/export MY_NODES=/d" $HOME_DIR/$TRAF_USER/.bashrc
+sudo sed -i -e "s@export NODE_LIST=.*@export NODE_LIST=\"$NODE_LIST\"@" $HOME_DIR/$TRAF_USER/.bashrc
+sudo sed -i -e "s@export MY_NODES=.*@export MY_NODES=\"$MY_NODES\"@" $HOME_DIR/$TRAF_USER/.bashrc
}
@@ -172,6 +172,43 @@ $TRAF_PDSH sudo chmod 644 $HOME_DIR/$TRAF_USER/.bashrc
}
+function copyClusterConf {
+
+source $TRAF_CONFIG
+echo "***INFO: Copying over new cluster.conf file"
+
+echo "***IMPORTANT*** Ignore copy errors to new node."
+echo
+sleep 5
+
+sudo cp $SQ_ROOT/tmp/cluster.conf $PWD
+sudo chown $(whoami).$(whoami) $PWD/cluster.conf
+$TRAF_PDCP $PWD/cluster.conf $HOME
+$TRAF_PDSH sudo cp $HOME/cluster.conf $SQ_ROOT/tmp/cluster.conf 2>&1 > /dev/null
+$TRAF_PDSH sudo chown $TRAF_USER.trafodion $SQ_ROOT/tmp/cluster.conf 2>&1 > /dev/null
+$TRAF_PDSH sudo rm $HOME/cluster.conf
+
+}
+
+function copySQconfig {
+
+source $TRAF_CONFIG
+echo "***INFO: Copying over new sqconfig file"
+
+echo "***IMPORTANT*** Ignore copy errors to new node."
+echo
+sleep 5
+
+sudo cp -r $SQ_ROOT/sql/scripts/sqconfig $PWD
+sudo chown $(whoami).$(whoami) $PWD/sqconfig
+$TRAF_PDCP $PWD/sqconfig $HOME
+$TRAF_PDSH sudo cp $HOME/sqconfig $SQ_ROOT/sql/scripts/sqconfig 2>&1 > /dev/null
+$TRAF_PDSH sudo chown $TRAF_USER.trafodion $SQ_ROOT/sql/scripts/sqconfig 2>&1 > /dev/null
+$TRAF_PDSH sudo rm $HOME/sqconfig
+
+
+}
+
function addTraftoHBase {
echo "***INFO: Adding $TRAF_USER userid to $HBASE_GROUP group"
@@ -188,13 +225,14 @@ echo "***INFO: Create DCS servers file"
source $TRAF_CONFIG
DCS_DIR=$(sudo ls $SQ_ROOT | grep dcs\*)
+sudo cp $SQ_ROOT/$DCS_DIR/conf/servers $PWD
+sudo chown $(whoami).$(whoami) $PWD/servers
let per_node=$DCS_SERVERS_PARM/$node_count
let extras=$DCS_SERVERS_PARM%$node_count
count=1
for node_name in $NODE_LIST
do
-
while read line
do
if [[ $line =~ .*$node_name.* ]]; then
@@ -214,10 +252,12 @@ do
done
-$TRAF_PDCP $PWD/tempServers $HOME
+$TRAF_PDCP $PWD/servers $HOME/tempServers
$TRAF_PDSH sudo cp $HOME/tempServers $SQ_ROOT/$DCS_DIR/conf/servers
$TRAF_PDSH sudo chown $TRAF_USER.trafodion $SQ_ROOT/$DCS_DIR/conf/servers
+
+
}
function editDCSBackUp {
@@ -227,7 +267,7 @@ echo "***INFO: Create DCS Backup Master file"
source $TRAF_CONFIG
DCS_DIR=$(sudo ls $SQ_ROOT | grep dcs\*)
-if [[ ! -z $NEW_BACKUP_DCS_NODES ]]; then
+if [[ ! -z $NEW_BACKUP_DCS_NODES ]]; then
for node_name in $BACKUP_DCS_NODES
do
echo $node_name >> $PWD/tempbackup
@@ -240,13 +280,12 @@ if [[ ! -z $NEW_BACKUP_DCS_NODES ]]; then
fi
}
-
function copyAll {
source $TRAF_CONFIG
echo
echo "***IMPORTANT: Copying files to $NEW_NODES"
-echo "***IMPORTANT: This will take some time, it's a lot of file. Please wait...."
+echo "***IMPORTANT: This will take some time, it's alot of file. Please wait...."
echo
sudo mkdir -p $HOME/tmpTraf/
$TRAF_NEW_PDSH sudo rm -rf $HOME_DIR/$TRAF_USER/.ssh
@@ -312,72 +351,31 @@ function copySqcert {
source $TRAF_CONFIG
$TRAF_PDSH mkdir -p $HOME/tmpTraf
-sudo cp -r $HOME_DIR/$TRAF_USER/sqcert $HOME/tmpTraf
+sudo cp -r $HOME_DIR/$TRAF_USER/sqcert/* $HOME/tmpTraf
sudo chown -R $(whoami).$(whoami) $HOME/tmpTraf
$TRAF_PDCP -r $HOME/tmpTraf $HOME
$TRAF_PDSH sudo mkdir -p $HOME_DIR/$TRAF_USER/sqcert
$TRAF_PDSH sudo chown -R $TRAF_USER.trafodion $HOME_DIR/$TRAF_USER/sqcert 2>&1 > /dev/null
-$TRAF_PDSH sudo cp -rf $HOME/tmpTraf/sqcert/* $HOME_DIR/$TRAF_USER/sqcert 2>&1 > /dev/null
+$TRAF_PDSH sudo cp -rf $HOME/tmpTraf/sqcert $HOME_DIR/$TRAF_USER/sqcert 2>&1 > /dev/null
$TRAF_PDSH sudo chown -R $TRAF_USER.trafodion $HOME_DIR/$TRAF_USER/sqcert 2>&1 > /dev/null
$TRAF_PDSH rm -r $HOME/tmpTraf
}
-function copysqConfig {
-
-source $TRAF_CONFIG
-
-$TRAF_PDSH mkdir -p $HOME/tmpTraf
-sudo cp -r $SQ_ROOT/sql/scripts/sqconfig $HOME/tmpTraf
-sudo cp -r $SQ_ROOT/sql/scripts/sqconfig.db $HOME/tmpTraf
-sudo chown -R $(whoami).$(whoami) $HOME/tmpTraf
-$TRAF_PDCP -r $HOME/tmpTraf $HOME
-$TRAF_PDSH sudo cp -rf $HOME/tmpTraf/sqconfig $SQ_ROOT/sql/scripts 2>&1 > /dev/null
-$TRAF_PDSH sudo cp -rf $HOME/tmpTraf/sqconfig.db $SQ_ROOT/sql/scripts 2>&1 > /dev/null
-$TRAF_PDSH sudo chown -R $TRAF_USER.trafodion $SQ_ROOT/sql/scripts 2>&1 > /dev/null
-$TRAF_PDSH rm -r $HOME/tmpTraf
-
-}
-
-
function printMessage {
source $TRAF_CONFIG
echo
echo "***IMPORTANT: EXIT OUT OF ALL EXISTING SHELLS, need to pick up new environment variables"
-echo "***IMPORTANT: All node(s) should be added!"
+echo "***IMPORTANT: Node is ready to be added"
+echo "***IMPORTANT: sudo su $TRAF_USER"
+echo "***IMPORTANT: sqshell -a"
+echo "***IMPORTANT: up <new node>"
echo
}
-function addUpNodes {
-
-for node in $NEW_NODES
-do
-
- nodeToAdd="node-name $node, cores $CORES, processors $PROCESSORS, roles connection,aggregation,storage"
-
- sudo su $TRAF_USER --login --command "cd $SQ_ROOT/sql/scripts; echo \"node add $nodeToAdd \" | sqshell -a"
- sleep 30
- sudo su $TRAF_USER --login --command "cd $SQ_ROOT/sql/scripts; echo \"node up $node\" | sqshell -a"
- sleep 30
-
-done
-
-}
-
-function sqRegen {
-
-sudo su $TRAF_USER --login --command "cd $SQ_ROOT/sql/scripts; sqregen -config"
-
-}
-
-function dcsStart {
-
-sudo su $TRAF_USER --login --command "cd $SQ_ROOT/sql/scripts; dcsstart"
-}
-
function cleanUp {
$TRAF_PDSH rm -rf $HOME/hbase-site*
@@ -391,11 +389,13 @@ $TRAF_PDSH rm -rf $HOME/trafodion.conf
}
+
#Main
echo
echo "***IMPORTANT: Starting installation on $NEW_NODES"
echo
+
installPackages
copyLimits
reserveDCSPorts
@@ -407,15 +407,12 @@ copyTrafbashrc
copyAll
trafAcceptKeys
editDCSServers
-if [[ "$ENABLE_HA" == "true" ]]; then
+if [[ "$ENABLE_HA" == "true" ]]; then
editDCSBackUp
fi
addTraftoHBase
+copyClusterConf
+copySQconfig
copySqcert
-addUpNodes
-sqRegen
-copysqConfig
-dcsStart
-cleanUp
printMessage
-
+cleanUp
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/b349f404/install/installer/deleteNode
----------------------------------------------------------------------
diff --git a/install/installer/deleteNode b/install/installer/deleteNode
deleted file mode 100755
index bf2d905..0000000
--- a/install/installer/deleteNode
+++ /dev/null
@@ -1,244 +0,0 @@
-#!/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"
-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
-
-source $TRAF_CONFIG
-
-function deleteNodesConfig {
-
-source $TRAF_CONFIG
-
-DELETE_NODES="$NODES"
-MY_DELETE_NODES=""
-
-for node in $NODES
-do
- MY_DELETE_NODES="$MY_DELETE_NODES -w $node"
-done
-
-echo $MY_DELETE_NODES
-
-export PDSH_SSH_CMD="ssh -q -n %h"
-
-export TRAF_NEW_PDSH="pdsh -R exec $MY_DELETE_NODES $PDSH_SSH_CMD"
-export TRAF_NEW_PDCP="pdcp -R ssh $MY_DELETE_NODES"
-
-
-sudo chmod 777 $TRAF_CONFIG
-sed -i '/DELETE_NODES\=/d' $TRAF_CONFIG
-echo "export DELETE_NODES=\"$DELETE_NODES\"" >> $TRAF_CONFIG
-sudo chmod 777 $TRAF_CONFIG
-sed -i '/MY_DELETE_NODES\=/d' $TRAF_CONFIG
-echo "export MY_DELETE_NODES=\"$MY_DELETE_NODES\"" >> $TRAF_CONFIG
-sudo chmod 777 $TRAF_CONFIG
-sed -i '/TRAF_NEW_PDSH\=/d' $TRAF_CONFIG
-echo "export TRAF_NEW_PDSH=\"$TRAF_NEW_PDSH\"" >> $TRAF_CONFIG
-sudo chmod 777 $TRAF_CONFIG
-sed -i '/TRAF_NEW_PDCP\=/d' $TRAF_CONFIG
-echo "export TRAF_NEW_PDCP=\"$TRAF_NEW_PDCP\"" >> $TRAF_CONFIG
-sudo chmod 777 $TRAF_CONFIG
-}
-
-function createNewNodes {
-
-source $TRAF_CONFIG
-temp=""
-tempW=""
-for node in $NODE_LIST
-do
- if [[ ! $DELETE_NODES =~ .*$node.* ]]; then
- temp="$temp $node"
- tempW="$tempW $node"
- fi
-done
-
-NODE_LIST="$temp"
-node_count=$(echo $NODE_LIST | wc -w)
-MY_NODES="$tempW"
-
-temp1=""
-tempW1=""
-
-for node in $ALL_NODE_LIST
-do
- if [[ ! $DELETE_NODES =~ .*$node.* ]]; then
- temp1="$temp1 $node"
- tempW1="$tempW1 -w $node"
- fi
-done
-
-ALL_NODE_LIST="$temp1"
-echo $ALL_NODE_LIST
-ALL_NODES="$tempW1"
-echo $ALL_NODES
-
-TRAF_PDSH="pdsh -R exec $ALL_NODES $PDSH_SSH_CMD"
-TRAF_PDCP="pdcp -R ssh $ALL_NODES"
-
-sudo chmod 777 $TRAF_CONFIG
-sed -i '/TRAF_PDSH\=/d' $TRAF_CONFIG
-echo "export TRAF_PDSH=\"$TRAF_PDSH\"" >> $TRAF_CONFIG
-sudo chmod 777 $TRAF_CONFIG
-sed -i '/TRAF_PDCP\=/d' $TRAF_CONFIG
-echo "export TRAF_PDCP=\"$TRAF_PDCP\"" >> $TRAF_CONFIG
-sudo chmod 777 $TRAF_CONFIG
-sed -i '/\<ALL_NODES\>/d' $TRAF_CONFIG
-echo "export ALL_NODES=\"$ALL_NODES\"" >> $TRAF_CONFIG
-sudo chmod 777 $TRAF_CONFIG
-sed -i '/\<NODE_LIST\>/d' $TRAF_CONFIG
-echo "export NODE_LIST=\"$NODE_LIST\"" >> $TRAF_CONFIG
-sudo chmod 777 $TRAF_CONFIG
-sed -i '/node_count\=/d' $TRAF_CONFIG
-echo "export node_count=\"$node_count\"" >> $TRAF_CONFIG
-sudo chmod 777 $TRAF_CONFIG
-sed -i '/\<ALL_NODE_LIST\>/d' $TRAF_CONFIG
-echo "export ALL_NODE_LIST=\"$ALL_NODE_LIST\"" >> $TRAF_CONFIG
-sudo chmod 777 $TRAF_CONFIG
-sed -i '/\<MY_NODES\>/d' $TRAF_CONFIG
-echo "export MY_NODES=\"$MY_NODES\"" >> $TRAF_CONFIG
-sudo chmod 777 $TRAF_CONFIG
-}
-
-
-function copyConfig {
-
-source $TRAF_CONFIG
-
-cp $TRAF_CONFIG $PWD
-$TRAF_PDCP $PWD/trafodion_config $HOME
-$TRAF_PDSH sudo cp $HOME/trafodion_config /etc/trafodion/
-$TRAF_PDSH sudo chmod 777 $TRAF_CONFIG
-
-}
-
-function deleteNodes {
-
-for node in $DELETE_NODES
-do
-
- sudo su $TRAF_USER --login --command "cd $SQ_ROOT/sql/scripts; echo \"node down $node\" | sqshell -a"
- sleep 30
- sudo su $TRAF_USER --login --command "cd $SQ_ROOT/sql/scripts; echo \"node delete $node\" | sqshell -a"
- sleep 30
-
-done
-
-
-}
-
-function sqRegen {
-
-sudo su $TRAF_USER --login --command "cd $SQ_ROOT/sql/scripts; sqregen -config"
-
-}
-
-function copysqConfig {
-
-source $TRAF_CONFIG
-
-$TRAF_PDSH mkdir -p $HOME/tmpTraf
-sudo cp -r $SQ_ROOT/sql/scripts/sqconfig $HOME/tmpTraf
-sudo cp -r $SQ_ROOT/sql/scripts/sqconfig.db $HOME/tmpTraf
-sudo chown -R $(whoami).$(whoami) $HOME/tmpTraf
-$TRAF_PDCP -r $HOME/tmpTraf $HOME
-$TRAF_PDSH sudo cp -rf $HOME/tmpTraf/sqconfig $SQ_ROOT/sql/scripts 2>&1 > /dev/null
-$TRAF_PDSH sudo cp -rf $HOME/tmpTraf/sqconfig.db $SQ_ROOT/sql/scripts 2>&1 > /dev/null
-$TRAF_PDSH sudo chown -R $TRAF_USER.trafodion $SQ_ROOT/sql/scripts 2>&1 > /dev/null
-$TRAF_PDSH rm -r $HOME/tmpTraf
-
-}
-
-function editDCSServers {
-
-source $TRAF_CONFIG
-DCS_DIR=$(sudo ls $SQ_ROOT | grep dcs\*)
-
-let per_node=$DCS_SERVERS_PARM/$node_count
-let extras=$DCS_SERVERS_PARM%$node_count
-count=1
-for node_name in $NODE_LIST
-do
- if [ $count -le $extras ]; then
- let node_servers=$per_node+1
- else
- node_servers=$per_node
- fi
- echo $node_name $node_servers >> $PWD/tmpServers
- (( count++ ))
-done
-
-
-$TRAF_PDCP $PWD/tmpServers $HOME
-$TRAF_PDSH sudo cp $HOME/tmpServers $SQ_ROOT/$DCS_DIR/conf/servers
-$TRAF_PDSH sudo chown $TRAF_USER.trafodion $SQ_ROOT/$DCS_DIR/conf/servers
-$TRAF_PDSH sudo rm -rf $HOME/tmp*
-
-}
-
-function dcsStop {
-
-echo "This is where we will use the new dcsstop --node script"
-
-}
-
-
-function printMessage {
-
-source $TRAF_CONFIG
-echo
-echo "***IMPORTANT: Node(s) removed!"
-echo "***IMPORTANT: EXIT OUT OF ALL EXISTING SHELLS, need to pick up new environment variables"
-echo
-echo
-
-}
-
-
-#Main
-
-deleteNodesConfig
-createNewNodes
-copyConfig
-deleteNodes
-sqRegen
-copysqConfig
-editDCSServers
-dcsStop
-printMessage
-