trafodion-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From lium...@apache.org
Subject [01/10] incubator-trafodion git commit: [TRAFODION-2388] there should be only one ENV for Trafodion's root directory instead of many.
Date Thu, 15 Dec 2016 08:51:23 GMT
Repository: incubator-trafodion
Updated Branches:
  refs/heads/master 97ee8a768 -> b11143027


[TRAFODION-2388] there should be only one ENV for Trafodion's root directory instead of many.


Project: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/commit/fbb465ae
Tree: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/tree/fbb465ae
Diff: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/diff/fbb465ae

Branch: refs/heads/master
Commit: fbb465ae1a12c1457f19e6a80f39dc4c9fc3b129
Parents: 1430279
Author: Eason <hfutmkby@gmail.com>
Authored: Tue Dec 6 23:48:05 2016 +0800
Committer: Eason <hfutmkby@gmail.com>
Committed: Tue Dec 6 23:48:05 2016 +0800

----------------------------------------------------------------------
 core/conn/jdbc_type2/Makefile                   |  4 +--
 core/conn/odbc/src/odbc/macros.gmk              |  2 +-
 core/conn/odbc/src/odbc/nsksrvr/Makefile        |  2 +-
 core/conn/odbc/src/odbc/nsksrvrcore/Makefile    |  2 +-
 core/sqf/sqenvcom.sh                            |  2 +-
 core/sqf/sql/scripts/gensq.pl                   |  4 +--
 core/sqf/sql/scripts/install_apache_hadoop      |  2 +-
 core/sqf/sql/scripts/sqsystem.pm                |  4 +--
 core/sqf/sql/scripts/trafnodestatus             |  2 +-
 core/sqf/src/tm/macros.gmk                      |  2 +-
 .../src/asciidoc/_chapters/introduction.adoc    |  4 +--
 .../src/asciidoc/_chapters/prepare.adoc         |  2 +-
 .../src/asciidoc/_chapters/script_upgrade.adoc  |  6 ++--
 install/installer/addNode_step1                 |  8 +++---
 install/installer/addNode_step2                 | 28 +++++++++---------
 install/installer/bashrc_default                |  3 +-
 install/installer/dcs_installer                 |  8 +++---
 install/installer/rest_installer                |  4 +--
 install/installer/traf_add_ldap                 | 14 ++++-----
 install/installer/traf_config                   | 30 ++++++++++----------
 install/installer/traf_config_check             |  4 +--
 install/installer/traf_config_setup             | 12 ++++----
 install/installer/traf_secure                   | 20 ++++++-------
 install/installer/traf_sqgen                    | 10 +++----
 install/installer/traf_start                    | 18 ++++++------
 install/installer/trafodion_config_default      |  2 +-
 install/installer/trafodion_install             |  6 ++--
 install/installer/trafodion_uninstaller         |  8 +++---
 install/python-installer/bashrc.template        |  5 ++--
 install/python-installer/dcs_setup.py           | 14 ++++-----
 install/python-installer/traf_ldap.py           |  6 ++--
 install/python-installer/traf_setup.py          |  4 +--
 install/python-installer/traf_sqconfig.py       |  6 ++--
 install/python-installer/traf_user.py           |  4 +--
 34 files changed, 125 insertions(+), 127 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/fbb465ae/core/conn/jdbc_type2/Makefile
----------------------------------------------------------------------
diff --git a/core/conn/jdbc_type2/Makefile b/core/conn/jdbc_type2/Makefile
index f71fb45..ab13539 100644
--- a/core/conn/jdbc_type2/Makefile
+++ b/core/conn/jdbc_type2/Makefile
@@ -59,9 +59,9 @@ T2_OBJS  = $(OUTDIR)/CommonDiags.o \
        $(OUTDIR)/type2version.o
 
 OBJS = $(COMMON_OBJS) $(T2_OBJS)
-MXODIR = $(SQ_HOME)/../conn/odbc/src/odbc
+MXODIR = $(MY_SQROOT)/../conn/odbc/src/odbc
 
-INCLUDES     = -I. -I$(JAVA_HOME)/include -I$(JAVA_HOME)/include/linux -Inative -I$(MXODIR)/Krypton/generated_incs -I$(MXODIR)/dependencies/include -I$(MXODIR)/dependencies/linux -I$(SQ_HOME)/export/include/sql -I$(SQ_HOME)/inc/tmf_tipapi -I$(SQ_HOME)/inc -I$(SQ_HOME)/export/include -I$(SQ_HOME)/inc/rosetta -I$(SQ_HOME)/../sql/cli -I$(SQ_HOME)/../sql/common -I$(SQ_HOME)/../dbsecurity/cert/inc -I$(SQ_HOME)/../dbsecurity/auth/inc -I$(SQ_HOME)/commonLogger  -I$(LOG4CXX_INC_DIR) -I$(LOG4CXX_INC_DIR)/lib4cxx
+INCLUDES     = -I. -I$(JAVA_HOME)/include -I$(JAVA_HOME)/include/linux -Inative -I$(MXODIR)/Krypton/generated_incs -I$(MXODIR)/dependencies/include -I$(MXODIR)/dependencies/linux -I$(MY_SQROOT)/export/include/sql -I$(MY_SQROOT)/inc/tmf_tipapi -I$(MY_SQROOT)/inc -I$(MY_SQROOT)/export/include -I$(MY_SQROOT)/inc/rosetta -I$(MY_SQROOT)/../sql/cli -I$(MY_SQROOT)/../sql/common -I$(MY_SQROOT)/../dbsecurity/cert/inc -I$(MY_SQROOT)/../dbsecurity/auth/inc -I$(MY_SQROOT)/commonLogger  -I$(LOG4CXX_INC_DIR) -I$(LOG4CXX_INC_DIR)/lib4cxx
 COMMON_DEFINES = -DTRAFODION_JDBCT2_VER_MAJOR=$(TRAFODION_VER_MAJOR) -DTRAFODION_JDBCT2_VER_MINOR=$(TRAFODION_VER_MINOR) -D_LP64 -DNA_LINUX -DSIZEOF_LONG_INT=4 -DSQ_GUARDIAN_CALL -DDISABLE_NOWAIT -D_FASTPATH -DTODO -D_SQ64 -w
 
 DEFINES =  $(COMMON_DEFINES)

http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/fbb465ae/core/conn/odbc/src/odbc/macros.gmk
----------------------------------------------------------------------
diff --git a/core/conn/odbc/src/odbc/macros.gmk b/core/conn/odbc/src/odbc/macros.gmk
index 9d77d9c..8497a89 100644
--- a/core/conn/odbc/src/odbc/macros.gmk
+++ b/core/conn/odbc/src/odbc/macros.gmk
@@ -155,6 +155,6 @@ $(OUTDIR)/%.o: ../../../Common/%.cpp
 	$(CXX) $(CXXFLAGS) $(INCLUDES) -c -o $@ $<
 
 # Common logger
-$(OUTDIR)/%.o: $(SQ_HOME)/commonLogger/%.cpp
+$(OUTDIR)/%.o: $(MY_SQROOT)/commonLogger/%.cpp
 	@if [ -d "$(OUTDIR)" ]; then x=1; else mkdir -p "$(OUTDIR)"; fi
 	$(CXX) $(CXXFLAGS) $(INCLUDES) -c -o $@ $<

http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/fbb465ae/core/conn/odbc/src/odbc/nsksrvr/Makefile
----------------------------------------------------------------------
diff --git a/core/conn/odbc/src/odbc/nsksrvr/Makefile b/core/conn/odbc/src/odbc/nsksrvr/Makefile
index 36404e6..c7894e1 100644
--- a/core/conn/odbc/src/odbc/nsksrvr/Makefile
+++ b/core/conn/odbc/src/odbc/nsksrvr/Makefile
@@ -103,7 +103,7 @@ ODBC_OBJS = $(OUTDIR)/odbcas_drvr.o \
 
 OBJS = $(COMMON_OBJS) $(COMPRESS_OBJS) $(DBT_OBJS) $(ODBC_OBJS) $(WMS_OBJS)
 
-INCLUDES     = -I. -I../Common -I../Common/linux -I../EventMsgs -I../SrvrMsg -I../nsksrvrcore -I./Interface -I./Interface/linux -I../dependencies/include -I../dependencies/linux -I../dependencies/liblzf -I../Krypton/generated_incs -I$(SQ_HOME)/export/include/sql -I$(SQ_HOME)/inc/tmf_tipapi -I$(SQ_HOME)/inc -I$(SQ_HOME)/export/include -I$(SQ_HOME)/inc/rosetta -I ../OssCfgCl/src -I../CmdCfgDll -I$(SQ_HOME)/../sql/cli -I$(SQ_HOME)/../dbsecurity/cert/inc -I$(SQ_HOME)/../dbsecurity/auth/inc -I$(ZOOKEEPER_DIR)/include -I$(SQ_HOME)/commonLogger -I$(LOG4CXX_INC_DIR) -I$(LOG4CXX_INC_DIR)/lib4cxx
+INCLUDES     = -I. -I../Common -I../Common/linux -I../EventMsgs -I../SrvrMsg -I../nsksrvrcore -I./Interface -I./Interface/linux -I../dependencies/include -I../dependencies/linux -I../dependencies/liblzf -I../Krypton/generated_incs -I$(MY_SQROOT)/export/include/sql -I$(MY_SQROOT)/inc/tmf_tipapi -I$(MY_SQROOT)/inc -I$(MY_SQROOT)/export/include -I$(MY_SQROOT)/inc/rosetta -I ../OssCfgCl/src -I../CmdCfgDll -I$(MY_SQROOT)/../sql/cli -I$(MY_SQROOT)/../dbsecurity/cert/inc -I$(MY_SQROOT)/../dbsecurity/auth/inc -I$(ZOOKEEPER_DIR)/include -I$(MY_SQROOT)/commonLogger -I$(LOG4CXX_INC_DIR) -I$(LOG4CXX_INC_DIR)/lib4cxx
 
 
 COMMON_DEFINES = -DNA_LINUX -DSIZEOF_LONG_INT=4 -DSQ_GUARDIAN_CALL -DUSE_NEW_PHANDLE -DTIMER_FIXED -w -DNSK_ODBC_SRVR -D__TIME_LOGGER -DTHREADED

http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/fbb465ae/core/conn/odbc/src/odbc/nsksrvrcore/Makefile
----------------------------------------------------------------------
diff --git a/core/conn/odbc/src/odbc/nsksrvrcore/Makefile b/core/conn/odbc/src/odbc/nsksrvrcore/Makefile
index d1e3741..25a4843 100644
--- a/core/conn/odbc/src/odbc/nsksrvrcore/Makefile
+++ b/core/conn/odbc/src/odbc/nsksrvrcore/Makefile
@@ -64,7 +64,7 @@ OBJS  = $(OUTDIR)/CommonDiags.o \
         $(OUTDIR)/srvrothers.o \
         $(OUTDIR)/libmxocore_version.o
 
-INCLUDES = -I. -I../Common -I../EventMsgs -I../SrvrMsg -I../dependencies/include -I../dependencies/linux -I../Krypton/generated_incs  -I$(SQ_HOME)/export/include/sql -I$(SQ_HOME)/inc/tmf_tipapi  -I$(SQ_HOME)/inc  -I$(SQ_HOME)/export/include -I$(SQ_HOME)/sql/nq_w/common -I../OssCfgCl/src -I../CmdCfgDll -I$(PROTOBUFS_INC) -I$(SQ_HOME)/../sql/cli -I$(SQ_HOME)/commonLogger -I$(SQ_HOME)/../dbsecurity/cert/inc -I$(SQ_HOME)/../dbsecurity/auth/inc -I$(LOG4CXX_INC_DIR) -I$(SQ_HOME)/../mpi/src/include/intern
+INCLUDES = -I. -I../Common -I../EventMsgs -I../SrvrMsg -I../dependencies/include -I../dependencies/linux -I../Krypton/generated_incs  -I$(MY_SQROOT)/export/include/sql -I$(MY_SQROOT)/inc/tmf_tipapi  -I$(MY_SQROOT)/inc  -I$(MY_SQROOT)/export/include -I$(MY_SQROOT)/sql/nq_w/common -I../OssCfgCl/src -I../CmdCfgDll -I$(PROTOBUFS_INC) -I$(MY_SQROOT)/../sql/cli -I$(MY_SQROOT)/commonLogger -I$(MY_SQROOT)/../dbsecurity/cert/inc -I$(MY_SQROOT)/../dbsecurity/auth/inc -I$(LOG4CXX_INC_DIR) -I$(MY_SQROOT)/../mpi/src/include/intern
 
 DEFINES =  -DNA_LINUX -DSIZEOF_LONG_INT=4 -DUSE_NEW_PHANDLE -DSQ_GUARDIAN_CALL -D_M_DG -DINC_QPID_EVENT -w
 

http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/fbb465ae/core/sqf/sqenvcom.sh
----------------------------------------------------------------------
diff --git a/core/sqf/sqenvcom.sh b/core/sqf/sqenvcom.sh
index 058f7f8..d5acf92 100644
--- a/core/sqf/sqenvcom.sh
+++ b/core/sqf/sqenvcom.sh
@@ -138,7 +138,7 @@ else
    export RH_MAJ_VERS=6
 fi
 export MY_SQROOT=$PWD
-export SQ_HOME=$PWD
+export MY_SQROOT=$PWD
 
 # set common version to be consistent between shared lib and maven dependencies
 export HBASE_DEP_VER_CDH=1.2.0-cdh5.7.1

http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/fbb465ae/core/sqf/sql/scripts/gensq.pl
----------------------------------------------------------------------
diff --git a/core/sqf/sql/scripts/gensq.pl b/core/sqf/sql/scripts/gensq.pl
index 58ccd06..099022b 100755
--- a/core/sqf/sql/scripts/gensq.pl
+++ b/core/sqf/sql/scripts/gensq.pl
@@ -122,7 +122,7 @@ my $gFloatingNodeId = -1;
 my $gFloatingFailoverNodeId = -1;
 
 
-my $SQ_ROOT = $ENV{'MY_SQROOT'};
+my $MY_SQROOT = $ENV{'MY_SQROOT'};
 my $HOME = $ENV{'HOME'};
 my $MPI_TMPDIR = $ENV{'MPI_TMPDIR'};
 my $SQ_SEAMONSTER = $ENV{'SQ_SEAMONSTER'};
@@ -391,7 +391,7 @@ sub printInitialLines {
     printScript(0, "\nset MY_NODES=\$MY_NODES\n");
 
     addDbClusterData( "SQ_MBTYPE", $ENV{'SQ_MBTYPE'});
-    addDbClusterData( "MY_SQROOT", "$SQ_ROOT"); # comes out null
+    addDbClusterData( "MY_SQROOT", "$MY_SQROOT"); # comes out null
 
     $gbInitialLinesPrinted = 1;
 }

http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/fbb465ae/core/sqf/sql/scripts/install_apache_hadoop
----------------------------------------------------------------------
diff --git a/core/sqf/sql/scripts/install_apache_hadoop b/core/sqf/sql/scripts/install_apache_hadoop
index 9fdc5ff..3871b0e 100755
--- a/core/sqf/sql/scripts/install_apache_hadoop
+++ b/core/sqf/sql/scripts/install_apache_hadoop
@@ -955,7 +955,7 @@ else
   echo "Updating files $H_CORE_FILE, $H_HDFS_FILE and $H_MAPRED_FILE ..."
 cat <<EOF >$H_ENV_FILE
 export HADOOP_COMMON_LIB_NATIVE_DIR=${MY_SW_ROOT}/hadoop/lib/native
-export HADOOP_OPTS="-Djava.library.path=$MY_SQ_ROOT/hadoop/lib"
+export HADOOP_OPTS="-Djava.library.path=$MY_SQROOT/hadoop/lib"
 EOF
 
   mv -f $H_CORE_FILE $H_CORE_FILE.orig

http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/fbb465ae/core/sqf/sql/scripts/sqsystem.pm
----------------------------------------------------------------------
diff --git a/core/sqf/sql/scripts/sqsystem.pm b/core/sqf/sql/scripts/sqsystem.pm
index 384fc35..b380b79 100755
--- a/core/sqf/sql/scripts/sqsystem.pm
+++ b/core/sqf/sql/scripts/sqsystem.pm
@@ -40,10 +40,10 @@ sub isProd
 
 sub isSingleNode
 {
-   my $SQ_ROOT = $ENV{'MY_SQROOT'};
+   my $MY_SQROOT = $ENV{'MY_SQROOT'};
 
    # Get the number of nodes in the instance
-   my $TempList = `grep 'node-name=.[^A-Za-z].[0-9]*' $SQ_ROOT/sql/scripts/sqconfig | grep -v "\#" | cut -d"=" -f3 | cut -d";" -f1 | sort -u`;
+   my $TempList = `grep 'node-name=.[^A-Za-z].[0-9]*' $MY_SQROOT/sql/scripts/sqconfig | grep -v "\#" | cut -d"=" -f3 | cut -d";" -f1 | sort -u`;
    if (!$TempList)
      {# Single-node development system
       return 1;  # true

http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/fbb465ae/core/sqf/sql/scripts/trafnodestatus
----------------------------------------------------------------------
diff --git a/core/sqf/sql/scripts/trafnodestatus b/core/sqf/sql/scripts/trafnodestatus
index f417471..f7e5956 100755
--- a/core/sqf/sql/scripts/trafnodestatus
+++ b/core/sqf/sql/scripts/trafnodestatus
@@ -89,7 +89,7 @@ if [[ ! -z ${SQ_VIRTUAL_NODES} ]]; then
     traf_exit 1
 fi
 
-grep_out_mon=`$SQ_ROOT/sql/scripts/cstat | grep "monitor COLD" `
+grep_out_mon=`$MY_SQROOT/sql/scripts/cstat | grep "monitor COLD" `
 lv_ret=$?
 if [[ $lv_ret == 0 ]]; then
     grep_out=`cstat | grep "monitor COLD" | grep -v mpirun | sort | cut -d: -f1`

http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/fbb465ae/core/sqf/src/tm/macros.gmk
----------------------------------------------------------------------
diff --git a/core/sqf/src/tm/macros.gmk b/core/sqf/src/tm/macros.gmk
index aff0226..95c735d 100644
--- a/core/sqf/src/tm/macros.gmk
+++ b/core/sqf/src/tm/macros.gmk
@@ -49,7 +49,7 @@ HBASETMLIB   =  $(MY_SQROOT)/src/seatrans/tm/hbasetmlib2
 LIBXARM		= -lxarm
 
 #log4cxx
-LIBCLOGGER = $(SQ_HOME)/commonLogger
+LIBCLOGGER = $(MY_SQROOT)/commonLogger
 
 # seabed
 SBROOT		= ..

http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/fbb465ae/docs/provisioning_guide/src/asciidoc/_chapters/introduction.adoc
----------------------------------------------------------------------
diff --git a/docs/provisioning_guide/src/asciidoc/_chapters/introduction.adoc b/docs/provisioning_guide/src/asciidoc/_chapters/introduction.adoc
index af2db61..08246c6 100644
--- a/docs/provisioning_guide/src/asciidoc/_chapters/introduction.adoc
+++ b/docs/provisioning_guide/src/asciidoc/_chapters/introduction.adoc
@@ -317,7 +317,7 @@ in the <<prepare,Prepare>> chapter, you record the following information.
 | RENEW_LIFETIME          | Kerberos ticket renewal lifetime for {project-name} principal                              | 7days
 | REST_BUILD              | Tar file containing the REST component.                                                    | 
 | SECURE_HADOOP           | Indicates whether Hadoop has Kerberos enabled                                               | Based on whether Kerberos is enabled for your Hadoop installation
-| SQ_ROOT                 | Target directory for the {project-name} software.                                               | /home/trafodion/apache-trafodion-1.3.0-incubating-bin
+| MY_SQROOT                 | Target directory for the {project-name} software.                                               | /home/trafodion/apache-trafodion-1.3.0-incubating-bin
 | START                   | Whether to start {project-name} after install/upgrade.                                          | Y
 | SUSE_LINUX              | Whether your installing {project-name} on SUSE Linux.                                           | false
 | TRAF_PACKAGE            | The location of the {project-name} installation package tar file or core installation tar file. | /home/centos/trafodion-download/apache-trafodion-1.3.0-incubating-bin.tar.gz
@@ -456,7 +456,7 @@ export HBASE="hbase"
 # 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/apache-trafodion-1.3.0-incubating-bin"
+export MY_SQROOT="/home/trafodion/apache-trafodion-1.3.0-incubating-bin"
 
 # Start Trafodion after install completes
 export START="Y"

http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/fbb465ae/docs/provisioning_guide/src/asciidoc/_chapters/prepare.adoc
----------------------------------------------------------------------
diff --git a/docs/provisioning_guide/src/asciidoc/_chapters/prepare.adoc b/docs/provisioning_guide/src/asciidoc/_chapters/prepare.adoc
index 93b23b3..bf8fb3c 100644
--- a/docs/provisioning_guide/src/asciidoc/_chapters/prepare.adoc
+++ b/docs/provisioning_guide/src/asciidoc/_chapters/prepare.adoc
@@ -177,7 +177,7 @@ distribution manager's REST API.
 | RENEW_LIFETIME^2^  | Number times Kerberos ticket is for the Trafodion principal    | 7days                         | Can be specified when Kerberos is enabled.   
 | REST_BUILD         | Tar file containing the REST component.                        | None | Not needed if using a {project-name} package installation tar file.
 | SECURE_HADOOP^2^   | Indicates whether Hadoop has enabled Kerberos                   | Y only if Kerberos enabled | Based on whether Kerberos is enabled for your Hadoop installation
-| SQ_ROOT            | Target directory for the {project-name} software.                   | $HOME_DIR/trafodion           | {project-name} is installed in this directory on all nodes in `$NODE_LIST`.
+| MY_SQROOT            | Target directory for the {project-name} software.                   | $HOME_DIR/trafodion           | {project-name} is installed in this directory on all nodes in `$NODE_LIST`.
 | START              | Whether to start {project-name} after install/upgrade.              | N                             | Does not apply to Recipe-Based Provisioning.
 | SUSE_LINUX         | Whether your installing {project-name} on SUSE Linux.               | false                         | Auto-detected by the {project-name} Installer.
 | TRAF_KEYTAB^2^     | Name to use when specifying {project-name} keytab              | based on distribution         |  Required if Kerberos is enabled.

http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/fbb465ae/docs/provisioning_guide/src/asciidoc/_chapters/script_upgrade.adoc
----------------------------------------------------------------------
diff --git a/docs/provisioning_guide/src/asciidoc/_chapters/script_upgrade.adoc b/docs/provisioning_guide/src/asciidoc/_chapters/script_upgrade.adoc
index 7eea1a7..0f1dd31 100644
--- a/docs/provisioning_guide/src/asciidoc/_chapters/script_upgrade.adoc
+++ b/docs/provisioning_guide/src/asciidoc/_chapters/script_upgrade.adoc
@@ -298,7 +298,7 @@ At a minimum, you need to change the following settings:
 
 * `LOCAL_WORKDIR`
 * `TRAF_PACKAGE`
-* `SQ_ROOT`
+* `MY_SQROOT`
 
 *Example*
 
@@ -309,7 +309,7 @@ $ # Pre edit content
 
 export LOCAL_WORKDIR="/home/centos/trafodion-installer/installer"
 export TRAF_PACKAGE="/home/centos/trafodion-download/apache-trafodion-1.3.0-incubating-bin.tar.gz"
-export SQ_ROOT="/home/trafodion/apache-trafodion-1.3.0-incubating-bin"
+export MY_SQROOT="/home/trafodion/apache-trafodion-1.3.0-incubating-bin"
 
 $ # Use your favorite editor to modify my_config_2.0
 $ emacs my_config_2.0
@@ -317,7 +317,7 @@ $ # Post edit changes
 
 export LOCAL_WORKDIR="/home/centos/trafodion-installer-2.0/installer"
 export TRAF_PACKAGE="/home/centos/trafodion-download/apache-trafodion-2.0.0-incubating-bin.tar.gz"
-export SQ_ROOT="/home/trafodion/apache-trafodion-2.0.0-incubating-bin"
+export MY_SQROOT="/home/trafodion/apache-trafodion-2.0.0-incubating-bin"
 ```
 
 

http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/fbb465ae/install/installer/addNode_step1
----------------------------------------------------------------------
diff --git a/install/installer/addNode_step1 b/install/installer/addNode_step1
index ce3ee52..99f4ad9 100755
--- a/install/installer/addNode_step1
+++ b/install/installer/addNode_step1
@@ -267,10 +267,10 @@ do
    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 sed -i -e "s/\<$oldNODENAME\>/$node/g" $MY_SQROOT/tmp/cluster.conf
+   sudo sed -i -e "s/\<$oldNODENAME\>/$node/g" $MY_SQROOT/sql/scripts/sqconfig
+   sudo rm -rf $MY_SQROOT/tmp/se*
+   sudo rm -rf $MY_SQROOT/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

http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/fbb465ae/install/installer/addNode_step2
----------------------------------------------------------------------
diff --git a/install/installer/addNode_step2 b/install/installer/addNode_step2
index 26ad9f1..20c20ee 100755
--- a/install/installer/addNode_step2
+++ b/install/installer/addNode_step2
@@ -181,11 +181,11 @@ echo "***IMPORTANT*** Ignore copy errors to new node."
 echo
 sleep 5
 
-sudo cp $SQ_ROOT/tmp/cluster.conf $PWD
+sudo cp $MY_SQROOT/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 cp $HOME/cluster.conf $MY_SQROOT/tmp/cluster.conf 2>&1 > /dev/null
+$TRAF_PDSH sudo chown $TRAF_USER.trafodion $MY_SQROOT/tmp/cluster.conf 2>&1 > /dev/null
 $TRAF_PDSH sudo rm $HOME/cluster.conf
 
 }
@@ -199,11 +199,11 @@ echo "***IMPORTANT*** Ignore copy errors to new node."
 echo
 sleep 5
 
-sudo cp -r $SQ_ROOT/sql/scripts/sqconfig $PWD
+sudo cp -r $MY_SQROOT/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 cp $HOME/sqconfig $MY_SQROOT/sql/scripts/sqconfig 2>&1 > /dev/null
+$TRAF_PDSH sudo chown $TRAF_USER.trafodion $MY_SQROOT/sql/scripts/sqconfig 2>&1 > /dev/null
 $TRAF_PDSH sudo rm $HOME/sqconfig
 
 
@@ -223,9 +223,9 @@ function editDCSServers {
 echo "***INFO: Create DCS servers file"
 
 source $TRAF_CONFIG
-DCS_DIR=$(sudo ls $SQ_ROOT | grep dcs\*)
+DCS_DIR=$(sudo ls $MY_SQROOT | grep dcs\*)
 
-sudo cp $SQ_ROOT/$DCS_DIR/conf/servers $PWD
+sudo cp $MY_SQROOT/$DCS_DIR/conf/servers $PWD
 sudo chown $(whoami).$(whoami) $PWD/servers
 
 let per_node=$DCS_SERVERS_PARM/$node_count
@@ -253,8 +253,8 @@ done
 
 
 $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
+$TRAF_PDSH sudo cp $HOME/tempServers $MY_SQROOT/$DCS_DIR/conf/servers
+$TRAF_PDSH sudo chown $TRAF_USER.trafodion $MY_SQROOT/$DCS_DIR/conf/servers
 
 
 
@@ -265,7 +265,7 @@ function editDCSBackUp {
 echo "***INFO: Create DCS Backup Master file"
 
 source $TRAF_CONFIG
-DCS_DIR=$(sudo ls $SQ_ROOT | grep dcs\*)
+DCS_DIR=$(sudo ls $MY_SQROOT | grep dcs\*)
 
 if [[ ! -z $NEW_BACKUP_DCS_NODES ]]; then
    for node_name in $BACKUP_DCS_NODES
@@ -274,8 +274,8 @@ if [[ ! -z $NEW_BACKUP_DCS_NODES ]]; then
    done
 
    $TRAF_PDCP $PWD/tempbackup $HOME
-   $TRAF_PDSH sudo cp $HOME/tempbackup $SQ_ROOT/$DCS_DIR/conf/backup-master
-   $TRAF_PDSH sudo chown $TRAF_USER.trafodion $SQ_ROOT/$DCS_DIR/conf/backup-master
+   $TRAF_PDSH sudo cp $HOME/tempbackup $MY_SQROOT/$DCS_DIR/conf/backup-master
+   $TRAF_PDSH sudo chown $TRAF_USER.trafodion $MY_SQROOT/$DCS_DIR/conf/backup-master
 
 fi
 }
@@ -294,7 +294,7 @@ $TRAF_NEW_PDSH sudo mkdir -p $HOME_DIR/$TRAF_USER/.ssh
 $TRAF_NEW_PDSH mkdir -p $HOME/tmpTraf
 sudo cp -r $HOME_DIR/$TRAF_USER/.bashrc $HOME/tmpTraf/.bashrc
 sudo cp -r $HOME_DIR/$TRAF_USER/.ssh $HOME/tmpTraf
-sudo cp -r $SQ_ROOT $HOME/tmpTraf
+sudo cp -r $MY_SQROOT $HOME/tmpTraf
 echo "***IMPORTANT: Keep waiting..."
 sudo chown -R $(whoami).$(whoami) $HOME/tmpTraf
 $TRAF_NEW_PDCP -r $HOME/tmpTraf $HOME

http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/fbb465ae/install/installer/bashrc_default
----------------------------------------------------------------------
diff --git a/install/installer/bashrc_default b/install/installer/bashrc_default
index 81eb9df..766296b 100755
--- a/install/installer/bashrc_default
+++ b/install/installer/bashrc_default
@@ -44,8 +44,7 @@ fi
 #-------------------------------------------
 # full path of your Trafodion installation
 #-------------------------------------------
-export SQ_HOME=XXXXXX
-export MY_SQROOT=$SQ_HOME
+export MY_SQROOT=XXXXXX
 
 #-------------------------------------------
 # other env vars needed by Trafodion

http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/fbb465ae/install/installer/dcs_installer
----------------------------------------------------------------------
diff --git a/install/installer/dcs_installer b/install/installer/dcs_installer
index 7033014..d6a3f40 100755
--- a/install/installer/dcs_installer
+++ b/install/installer/dcs_installer
@@ -131,8 +131,8 @@ mkdir -p $DCS_INSTALL_PATH
 cd $DCS_INSTALL_PATH
 
 if [[ "$ONE_TAR_INSTALL" == "Y" ]]; then
-   DCS_DIR=$(ls $SQ_ROOT | grep dcs)
-   DCS_DIR=$SQ_ROOT/$DCS_DIR
+   DCS_DIR=$(ls $MY_SQROOT | grep dcs)
+   DCS_DIR=$MY_SQROOT/$DCS_DIR
    echo "***INFO: DCS Install Directory: $DCS_DIR"
 else
    # untar DCS build into install directory
@@ -215,13 +215,13 @@ if [[ "$ENABLE_HA" == "true" ]]; then
   
    ######Configure trafci wrapper script to use Floating IP address
    newHName="HNAME=$FLOATING_IP:23400"
-   sed -i -e "s/HNAME=localhost:23400/$newHName/g" $SQ_ROOT/trafci/bin/trafci
+   sed -i -e "s/HNAME=localhost:23400/$newHName/g" $MY_SQROOT/trafci/bin/trafci
  
 else
 
    ######Configure trafci wrapper script
    newHName="HNAME=$DCS_PRIMARY_MASTER_NODE:23400"
-   sed -i -e "s/HNAME=localhost:23400/$newHName/g" $SQ_ROOT/trafci/bin/trafci
+   sed -i -e "s/HNAME=localhost:23400/$newHName/g" $MY_SQROOT/trafci/bin/trafci
 
 fi
 

http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/fbb465ae/install/installer/rest_installer
----------------------------------------------------------------------
diff --git a/install/installer/rest_installer b/install/installer/rest_installer
index 511d54c..1ce5208 100755
--- a/install/installer/rest_installer
+++ b/install/installer/rest_installer
@@ -94,8 +94,8 @@ mkdir -p $REST_INSTALL_PATH
 cd $REST_INSTALL_PATH
 
 if [[ "$ONE_TAR_INSTALL" == "Y" ]]; then
-   REST_DIR=$(ls $SQ_ROOT | grep rest)
-   REST_DIR=$SQ_ROOT/$REST_DIR
+   REST_DIR=$(ls $MY_SQROOT | grep rest)
+   REST_DIR=$MY_SQROOT/$REST_DIR
    echo "***INFO: Rest Install Directory: $REST_DIR"
 
 else

http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/fbb465ae/install/installer/traf_add_ldap
----------------------------------------------------------------------
diff --git a/install/installer/traf_add_ldap b/install/installer/traf_add_ldap
index 652326f..d0c8226 100755
--- a/install/installer/traf_add_ldap
+++ b/install/installer/traf_add_ldap
@@ -48,14 +48,14 @@ echo "***INFO: Copy $LDAP_AUTH_FILE to all nodes"
 if [[ "$all_node_count" -eq "1" ]]; then
   sudo cp -r $LOCAL_WORKDIR/$LDAP_AUTH_FILE $HOME_DIR/$TRAF_USER/$LDAP_AUTH_FILE
   sudo chown $TRAF_USER.$TRAF_GROUP $HOME_DIR/$TRAF_USER/$LDAP_AUTH_FILE
-  sudo su $TRAF_USER --command "cp $HOME_DIR/$TRAF_USER/$LDAP_AUTH_FILE $SQ_ROOT/sql/scripts/.traf_authentication_config" 2>&1 
-  sudo su $TRAF_USER --command "chmod 750 $SQ_ROOT/sql/scripts/.traf_authentication_config"
+  sudo su $TRAF_USER --command "cp $HOME_DIR/$TRAF_USER/$LDAP_AUTH_FILE $MY_SQROOT/sql/scripts/.traf_authentication_config" 2>&1 
+  sudo su $TRAF_USER --command "chmod 750 $MY_SQROOT/sql/scripts/.traf_authentication_config"
 else
   $TRAF_PDCP $LOCAL_WORKDIR/$LDAP_AUTH_FILE $HOME
   $TRAF_PDSH sudo cp $HOME/$LDAP_AUTH_FILE $HOME_DIR/$TRAF_USER/$LDAP_AUTH_FILE
   $TRAF_PDSH sudo chown $TRAF_USER:$TRAF_GROUP $HOME_DIR/$TRAF_USER/$LDAP_AUTH_FILE
-  sudo su $TRAF_USER --command "$TRAF_PDSH cp $HOME_DIR/$TRAF_USER/$LDAP_AUTH_FILE $SQ_ROOT/sql/scripts/.traf_authentication_config" 
-  sudo su $TRAF_USER --command "$TRAF_PDSH chmod 750 $SQ_ROOT/sql/scripts/.traf_authentication_config"
+  sudo su $TRAF_USER --command "$TRAF_PDSH cp $HOME_DIR/$TRAF_USER/$LDAP_AUTH_FILE $MY_SQROOT/sql/scripts/.traf_authentication_config" 
+  sudo su $TRAF_USER --command "$TRAF_PDSH chmod 750 $MY_SQROOT/sql/scripts/.traf_authentication_config"
 fi
   
 # Check traf_authentication_config for errors
@@ -81,7 +81,7 @@ fi
 
 # change and copy sqenvcom.sh
 echo "***INFO: Modifying sqenvcom.sh to turn on authentication"
-sudo cp -r $SQ_ROOT/sqenvcom.sh $LOCAL_WORKDIR/sqenvcom.sh
+sudo cp -r $MY_SQROOT/sqenvcom.sh $LOCAL_WORKDIR/sqenvcom.sh
 sudo chown $(whoami).$(whoami) $LOCAL_WORKDIR/sqenvcom.sh
 sed -i -e "s@TRAFODION_ENABLE_AUTHENTICATION=NO@TRAFODION_ENABLE_AUTHENTICATION=YES@g" $LOCAL_WORKDIR/sqenvcom.sh 
 sudo cp $LOCAL_WORKDIR/sqenvcom.sh $HOME_DIR/$TRAF_USER/sqenvcom.sh
@@ -89,9 +89,9 @@ sudo chown $TRAF_USER.$TRAF_GROUP $HOME_DIR/$TRAF_USER/sqenvcom.sh
 sudo chmod 664 $HOME_DIR/$TRAF_USER/sqenvcom.sh
 echo "***INFO: copying sqenvcom.sh to all nodes"
 if [[ "$all_node_count" -ne "1" ]]; then
-  sudo su $TRAF_USER --command "$TRAF_PDCP $HOME_DIR/$TRAF_USER/sqenvcom.sh $SQ_ROOT/sqenvcom.sh" 
+  sudo su $TRAF_USER --command "$TRAF_PDCP $HOME_DIR/$TRAF_USER/sqenvcom.sh $MY_SQROOT/sqenvcom.sh" 
 else
-  sudo cp $HOME_DIR/$TRAF_USER/sqenvcom.sh $SQ_ROOT/sqenvcom.sh 
+  sudo cp $HOME_DIR/$TRAF_USER/sqenvcom.sh $MY_SQROOT/sqenvcom.sh 
 fi
 rm $LOCAL_WORKDIR/sqenvcom.sh
 

http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/fbb465ae/install/installer/traf_config
----------------------------------------------------------------------
diff --git a/install/installer/traf_config b/install/installer/traf_config
index b5b2b85..74e68e8 100755
--- a/install/installer/traf_config
+++ b/install/installer/traf_config
@@ -67,8 +67,8 @@ fi
 
 #============================================
 # Create install directory
-mkdir -p $SQ_ROOT
-echo $SQ_ROOT
+mkdir -p $MY_SQROOT
+echo $MY_SQROOT
 
 if [[ "$UPGRADE_TRAF" == "true" ]]; then
    echo
@@ -83,17 +83,17 @@ fi
 
 if [[ -f $HOME/sqenvcom.sh ]]; then
    echo "****INFO: Copying over sqenvcom.sh"
-   cp -rf $HOME/sqenvcom.sh $SQ_ROOT
+   cp -rf $HOME/sqenvcom.sh $MY_SQROOT
 fi
 
-cd $SQ_ROOT
+cd $MY_SQROOT
 
 # untar Trafodion build into install directory
 if [[ "$ONE_TAR_INSTALL" == "N" ]]; then
-   echo "***INFO: untarring file $TRAF_BUILD to $SQ_ROOT" | tee -a $INSTALL_LOG
+   echo "***INFO: untarring file $TRAF_BUILD to $MY_SQROOT" | tee -a $INSTALL_LOG
    tar -xzf $TRAF_BUILD 2>&1 | tee -a $INSTALL_LOG
 else
-   echo "***INFO: untarring file $TRAF_BUILD to $SQ_ROOT" | tee -a $INSTALL_LOG
+   echo "***INFO: untarring file $TRAF_BUILD to $MY_SQROOT" | tee -a $INSTALL_LOG
    tar -xzf $UNTAR_DIR/$traf_filename 2>&1 | tee -a $INSTALL_LOG
 fi
 if [ "$?" != "0" ]; then
@@ -120,7 +120,7 @@ else
         fi
     else
         # For single node, we use the sqconfig in the build
-        SQCONFIG_MASTER=$SQ_ROOT/sql/scripts/sqconfig
+        SQCONFIG_MASTER=$MY_SQROOT/sql/scripts/sqconfig
          if [[ ! -f "$SQCONFIG_MASTER" ]]; then
            echo "***ERROR: SQ config file cannot be found ($SQCONFIG_MASTER)." | tee -a $INSTALL_LOG
            exit -1
@@ -133,8 +133,8 @@ echo "***INFO: modifying .bashrc to set Trafodion environment variables" | tee -
 cd $HOME
 cp .bashrc bashrc_temp
 # NOTE: have to use '@' as delimiter because the usual slash '/' doesn't work
-#       because $SQ_ROOT's value has slashes in it
-sed -e "s@export SQ_HOME=.*@export SQ_HOME=$SQ_ROOT@" <bashrc_temp >$HOME/.bashrc
+#       because $MY_SQROOT's value has slashes in it
+sed -e "s@export MY_SQROOT=.*@export MY_SQROOT=$MY_SQROOT@" <bashrc_temp >$HOME/.bashrc
 
 cp .bashrc bashrc_temp
 sed -e "s@export TOOLSDIR=.*@export TOOLSDIR=$TRAF_TOOLSDIR@" <bashrc_temp >$HOME/.bashrc
@@ -153,20 +153,20 @@ fi
 #==========================================
 
 if [ "$node_count" -ne "1" ]; then
-    echo "***INFO: copying sqconfig file ($SQCONFIG_MASTER) to $SQ_ROOT/sql/scripts/sqconfig" | tee -a $INSTALL_LOG
-    cp $SQCONFIG_MASTER $SQ_ROOT/sql/scripts/sqconfig
+    echo "***INFO: copying sqconfig file ($SQCONFIG_MASTER) to $MY_SQROOT/sql/scripts/sqconfig" | tee -a $INSTALL_LOG
+    cp $SQCONFIG_MASTER $MY_SQROOT/sql/scripts/sqconfig
 fi
 
-cd $SQ_ROOT
+cd $MY_SQROOT
 
 #=================================================
 
 if [ "$all_node_count" -ne "1" ]; then
-   echo "***INFO: Creating $SQ_ROOT directory on all nodes" | tee -a $INSTALL_LOG
-   $PDSH $ALL_NODES -x $HOSTNAME $PDSH_SSH_CMD mkdir -p $SQ_ROOT
+   echo "***INFO: Creating $MY_SQROOT directory on all nodes" | tee -a $INSTALL_LOG
+   $PDSH $ALL_NODES -x $HOSTNAME $PDSH_SSH_CMD mkdir -p $MY_SQROOT
    if [[ -f $HOME/sqenvcom.sh ]]; then
       echo "****INFO: Copying over sqenvcom.sh"
-      $PDCP $ALL_NODES $HOME/sqenvcom.sh $SQ_ROOT
+      $PDCP $ALL_NODES $HOME/sqenvcom.sh $MY_SQROOT
    fi
 fi
 

http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/fbb465ae/install/installer/traf_config_check
----------------------------------------------------------------------
diff --git a/install/installer/traf_config_check b/install/installer/traf_config_check
index f404f94..a270c45 100755
--- a/install/installer/traf_config_check
+++ b/install/installer/traf_config_check
@@ -856,10 +856,10 @@ fi
 
 function checkSQROOT {
 
-if [[ -z $SQ_ROOT ]]; then
+if [[ -z $MY_SQROOT ]]; then
    errorFound=1
    echo "SQ ROOT" >> $ERROR_LOG
-   echo "***ERROR: SQ_ROOT variable not set in config file" >> $ERROR_LOG
+   echo "***ERROR: MY_SQROOT variable not set in config file" >> $ERROR_LOG
 fi
 
 }

http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/fbb465ae/install/installer/traf_config_setup
----------------------------------------------------------------------
diff --git a/install/installer/traf_config_setup b/install/installer/traf_config_setup
index dd40644..d938b9d 100755
--- a/install/installer/traf_config_setup
+++ b/install/installer/traf_config_setup
@@ -58,7 +58,7 @@ HBASE_USER="hbase"
 HBASE_GROUP="hbase"
 ZOO_USER="zookeeper"
 
-SQ_ROOT=""
+MY_SQROOT=""
 INIT_TRAFODION="N"
 START="N"
 SQCONFIG=""
@@ -101,7 +101,7 @@ Inputs Requested:
 *HDFS username (default is [$HDFS_USER])
 *HBase username (default is [$HBASE_USER])
 *HBase group (default is [$HBASE_GROUP])
-*Full pathname to the install directory location (default [$SQ_ROOT])
+*Full pathname to the install directory location (default [$MY_SQROOT])
 *Full pathname to the DNS build tar file (default [$DCS_BUILD])
 *Start Trafodion after install (default is [No])
 *Total number of DCS servers to start
@@ -677,15 +677,15 @@ fi
 #Install location
 
 traf_filename=$(basename "$TRAF_PACKAGE")
-SQ_ROOT="$HOME_DIR/$TRAF_USER/${traf_filename%.tar.gz}"
+MY_SQROOT="$HOME_DIR/$TRAF_USER/${traf_filename%.tar.gz}"
 
-echo -n "Enter directory to install trafodion to, default is [$SQ_ROOT]: "
+echo -n "Enter directory to install trafodion to, default is [$MY_SQROOT]: "
 read answer
 
 if [ -z $answer ]; then
-   echo "export SQ_ROOT=\"$SQ_ROOT\"" >> $LOCAL_TRAF_CONFIG
+   echo "export MY_SQROOT=\"$MY_SQROOT\"" >> $LOCAL_TRAF_CONFIG
 else
-   echo "export SQ_ROOT=\"$answer\"" >> $LOCAL_TRAF_CONFIG
+   echo "export MY_SQROOT=\"$answer\"" >> $LOCAL_TRAF_CONFIG
 fi
 
 #==============================================

http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/fbb465ae/install/installer/traf_secure
----------------------------------------------------------------------
diff --git a/install/installer/traf_secure b/install/installer/traf_secure
index fa64163..fcbdd53 100755
--- a/install/installer/traf_secure
+++ b/install/installer/traf_secure
@@ -27,7 +27,7 @@ export TRAF_CONFIG=/etc/trafodion/trafodion_config
 
 source $TRAF_CONFIG
 
-rm $SQ_ROOT/logs/securityErrors.txt 2>/dev/null
+rm $MY_SQROOT/logs/securityErrors.txt 2>/dev/null
 
 if [[ "$all_node_count" -eq "1" ]]; then
     STARTING_NODE=$NODE_LIST
@@ -37,24 +37,24 @@ fi
 
 #==========================================
 
-echo "***INFO: Starting Trafodion instance, if not already started" | tee -a $SQ_ROOT/logs/securityErrors.txt
+echo "***INFO: Starting Trafodion instance, if not already started" | tee -a $MY_SQROOT/logs/securityErrors.txt
 
-ssh $STARTING_NODE "cd $SQ_ROOT/sql/scripts; sqstart"
+ssh $STARTING_NODE "cd $MY_SQROOT/sql/scripts; sqstart"
 SQSTART_RC=$?
 if [ "$SQSTART_RC" -ne "0" -a "$SQSTART_RC" -ne "1" ]; then
-    echo "***ERROR: sqstart failed with RC=$SQSTART_RC. Check $SQ_ROOT/sqmon.log file for details." | tee -a $SQ_ROOT/logs/securityErrors.txt
+    echo "***ERROR: sqstart failed with RC=$SQSTART_RC. Check $MY_SQROOT/sqmon.log file for details." | tee -a $MY_SQROOT/logs/securityErrors.txt
     exit -1;
 fi
 
 # Do initialize authorization and alter predefined users
-echo "***INFO: Initialize authorization and set up predefined users" | tee -a $SQ_ROOT/logs/securityErrors.txt
-ssh $STARTING_NODE "cd $SQ_ROOT/sql/scripts;  echo \"initialize authorization; alter user DB__ROOT set external name \"$DB_ROOT_NAME\";\" | sqlci" | tee -a $SQ_ROOT/logs/securityErrors.txt
-foundError=$(grep "ERROR" $SQ_ROOT/logs/securityErrors.txt | wc -l)
+echo "***INFO: Initialize authorization and set up predefined users" | tee -a $MY_SQROOT/logs/securityErrors.txt
+ssh $STARTING_NODE "cd $MY_SQROOT/sql/scripts;  echo \"initialize authorization; alter user DB__ROOT set external name \"$DB_ROOT_NAME\";\" | sqlci" | tee -a $MY_SQROOT/logs/securityErrors.txt
+foundError=$(grep "ERROR" $MY_SQROOT/logs/securityErrors.txt | wc -l)
 if [ "$foundError" -ge "1" ];then
-    echo "***ERROR: Security installation failed, continuing.  Check files $SQ_ROOT/logs/securityErrors.txt for details." | tee -a $SQ_ROOT/logs/securityErrors.txt
+    echo "***ERROR: Security installation failed, continuing.  Check files $MY_SQROOT/logs/securityErrors.txt for details." | tee -a $MY_SQROOT/logs/securityErrors.txt
 fi
 
-echo "***INFO: Please check the install log $SQ_ROOT/logs/securityErrors.txt for any issues" | tee -a $SQ_ROOT/logs/securityErrors.txt
+echo "***INFO: Please check the install log $MY_SQROOT/logs/securityErrors.txt for any issues" | tee -a $MY_SQROOT/logs/securityErrors.txt
 
 #==========================================
-echo "***INFO: Installation setup completed successfully." | tee -a $SQ_ROOT/logs/securityErrors.txt
+echo "***INFO: Installation setup completed successfully." | tee -a $MY_SQROOT/logs/securityErrors.txt

http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/fbb465ae/install/installer/traf_sqgen
----------------------------------------------------------------------
diff --git a/install/installer/traf_sqgen b/install/installer/traf_sqgen
index a922da8..fc311a8 100755
--- a/install/installer/traf_sqgen
+++ b/install/installer/traf_sqgen
@@ -28,14 +28,14 @@ STARTING_NODE=$(hostname)
 
 #==========================================
 echo "***INFO: starting sqgen" | tee -a $INSTALL_LOG
-cd $SQ_ROOT/sql/scripts
+cd $MY_SQROOT/sql/scripts
 
 #If sqconfig.db exists remove it and then sqgen can be run
-if [[ -e $SQ_ROOT/sql/scripts/sqconfig.db ]]; then
-   $TRAF_PDSH rm -rf $SQ_ROOT/sql/scripts/sqconfig.db
+if [[ -e $MY_SQROOT/sql/scripts/sqconfig.db ]]; then
+   $TRAF_PDSH rm -rf $MY_SQROOT/sql/scripts/sqconfig.db
 fi
 
-$SQ_ROOT/sql/scripts/sqgen
+$MY_SQROOT/sql/scripts/sqgen
 SQGEN_RC=$?
 if [ "$SQGEN_RC" != "0" ]; then
     echo "***ERROR: sqgen failed with RC=$SQGEN_RC. Check install log file for details." | tee -a $INSTALL_LOG
@@ -54,7 +54,7 @@ fi
 if [ "$all_node_count" -ne "1" ]; then
    
    echo "***INFO: copying install to all nodes" | tee -a $INSTALL_LOG
-   $PDCP $ALL_NODES -x $HOSTNAME -r $SQ_ROOT $SQ_ROOT/..
+   $PDCP $ALL_NODES -x $HOSTNAME -r $MY_SQROOT $MY_SQROOT/..
 
    if [ "$?" != "0" ]; then
       echo "***ERROR: Unable to copy Trafodion install to all machines in this cluster.  Check install log files for details." | tee -a $INSTALL_LOG

http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/fbb465ae/install/installer/traf_start
----------------------------------------------------------------------
diff --git a/install/installer/traf_start b/install/installer/traf_start
index 414ae29..06f2739 100755
--- a/install/installer/traf_start
+++ b/install/installer/traf_start
@@ -40,10 +40,10 @@ if [ "$START" == "N" ]; then
 else
     echo "***INFO: starting Trafodion instance" | tee -a $INSTALL_LOG
 
-    ssh $STARTING_NODE "cd $SQ_ROOT/sql/scripts; sqstart"
+    ssh $STARTING_NODE "cd $MY_SQROOT/sql/scripts; sqstart"
     SQSTART_RC=$?
     if [ "$SQSTART_RC" != "0" ]; then
-        echo "***ERROR: sqstart failed with RC=$SQSTART_RC. Check $SQ_ROOT/sqmon.log file for details." | tee -a $INSTALL_LOG
+        echo "***ERROR: sqstart failed with RC=$SQSTART_RC. Check $MY_SQROOT/sqmon.log file for details." | tee -a $INSTALL_LOG
         exit -1;
     fi
 
@@ -54,17 +54,17 @@ else
        echo "***INFO: Trafodion is initializing...this will take a few minutes."
        echo
        echo
-       ssh $STARTING_NODE "cd $SQ_ROOT/sql/scripts;  echo \"initialize Trafodion;\" | sqlci" | tee -a $SQ_ROOT/initializeErrors.txt
-       error1392=$(grep "1392" $SQ_ROOT/initializeErrors.txt | wc -l)
-       error1395=$(grep "1395" $SQ_ROOT/initializeErrors.txt | wc -l)
+       ssh $STARTING_NODE "cd $MY_SQROOT/sql/scripts;  echo \"initialize Trafodion;\" | sqlci" | tee -a $MY_SQROOT/initializeErrors.txt
+       error1392=$(grep "1392" $MY_SQROOT/initializeErrors.txt | wc -l)
+       error1395=$(grep "1395" $MY_SQROOT/initializeErrors.txt | wc -l)
        if [ "$error1395" -ge "1" ] || [ "$error1392" -ge "1" ]; then
-           ssh $STARTING_NODE "cd $SQ_ROOT/sql/scripts;  echo \"get version of metadata;\" | sqlci" | tee $SQ_ROOT/initializeErrors.txt
-           metadataCurrent=$(grep "Metadata is current" $SQ_ROOT/initializeErrors.txt | wc -l)
+           ssh $STARTING_NODE "cd $MY_SQROOT/sql/scripts;  echo \"get version of metadata;\" | sqlci" | tee $MY_SQROOT/initializeErrors.txt
+           metadataCurrent=$(grep "Metadata is current" $MY_SQROOT/initializeErrors.txt | wc -l)
            if [[ "$metadataCurrent" -ne "1" ]]; then
-              ssh $STARTING_NODE "cd $SQ_ROOT/sql/scripts;  echo \"initialize Trafodion, upgrade;\" | sqlci" | tee $SQ_ROOT/initializeErrors.txt
+              ssh $STARTING_NODE "cd $MY_SQROOT/sql/scripts;  echo \"initialize Trafodion, upgrade;\" | sqlci" | tee $MY_SQROOT/initializeErrors.txt
            fi
        fi
-       anyError=$(grep "ERROR" $SQ_ROOT/initializeErrors.txt | wc -l)
+       anyError=$(grep "ERROR" $MY_SQROOT/initializeErrors.txt | wc -l)
        if [[ "$anyError" != "0" ]]; then
            echo "***ERROR: initialize Trafodion failed.  Check install log files for details." | tee -a $INSTALL_LOG
            exit -1;

http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/fbb465ae/install/installer/trafodion_config_default
----------------------------------------------------------------------
diff --git a/install/installer/trafodion_config_default b/install/installer/trafodion_config_default
index ad99d5f..6f67491 100755
--- a/install/installer/trafodion_config_default
+++ b/install/installer/trafodion_config_default
@@ -110,7 +110,7 @@ export HBASE="hbase"
 # 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="/opt/trafodion/trafodion"
+export MY_SQROOT="/opt/trafodion/trafodion"
 
 # Start Trafodion after install completes
 export START="Y"

http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/fbb465ae/install/installer/trafodion_install
----------------------------------------------------------------------
diff --git a/install/installer/trafodion_install b/install/installer/trafodion_install
index 5177660..6590b66 100755
--- a/install/installer/trafodion_install
+++ b/install/installer/trafodion_install
@@ -307,7 +307,7 @@ userForTrafodion=`grep "$TRAF_USER:" /etc/passwd | wc -l`
 
 if [[ "$userForTrafodion" != "0" ]]; then
 
-   if [[ -e $SQ_ROOT/sql/scripts/sqcheck ]]; then
+   if [[ -e $MY_SQROOT/sql/scripts/sqcheck ]]; then
 
       isTrafUp=$(sudo su $TRAF_USER --login --command "sqcheck" 2>/dev/null)
       returnCode=$?
@@ -736,8 +736,8 @@ echo "******************************"
 echo " TRAFODION CONFIGURATION"
 echo "******************************"
 echo
-sudo mkdir -p $SQ_ROOT
-sudo chown $TRAF_USER.trafodion $SQ_ROOT
+sudo mkdir -p $MY_SQROOT
+sudo chown $TRAF_USER.trafodion $MY_SQROOT
 /bin/cp -rf $LOCAL_WORKDIR/traf_config $TRAF_WORKDIR/installer/traf_config
 
 sudo su $TRAF_USER --login --command "$TRAF_WORKDIR/installer/traf_config" 2>&1 | tee -a $INSTALL_LOG

http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/fbb465ae/install/installer/trafodion_uninstaller
----------------------------------------------------------------------
diff --git a/install/installer/trafodion_uninstaller b/install/installer/trafodion_uninstaller
index 553cacd..6eaabf0 100755
--- a/install/installer/trafodion_uninstaller
+++ b/install/installer/trafodion_uninstaller
@@ -110,9 +110,9 @@ if [[ "$SECURE_HADOOP" == "Y" ]]; then
 
    echo "***INFO: Stopping Kerberos ticket monitoring process"
    if [ $all_node_count -eq 1 ]; then
-      sudo su $TRAF_USER --login --command "$SQ_ROOT/sql/scripts/krb5service stop 2>/dev/null"
+      sudo su $TRAF_USER --login --command "$MY_SQROOT/sql/scripts/krb5service stop 2>/dev/null"
    else
-      $TRAF_PDSH "sudo su $TRAF_USER --login --command \"$SQ_ROOT/sql/scripts/krb5service stop 2>/dev/null\""
+      $TRAF_PDSH "sudo su $TRAF_USER --login --command \"$MY_SQROOT/sql/scripts/krb5service stop 2>/dev/null\""
    fi 
 fi
    
@@ -139,8 +139,8 @@ $TRAF_PDSH sudo rm -rf $LOCAL_WORKDIR/$TRAF_USER
 $TRAF_PDSH sudo /usr/sbin/userdel --force --remove $TRAF_USER
 $TRAF_PDSH sudo /usr/sbin/groupdel $TRAF_GROUP 2>/dev/null
 
-echo "***INFO: removing all files from $SQ_ROOT"
-$TRAF_PDSH sudo rm -rf $SQ_ROOT
+echo "***INFO: removing all files from $MY_SQROOT"
+$TRAF_PDSH sudo rm -rf $MY_SQROOT
  
 echo "***INFO: removing all files from /usr/lib/trafodion and /var/log/trafodion"
 $TRAF_PDSH sudo rm -rf /usr/lib/trafodion*

http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/fbb465ae/install/python-installer/bashrc.template
----------------------------------------------------------------------
diff --git a/install/python-installer/bashrc.template b/install/python-installer/bashrc.template
index d820285..4f1b798 100644
--- a/install/python-installer/bashrc.template
+++ b/install/python-installer/bashrc.template
@@ -36,15 +36,14 @@ cd $HOME
 #-------------------------------------------
 # full path of your Trafodion installation
 #-------------------------------------------
-export JAVA_HOME="{{ java_home }}"
-export SQ_HOME="{{ sq_home }}"
-export MY_SQROOT=$SQ_HOME
+export MY_SQROOT="{{ my_sqroot }}"
 
 #-------------------------------------------
 # other env vars needed by Trafodion
 #-------------------------------------------
 
 # These env vars define all nodes in the cluster
+export JAVA_HOME="{{ java_home }}"
 export NODE_LIST="{{ node_list }}"
 export MY_NODES="{{ my_nodes }}"
 export node_count="{{ node_count }}"

http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/fbb465ae/install/python-installer/dcs_setup.py
----------------------------------------------------------------------
diff --git a/install/python-installer/dcs_setup.py b/install/python-installer/dcs_setup.py
index 818a933..c3d1a9a 100755
--- a/install/python-installer/dcs_setup.py
+++ b/install/python-installer/dcs_setup.py
@@ -31,22 +31,22 @@ from common import ParseXML, append_file, write_file, mod_file, cmd_output, run_
 def run():
     dbcfgs = json.loads(dbcfgs_json)
 
-    SQ_ROOT = os.environ['MY_SQROOT']
+    MY_SQROOT = os.environ['MY_SQROOT']
     TRAF_VER = dbcfgs['traf_version']
     HBASE_XML_FILE = dbcfgs['hbase_xml_file']
 
-    DCS_INSTALL_ENV = 'export DCS_INSTALL_DIR=%s/dcs-%s' % (SQ_ROOT, TRAF_VER)
-    REST_INSTALL_ENV = 'export REST_INSTALL_DIR=%s/rest-%s' % (SQ_ROOT, TRAF_VER)
+    DCS_INSTALL_ENV = 'export DCS_INSTALL_DIR=%s/dcs-%s' % (MY_SQROOT, TRAF_VER)
+    REST_INSTALL_ENV = 'export REST_INSTALL_DIR=%s/rest-%s' % (MY_SQROOT, TRAF_VER)
 
-    DCS_CONF_DIR = '%s/dcs-%s/conf' % (SQ_ROOT, TRAF_VER)
+    DCS_CONF_DIR = '%s/dcs-%s/conf' % (MY_SQROOT, TRAF_VER)
     DCS_SRV_FILE = DCS_CONF_DIR + '/servers'
     DCS_MASTER_FILE = DCS_CONF_DIR + '/master'
     DCS_BKMASTER_FILE = DCS_CONF_DIR + '/backup-masters'
     DCS_ENV_FILE = DCS_CONF_DIR + '/dcs-env.sh'
     DCS_SITE_FILE = DCS_CONF_DIR + '/dcs-site.xml'
-    REST_SITE_FILE = '%s/rest-%s/conf/rest-site.xml' % (SQ_ROOT, TRAF_VER)
-    TRAFCI_FILE = SQ_ROOT + '/trafci/bin/trafci'
-    SQENV_FILE = SQ_ROOT + '/sqenvcom.sh'
+    REST_SITE_FILE = '%s/rest-%s/conf/rest-site.xml' % (MY_SQROOT, TRAF_VER)
+    TRAFCI_FILE = MY_SQROOT + '/trafci/bin/trafci'
+    SQENV_FILE = MY_SQROOT + '/sqenvcom.sh'
 
     ### dcs setting ###
     # servers

http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/fbb465ae/install/python-installer/traf_ldap.py
----------------------------------------------------------------------
diff --git a/install/python-installer/traf_ldap.py b/install/python-installer/traf_ldap.py
index 8cd4b7f..bf9fbd5 100755
--- a/install/python-installer/traf_ldap.py
+++ b/install/python-installer/traf_ldap.py
@@ -33,9 +33,9 @@ def run():
     dbcfgs = json.loads(dbcfgs_json)
 
     DB_ROOT_USER = dbcfgs['db_root_user']
-    SQ_ROOT = os.environ['MY_SQROOT']
-    SQENV_FILE = SQ_ROOT + '/sqenvcom.sh'
-    TRAF_AUTH_CONFIG = '%s/sql/scripts/.traf_authentication_config' % SQ_ROOT
+    MY_SQROOT = os.environ['MY_SQROOT']
+    SQENV_FILE = MY_SQROOT + '/sqenvcom.sh'
+    TRAF_AUTH_CONFIG = '%s/sql/scripts/.traf_authentication_config' % MY_SQROOT
     TRAF_AUTH_TEMPLATE = '%s/traf_authentication_conf.template' % TMP_DIR
 
     # set traf_authentication_config file

http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/fbb465ae/install/python-installer/traf_setup.py
----------------------------------------------------------------------
diff --git a/install/python-installer/traf_setup.py b/install/python-installer/traf_setup.py
index 91d0faa..828f78b 100755
--- a/install/python-installer/traf_setup.py
+++ b/install/python-installer/traf_setup.py
@@ -34,11 +34,11 @@ def run():
 
     TRAF_HOME = cmd_output('cat /etc/default/useradd |grep HOME |cut -d "=" -f 2').strip()
     TRAF_USER = dbcfgs['traf_user']
-    SQ_ROOT = '%s/%s/%s-%s' % (TRAF_HOME, TRAF_USER, dbcfgs['traf_basename'], dbcfgs['traf_version'])
+    MY_SQROOT = '%s/%s/%s-%s' % (TRAF_HOME, TRAF_USER, dbcfgs['traf_basename'], dbcfgs['traf_version'])
 
     TRAF_VER = dbcfgs['traf_version']
     DISTRO = dbcfgs['distro']
-    TRAF_LIB_PATH = SQ_ROOT + '/export/lib'
+    TRAF_LIB_PATH = MY_SQROOT + '/export/lib'
     SCRATCH_LOCS = dbcfgs['scratch_locs'].split(',')
 
     SUDOER_FILE = '/etc/sudoers.d/trafodion'

http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/fbb465ae/install/python-installer/traf_sqconfig.py
----------------------------------------------------------------------
diff --git a/install/python-installer/traf_sqconfig.py b/install/python-installer/traf_sqconfig.py
index b329155..8da6377 100755
--- a/install/python-installer/traf_sqconfig.py
+++ b/install/python-installer/traf_sqconfig.py
@@ -35,9 +35,9 @@ def run():
     scratch_locs = dbcfgs['scratch_locs'].split(',')
 
     # this script is running by trafodion user, so get sqroot from env
-    sq_root = os.environ['MY_SQROOT']
-    if sq_root == '': err('SQ_ROOT var is empty')
-    sqconfig_file = sq_root + '/sql/scripts/sqconfig'
+    MY_SQROOT = os.environ['MY_SQROOT']
+    if MY_SQROOT == '': err('MY_SQROOT var is empty')
+    sqconfig_file = MY_SQROOT + '/sql/scripts/sqconfig'
 
     core, processor = run_cmd("lscpu|grep -E '(^CPU\(s\)|^Socket\(s\))'|awk '{print $2}'").split('\n')[:2]
     core = int(core)-1 if int(core) <= 256 else 255

http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/fbb465ae/install/python-installer/traf_user.py
----------------------------------------------------------------------
diff --git a/install/python-installer/traf_user.py b/install/python-installer/traf_user.py
index 28e2c81..01c1c50 100755
--- a/install/python-installer/traf_user.py
+++ b/install/python-installer/traf_user.py
@@ -45,7 +45,7 @@ def run():
     TRAF_GROUP = TRAF_USER
     TRAF_HOME = cmd_output('cat /etc/default/useradd |grep HOME |cut -d "=" -f 2').strip()
     TRAF_USER_DIR = '%s/%s' % (TRAF_HOME, TRAF_USER)
-    SQ_ROOT = '%s/%s-%s' % (TRAF_USER_DIR, dbcfgs['traf_basename'], dbcfgs['traf_version'])
+    MY_SQROOT = '%s/%s-%s' % (TRAF_USER_DIR, dbcfgs['traf_basename'], dbcfgs['traf_version'])
 
     KEY_FILE = '/tmp/id_rsa'
     AUTH_KEY_FILE = '%s/.ssh/authorized_keys' % TRAF_USER_DIR
@@ -84,7 +84,7 @@ def run():
     nodes = dbcfgs['node_list'].split(',')
     change_items = {
         '{{ java_home }}': dbcfgs['java_home'],
-        '{{ sq_home }}': SQ_ROOT,
+        '{{ my_sqroot }}': MY_SQROOT,
         '{{ hadoop_type }}': hadoop_type,
         '{{ node_list }}': ' '.join(nodes),
         '{{ node_count }}': str(len(nodes)),


Mime
View raw message