You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@trafodion.apache.org by li...@apache.org on 2016/12/15 08:51:25 UTC
[03/10] incubator-trafodion git commit: convert all MY_SQROOT to
TRAF_HOME
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/0d467cad/core/sql/ustat/hs_globals.cpp
----------------------------------------------------------------------
diff --git a/core/sql/ustat/hs_globals.cpp b/core/sql/ustat/hs_globals.cpp
index cbfb860..ba33e2a 100644
--- a/core/sql/ustat/hs_globals.cpp
+++ b/core/sql/ustat/hs_globals.cpp
@@ -3594,7 +3594,7 @@ NABoolean HSGlobalsClass::isAuthorized(NABoolean isShowStats)
// the fully-qualified table names.
void HSGlobalsClass::initJITLogData()
{
- char* sqroot = getenv("MY_SQROOT");
+ char* sqroot = getenv("TRAF_HOME");
if (!sqroot)
return;
@@ -3665,7 +3665,7 @@ void HSGlobalsClass::startJitLogging(const char* checkPointName, Int64 elapsedSe
XPROCESSHANDLE_DECOMPOSE_(&procHandle, &nodeNum, &pin);
NAString filePath;
- char* sqroot = getenv("MY_SQROOT");
+ char* sqroot = getenv("TRAF_HOME");
if (sqroot)
{
filePath = sqroot;
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/0d467cad/core/sql/ustat/stats_profile
----------------------------------------------------------------------
diff --git a/core/sql/ustat/stats_profile b/core/sql/ustat/stats_profile
index 3a93964..a385622 100644
--- a/core/sql/ustat/stats_profile
+++ b/core/sql/ustat/stats_profile
@@ -112,10 +112,10 @@ elif [ $LINUX -ne 1 ]; then
MXCI=sqlci
else
# SQ
- LOG=$MY_SQROOT/tmp/USTATS_PROFILE_LOG
- LOADFILE=$MY_SQROOT/tmp/USTATS_PROFILE_LOAD
+ LOG=$TRAF_HOME/tmp/USTATS_PROFILE_LOG
+ LOADFILE=$TRAF_HOME/tmp/USTATS_PROFILE_LOAD
export SQLMX_TERMINAL_CHARSET=UTF8
- MXCI=$MY_SQROOT/export/bin32/sqlci
+ MXCI=$TRAF_HOME/export/bin32/sqlci
fi
# start logging
@@ -238,7 +238,7 @@ if [[ $RUN = TRUE ]]; then
STARTTIME=`date`
if [ $LINUX -eq 1 ]; then
- sh $MY_SQROOT/export/lib/mx_ustat/USAS.sh;
+ sh $TRAF_HOME/export/lib/mx_ustat/USAS.sh;
elif [[ $mxcidir != "" ]]; then
$mxcidir/USAS.sh;
else
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/0d467cad/dcs/Makefile
----------------------------------------------------------------------
diff --git a/dcs/Makefile b/dcs/Makefile
index 93398ea..76c64b9 100644
--- a/dcs/Makefile
+++ b/dcs/Makefile
@@ -40,7 +40,7 @@ build_all: build_chk
build_chk:
$(GENVERS) > $(VFILE)
@if [ $(GENVERS) -nt target/$(BLD_TRAFODION_DCS_TARNAME) ]; then echo "update manifest"; $(RM) -f target/$(BLD_TRAFODION_DCS_TARNAME); fi
- @if [ $(MY_SQROOT)/export/include/SCMBuildStr.h -nt target/$(BLD_TRAFODION_DCS_TARNAME) ]; then echo "update manifest"; $(RM) -f target/$(BLD_TRAFODION_DCS_TARNAME); fi
+ @if [ $(TRAF_HOME)/export/include/SCMBuildStr.h -nt target/$(BLD_TRAFODION_DCS_TARNAME) ]; then echo "update manifest"; $(RM) -f target/$(BLD_TRAFODION_DCS_TARNAME); fi
clean:
-$(MAVEN) clean | grep ERROR
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/0d467cad/dcs/bin/dcs
----------------------------------------------------------------------
diff --git a/dcs/bin/dcs b/dcs/bin/dcs
index 84246d0..1c91600 100755
--- a/dcs/bin/dcs
+++ b/dcs/bin/dcs
@@ -112,8 +112,8 @@ IFS=
# CLASSPATH initially contains $DCS_CONF_DIR
CLASSPATH="${DCS_CONF_DIR}"
-if [ "$MY_SQROOT" != "" ]; then
- CLASSPATH=${CLASSPATH}:${MY_SQROOT}/export/lib/jdbcT2.jar
+if [ "$TRAF_HOME" != "" ]; then
+ CLASSPATH=${CLASSPATH}:${TRAF_HOME}/export/lib/jdbcT2.jar
fi
CLASSPATH=${CLASSPATH}:$JAVA_HOME/lib/tools.jar
@@ -192,9 +192,9 @@ function append_path() {
JAVA_PLATFORM=""
#If avail, add Trafodion to the JAVA_LIBRARY_PATH
-if [ "$MY_SQROOT" != "" ]; then
- if [ -d $MY_SQROOT ]; then
- export LD_PRELOAD=$JAVA_HOME/jre/lib/amd64/libjsig.so:$MY_SQROOT/export/lib$SQ_MBTYPE/libseabasesig.so;
+if [ "$TRAF_HOME" != "" ]; then
+ if [ -d $TRAF_HOME ]; then
+ export LD_PRELOAD=$JAVA_HOME/jre/lib/amd64/libjsig.so:$TRAF_HOME/export/lib$SQ_MBTYPE/libseabasesig.so;
fi
fi
@@ -277,7 +277,7 @@ if [ "x$JAVA_LIBRARY_PATH" != "x" ]; then
fi
DCS_OPTS="$DCS_OPTS -Ddcs.user.program.home=$DCS_USER_PROGRAM_HOME"
DCS_OPTS="$DCS_OPTS -Ddcs.conf.dir=$DCS_CONF_DIR"
-DCS_OPTS="$DCS_OPTS -Ddcs.trafodion.home=$MY_SQROOT"
+DCS_OPTS="$DCS_OPTS -Ddcs.trafodion.home=$TRAF_HOME"
# Exec unless DCS_NOEXEC is set.
if [ "${DCS_NOEXEC}" != "" ]; then
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/0d467cad/dcs/bin/dcs-config.sh
----------------------------------------------------------------------
diff --git a/dcs/bin/dcs-config.sh b/dcs/bin/dcs-config.sh
index aec9e57..bff96fa 100755
--- a/dcs/bin/dcs-config.sh
+++ b/dcs/bin/dcs-config.sh
@@ -84,9 +84,9 @@ if [ -f "${DCS_CONF_DIR}/dcs-env.sh" ]; then
fi
# Source in sqenv.sh.
-if [ -f "${MY_SQROOT}/sqenv.sh" ]; then
+if [ -f "${TRAF_HOME}/sqenv.sh" ]; then
savedir=`pwd`
- cd $MY_SQROOT
+ cd $TRAF_HOME
. sqenv.sh
cd $savedir
fi
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/0d467cad/dcs/conf/dcs-env.sh
----------------------------------------------------------------------
diff --git a/dcs/conf/dcs-env.sh b/dcs/conf/dcs-env.sh
index ed62636..0365fac 100644
--- a/dcs/conf/dcs-env.sh
+++ b/dcs/conf/dcs-env.sh
@@ -31,8 +31,8 @@
# export JAVA_HOME=/usr/java/jdk1.7.0/
# Add Trafodion to the classpath
-if [ "$MY_SQROOT" != "" ]; then
- if [ -d $MY_SQROOT ]; then
+if [ "$TRAF_HOME" != "" ]; then
+ if [ -d $TRAF_HOME ]; then
export DCS_CLASSPATH=${CLASSPATH}:
fi
fi
@@ -110,4 +110,4 @@ export DCS_OPTS="-XX:+UseConcMarkSweepGC"
# export DCS_MANAGES_ZK=true
# Tell DCS where the user program environment lives.
- export DCS_USER_PROGRAM_HOME=$MY_SQROOT
+ export DCS_USER_PROGRAM_HOME=$TRAF_HOME
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/0d467cad/dcs/genvers
----------------------------------------------------------------------
diff --git a/dcs/genvers b/dcs/genvers
index d2bc305..75d2b55 100755
--- a/dcs/genvers
+++ b/dcs/genvers
@@ -21,4 +21,4 @@
# @@@ END COPYRIGHT @@@
CV_VERS=1.0.1
-$MY_SQROOT/export/include/SCMBuildJava.sh $CV_VERS
+$TRAF_HOME/export/include/SCMBuildJava.sh $CV_VERS
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/0d467cad/dcs/src/main/asciidoc/_chapters/configuration.adoc
----------------------------------------------------------------------
diff --git a/dcs/src/main/asciidoc/_chapters/configuration.adoc b/dcs/src/main/asciidoc/_chapters/configuration.adoc
index bdb8294..39180c6 100644
--- a/dcs/src/main/asciidoc/_chapters/configuration.adoc
+++ b/dcs/src/main/asciidoc/_chapters/configuration.adoc
@@ -142,7 +142,7 @@ See section <<zookeeper,Zookeeper>> for ZooKeeper setup for DCS.
=== Running and Confirming Your Installation
Make sure Trafodion is running first. Start and stop the Trafodion instance by running _sqstart.sh_ over in the
-`MY_SQROOT/sql/scripts` directory. You can ensure it started properly by testing with _sqcheck_.
+`TRAF_HOME/sql/scripts` directory. You can ensure it started properly by testing with _sqcheck_.
If you are managing your own ZooKeeper, start it and confirm its running else, DCS will start up ZooKeeper
for you as part of its start process.
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/0d467cad/dcs/src/main/asciidoc/_chapters/getting_started.adoc
----------------------------------------------------------------------
diff --git a/dcs/src/main/asciidoc/_chapters/getting_started.adoc b/dcs/src/main/asciidoc/_chapters/getting_started.adoc
index f98a53b..405097c 100644
--- a/dcs/src/main/asciidoc/_chapters/getting_started.adoc
+++ b/dcs/src/main/asciidoc/_chapters/getting_started.adoc
@@ -59,7 +59,7 @@ Install _java_, edit _conf/dcs-env.sh_, uncommenting the `JAVA_HOME` line pointi
Is _Trafodion_ installed and running?
DCS presumes a _Trafodion_ instance is installed and running on your machine and available on your path; i.e. the
-`MY_SQROOT` is set and when you type _sqcheck_, you see output that confirms _Trafodion_ is running. If this is not
+`TRAF_HOME` is set and when you type _sqcheck_, you see output that confirms _Trafodion_ is running. If this is not
the case, DCS may start but you'll see many errors in the DcsServer logs related to user program startup.
At this point, you are ready to start DCS.
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/0d467cad/dcs/src/main/java/org/trafodion/dcs/server/ServerManager.java
----------------------------------------------------------------------
diff --git a/dcs/src/main/java/org/trafodion/dcs/server/ServerManager.java b/dcs/src/main/java/org/trafodion/dcs/server/ServerManager.java
index 3a65662..e44360f 100644
--- a/dcs/src/main/java/org/trafodion/dcs/server/ServerManager.java
+++ b/dcs/src/main/java/org/trafodion/dcs/server/ServerManager.java
@@ -491,7 +491,7 @@ public final class ServerManager implements Callable {
+ Constants.DCS_SERVER_USER_PROGRAM
+ " is false. "
+ "Please add to your dcs-site.xml file and set <value>false</value> to <value>true</value>.";
- final String msg2 = "Environment variable $MY_SQROOT is not set.";
+ final String msg2 = "Environment variable $TRAF_HOME is not set.";
boolean ready = false;
while (!ready) {
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/0d467cad/dcs/src/main/java/org/trafodion/dcs/servermt/ServerManager.java
----------------------------------------------------------------------
diff --git a/dcs/src/main/java/org/trafodion/dcs/servermt/ServerManager.java b/dcs/src/main/java/org/trafodion/dcs/servermt/ServerManager.java
index 8a45c07..5e9babf 100644
--- a/dcs/src/main/java/org/trafodion/dcs/servermt/ServerManager.java
+++ b/dcs/src/main/java/org/trafodion/dcs/servermt/ServerManager.java
@@ -91,7 +91,7 @@ public final class ServerManager implements Callable {
private String CLUSTERNAME;
private String HOME;
- private String MY_SQROOT;
+ private String TRAF_HOME;
private byte[] cert;
private String key;
private Integer data;
@@ -218,21 +218,21 @@ public final class ServerManager implements Callable {
}
private void featureCheck() throws IOException{
- String value = System.getenv("MY_SQROOT");
+ String value = System.getenv("TRAF_HOME");
if(value == null || value.length() == 0 ) {
- LOG.error("Environment variable $MY_SQROOT is not set.");
- throw new IOException("Environment variable $MY_SQROOT is not set.");
+ LOG.error("Environment variable $TRAF_HOME is not set.");
+ throw new IOException("Environment variable $TRAF_HOME is not set.");
}
- MY_SQROOT = value;
+ TRAF_HOME = value;
if(LOG.isDebugEnabled())
- LOG.info("Environment variable $MY_SQROOT is set [" + MY_SQROOT + "]");
+ LOG.info("Environment variable $TRAF_HOME is set [" + TRAF_HOME + "]");
}
private void getCertificate() throws IOException {
String path;
CLUSTERNAME = System.getenv("CLUSTERNAME");
if(CLUSTERNAME == null || CLUSTERNAME.length() == 0 ) {
- path = MY_SQROOT + "/sqcert/server.crt";
+ path = TRAF_HOME + "/sqcert/server.crt";
}
else {
HOME = System.getenv("HOME");
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/0d467cad/docs/provisioning_guide/src/asciidoc/_chapters/activate.adoc
----------------------------------------------------------------------
diff --git a/docs/provisioning_guide/src/asciidoc/_chapters/activate.adoc b/docs/provisioning_guide/src/asciidoc/_chapters/activate.adoc
index 1803045..1cc092c 100644
--- a/docs/provisioning_guide/src/asciidoc/_chapters/activate.adoc
+++ b/docs/provisioning_guide/src/asciidoc/_chapters/activate.adoc
@@ -46,7 +46,7 @@ The following table provides an overview of the different {project-name} managem
*Example: Start {project-name}*
```
-cd $MY_SQROOT/sql/scripts
+cd $TRAF_HOME/sql/scripts
sqstart
sqcheck
```
@@ -145,4 +145,4 @@ If processes are not running as expected, then:
If problems persist please review logs:
-* `$MY_SQROOT/logs`: {project-name} logs.
+* `$TRAF_HOME/logs`: {project-name} logs.
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/0d467cad/docs/provisioning_guide/src/asciidoc/_chapters/enable_security.adoc
----------------------------------------------------------------------
diff --git a/docs/provisioning_guide/src/asciidoc/_chapters/enable_security.adoc b/docs/provisioning_guide/src/asciidoc/_chapters/enable_security.adoc
index eb58b7d..7ce495f 100644
--- a/docs/provisioning_guide/src/asciidoc/_chapters/enable_security.adoc
+++ b/docs/provisioning_guide/src/asciidoc/_chapters/enable_security.adoc
@@ -121,11 +121,11 @@ object or operation, then you must enable security, which enforces authenticatio
[[enable-security-configuring-ldap-servers]]
=== Configuring LDAP Servers
To specify the LDAP server(s) to be used for authentication, you need to configure the text file `.traf_authentication_config`,
-located (by default) in `$MY_SQROOT/sql/scripts`. This file is a flat file, organized as a series of attribute/value pairs.
+located (by default) in `$TRAF_HOME/sql/scripts`. This file is a flat file, organized as a series of attribute/value pairs.
Details on all the attributes and values accepted in the authentication configuration file and how to configure alternate locations
can be found in <<enable-security-traf-authentication-config,.traf_authentication_config>> below.
-A sample template file is located in `$MY_SQROOT/sql/scripts/traf_authentication_config`.
+A sample template file is located in `$TRAF_HOME/sql/scripts/traf_authentication_config`.
Attributes and values in the authentication configuration file are separated with a colon immediately following the attribute name.
In general, white space is ignored but spaces may be relevant in some values. Attribute names are always case insensitive. Multiple
@@ -164,7 +164,7 @@ identifier specifiers. | `UniqueIdentifier: uid=,ou=users,dc=com`
• 2: TLS | `LDAPSSL: 2` +
+
If your LDAP server uses TLS you must specify a file containing the certificate used to encrypt the password. By default the {project-name} software
-looks for this file in `$MY_SQROOT/cacerts`, but you may specify a fully qualified filename, or set the environment variable `CACERTS_DIR` to another
+looks for this file in `$TRAF_HOME/cacerts`, but you may specify a fully qualified filename, or set the environment variable `CACERTS_DIR` to another
directory. To specify the file containing the certificate, you set the value of the attribute `TLS_CACERTFilename`, located in the Defaults section. +
+
*Example* +
@@ -181,7 +181,7 @@ There are additional optional attributes that can be used to customize {project-
<<enable-security-traf-authentication-config,.traf_authentication_config>> below.
You can test the authentication configuration file for syntactic errors using the `ldapconfigcheck` tool. If you have loaded the {project-name}
-environment (`sqenv.sh`), then the tool automatically checks the file at `$MY_SQROOT/sql/scripts/.traf_authentication_config`.
+environment (`sqenv.sh`), then the tool automatically checks the file at `$TRAF_HOME/sql/scripts/.traf_authentication_config`.
If not, you can specify the file to be checked.
*Example*
@@ -225,7 +225,7 @@ Authentication successful
{project-name} clients such as `trafci` encrypt the password before sending it to {project-name}. A self-signed certificate is used to encrypt the password.
The certificate and key are generated when the `sqgen` script is invoked. By default, the files `server.key` and `server.crt` are located
in `$HOME/sqcert`. If those files are not present and since {project-name} clients does not send unencrypted passwords, then you need to manually generate
-those files. To do so, run the script `sqcertgen` located in `$MY_SQROOT/sql/scripts`. The script runs `openssl` to generate the certificate and key.
+those files. To do so, run the script `sqcertgen` located in `$TRAF_HOME/sql/scripts`. The script runs `openssl` to generate the certificate and key.
To run openssl manually, follow the example:
@@ -267,7 +267,7 @@ then {project-name} uses the default location (`$HOME/sqcert`) and the default f
The `.traf_authentication_config` file is user to enable the Trafodion security features.
==== File Location
-By default, the {project-name} authentication configuration file is located in `$MY_SQROOT/sql/scripts/.traf_authentication_config`.
+By default, the {project-name} authentication configuration file is located in `$TRAF_HOME/sql/scripts/.traf_authentication_config`.
If you want to store the configuration file in a different location and/or use a different filename, then Trafodion supports environment
variables to specify the alternate location/name.
@@ -277,7 +277,7 @@ authentication configuration file.
If the environment variable is not set, then Trafodion next checks the variable `TRAFAUTH_CONFIGDIR`. If set, the value is prepended to
`.traf_authentication_config` and used as the Trafodion authentication file.
-If neither is set, Trafodion defaults to `$MY_SQROOT/sql/scripts/.traf_authentication_config`.
+If neither is set, Trafodion defaults to `$TRAF_HOME/sql/scripts/.traf_authentication_config`.
<<<
[[enable-security-template]]
@@ -285,7 +285,7 @@ If neither is set, Trafodion defaults to `$MY_SQROOT/sql/scripts/.traf_authentic
```
# To use authentication in Trafodion, this file must be configured
-# as described below and placed in $MY_SQROOT/sql/scripts and be named
+# as described below and placed in $TRAF_HOME/sql/scripts and be named
# .traf_authentication_config.
#
# NOTE: the format of this configuration file is expected to change in the
@@ -441,9 +441,9 @@ A fully qualified name is expected.
+
Filename `.traf_authentication_config/` is appended to the specified directory
-3. `MY_SQROOT`
+3. `TRAF_HOME`
+
-`/sql/scripts/.traf_authentication_config` is appended to the value of `MY_SQROOT`.
+`/sql/scripts/.traf_authentication_config` is appended to the value of `TRAF_HOME`.
<<<
[[enable-security-ldapconfigcheck-errors]]
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/0d467cad/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 08246c6..bf34fb9 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
-| MY_SQROOT | Target directory for the {project-name} software. | /home/trafodion/apache-trafodion-1.3.0-incubating-bin
+| TRAF_HOME | 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 MY_SQROOT="/home/trafodion/apache-trafodion-1.3.0-incubating-bin"
+export TRAF_HOME="/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/0d467cad/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 bf8fb3c..71034eb 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
-| 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`.
+| TRAF_HOME | 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/0d467cad/docs/provisioning_guide/src/asciidoc/_chapters/script_remove.adoc
----------------------------------------------------------------------
diff --git a/docs/provisioning_guide/src/asciidoc/_chapters/script_remove.adoc b/docs/provisioning_guide/src/asciidoc/_chapters/script_remove.adoc
index 70d8faa..16c8f48 100644
--- a/docs/provisioning_guide/src/asciidoc/_chapters/script_remove.adoc
+++ b/docs/provisioning_guide/src/asciidoc/_chapters/script_remove.adoc
@@ -38,7 +38,7 @@ Do the following:
```
su trafodion
-cd $MY_SQROOT/sql/scripts or cds
+cd $TRAF_HOME/sql/scripts or cds
sqstop
exit
```
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/0d467cad/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 0f1dd31..f7cb54a 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`
-* `MY_SQROOT`
+* `TRAF_HOME`
*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 MY_SQROOT="/home/trafodion/apache-trafodion-1.3.0-incubating-bin"
+export TRAF_HOME="/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 MY_SQROOT="/home/trafodion/apache-trafodion-2.0.0-incubating-bin"
+export TRAF_HOME="/home/trafodion/apache-trafodion-2.0.0-incubating-bin"
```
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/0d467cad/docs/src/site/markdown/architecture-overview.md
----------------------------------------------------------------------
diff --git a/docs/src/site/markdown/architecture-overview.md b/docs/src/site/markdown/architecture-overview.md
index 2619d3c..88e3281 100644
--- a/docs/src/site/markdown/architecture-overview.md
+++ b/docs/src/site/markdown/architecture-overview.md
@@ -80,7 +80,7 @@ For additional details, please refer to the [Trafodion Distributed Transaction M
The Trafodion Compiler translates SQL statements into query plans that can then be executed by the Trafodion execution engine, commonly called the Executor.
-The Compiler is a multi-pass compiler. Each pass transforms a representation of the SQL statement into a new or augmented representation which is input to the next pass. The sections below give more detail on each pass. The logic that calls each pass is in the CmpMain class, method CmpMain::compile. You can find that logic in file $MY_SQROOT/sql/sqlcomp/CmpMain.cpp.
+The Compiler is a multi-pass compiler. Each pass transforms a representation of the SQL statement into a new or augmented representation which is input to the next pass. The sections below give more detail on each pass. The logic that calls each pass is in the CmpMain class, method CmpMain::compile. You can find that logic in file $TRAF_HOME/sql/sqlcomp/CmpMain.cpp.
A copy of the compiler code runs in the Master process, which avoids inter-process message passing between the Compiler and Executor. At the moment the compiler code is not re-entrant, but it is a serially reusable resource within the Master. Some processing is recursive. For example, the execution logic for DDL statements is packaged with the compiler code. When we execute a DDL statement, the Executor spawns a separate Compiler process to execute that logic. For another example, the UPDATE STATISTICS utility dynamically generates SQL SELECT statements to obtain statistical data. Since we are not re-entrant, we spawn a separate Compiler process for this recursive processing.
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/0d467cad/docs/src/site/markdown/management.md
----------------------------------------------------------------------
diff --git a/docs/src/site/markdown/management.md b/docs/src/site/markdown/management.md
index e651cc4..587cab3 100644
--- a/docs/src/site/markdown/management.md
+++ b/docs/src/site/markdown/management.md
@@ -27,7 +27,7 @@ RMS Server | **```rmsstart```** | **```rmsstop```**
**Example: Start Trafodion**
- cd $MY_SQROOT/sql/scripts
+ cd $TRAF_HOME/sql/scripts
sqstart
sqcheck
@@ -58,5 +58,5 @@ If processes are not running as expected, then:
If problems persist please review logs:
-* **```$MY_SQROOT/sql/local_hadoop/\*/log```**: Hadoop, HBase, and Hive logs.
-* **```$MY_SQROOT/logs```**: Trafodion logs.
\ No newline at end of file
+* **```$TRAF_HOME/sql/local_hadoop/\*/log```**: Hadoop, HBase, and Hive logs.
+* **```$TRAF_HOME/logs```**: Trafodion logs.
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/0d467cad/docs/src/site/markdown/traf_authentication_config.md
----------------------------------------------------------------------
diff --git a/docs/src/site/markdown/traf_authentication_config.md b/docs/src/site/markdown/traf_authentication_config.md
index 2720428..236b69e 100644
--- a/docs/src/site/markdown/traf_authentication_config.md
+++ b/docs/src/site/markdown/traf_authentication_config.md
@@ -15,20 +15,20 @@
This page describes the settings in the **```.traf_authentication_config```** file, which is the configuration file related to [Enabling Security Features in Trafodion](enable-secure-trafodion.html).
# File Location
-By default the Trafodion authentication configuration file is located at **```$MY_SQROOT/sql/scripts/.traf_authentication_config```**. If you want to store the configuration file in a different location and/or use a different filename, then Trafodion supports environment variables to specify the alternate location/name.
+By default the Trafodion authentication configuration file is located at **```$TRAF_HOME/sql/scripts/.traf_authentication_config```**. If you want to store the configuration file in a different location and/or use a different filename, then Trafodion supports environment variables to specify the alternate location/name.
Trafodion firsts checks the environment variable **```TRAFAUTH_CONFIGFILE```**. If set, the value is used as the fully qualified Trafodion authentication configuration file.
If the environment variable is not set, then Trafodion next checks the variable **```TRAFAUTH_CONFIGDIR```**. If set, the value is prepended to **```.traf_authentication_config```** and used as the Trafodion authentication file.
-If neither is set, Trafodion defaults to **```$MY_SQROOT/sql/scripts/.traf_authentication_config```**.
+If neither is set, Trafodion defaults to **```$TRAF_HOME/sql/scripts/.traf_authentication_config```**.
# Template
# To use authentication in Trafodion, this file must be configured
- # as described below and placed in $MY_SQROOT/sql/scripts and be named
+ # as described below and placed in $TRAF_HOME/sql/scripts and be named
# .traf_authentication_config. You must also enable authentication by
- # running the script traf_authentication_setup in $MY_SQROOT/sql/scripts.
+ # running the script traf_authentication_setup in $TRAF_HOME/sql/scripts.
#
# NOTE: the format of this configuration file is expected to change in the
# next release of Trafodion. Backward compatibility is not guaranteed.
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/0d467cad/install/installer/addNode_step1
----------------------------------------------------------------------
diff --git a/install/installer/addNode_step1 b/install/installer/addNode_step1
index 99f4ad9..05302b0 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" $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 sed -i -e "s/\<$oldNODENAME\>/$node/g" $TRAF_HOME/tmp/cluster.conf
+ sudo sed -i -e "s/\<$oldNODENAME\>/$node/g" $TRAF_HOME/sql/scripts/sqconfig
+ sudo rm -rf $TRAF_HOME/tmp/se*
+ sudo rm -rf $TRAF_HOME/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/0d467cad/install/installer/addNode_step2
----------------------------------------------------------------------
diff --git a/install/installer/addNode_step2 b/install/installer/addNode_step2
index 20c20ee..ad52013 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 $MY_SQROOT/tmp/cluster.conf $PWD
+sudo cp $TRAF_HOME/tmp/cluster.conf $PWD
sudo chown $(whoami).$(whoami) $PWD/cluster.conf
$TRAF_PDCP $PWD/cluster.conf $HOME
-$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 cp $HOME/cluster.conf $TRAF_HOME/tmp/cluster.conf 2>&1 > /dev/null
+$TRAF_PDSH sudo chown $TRAF_USER.trafodion $TRAF_HOME/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 $MY_SQROOT/sql/scripts/sqconfig $PWD
+sudo cp -r $TRAF_HOME/sql/scripts/sqconfig $PWD
sudo chown $(whoami).$(whoami) $PWD/sqconfig
$TRAF_PDCP $PWD/sqconfig $HOME
-$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 cp $HOME/sqconfig $TRAF_HOME/sql/scripts/sqconfig 2>&1 > /dev/null
+$TRAF_PDSH sudo chown $TRAF_USER.trafodion $TRAF_HOME/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 $MY_SQROOT | grep dcs\*)
+DCS_DIR=$(sudo ls $TRAF_HOME | grep dcs\*)
-sudo cp $MY_SQROOT/$DCS_DIR/conf/servers $PWD
+sudo cp $TRAF_HOME/$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 $MY_SQROOT/$DCS_DIR/conf/servers
-$TRAF_PDSH sudo chown $TRAF_USER.trafodion $MY_SQROOT/$DCS_DIR/conf/servers
+$TRAF_PDSH sudo cp $HOME/tempServers $TRAF_HOME/$DCS_DIR/conf/servers
+$TRAF_PDSH sudo chown $TRAF_USER.trafodion $TRAF_HOME/$DCS_DIR/conf/servers
@@ -265,7 +265,7 @@ function editDCSBackUp {
echo "***INFO: Create DCS Backup Master file"
source $TRAF_CONFIG
-DCS_DIR=$(sudo ls $MY_SQROOT | grep dcs\*)
+DCS_DIR=$(sudo ls $TRAF_HOME | 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 $MY_SQROOT/$DCS_DIR/conf/backup-master
- $TRAF_PDSH sudo chown $TRAF_USER.trafodion $MY_SQROOT/$DCS_DIR/conf/backup-master
+ $TRAF_PDSH sudo cp $HOME/tempbackup $TRAF_HOME/$DCS_DIR/conf/backup-master
+ $TRAF_PDSH sudo chown $TRAF_USER.trafodion $TRAF_HOME/$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 $MY_SQROOT $HOME/tmpTraf
+sudo cp -r $TRAF_HOME $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/0d467cad/install/installer/bashrc_default
----------------------------------------------------------------------
diff --git a/install/installer/bashrc_default b/install/installer/bashrc_default
index 766296b..bbac162 100755
--- a/install/installer/bashrc_default
+++ b/install/installer/bashrc_default
@@ -44,7 +44,7 @@ fi
#-------------------------------------------
# full path of your Trafodion installation
#-------------------------------------------
-export MY_SQROOT=XXXXXX
+export TRAF_HOME=XXXXXX
#-------------------------------------------
# other env vars needed by Trafodion
@@ -62,9 +62,9 @@ export TOOLSDIR=XXXXX
#-------------------------------------------
PATH=".:$PATH"
-if [ -f $MY_SQROOT/sqenv.sh ]; then
+if [ -f $TRAF_HOME/sqenv.sh ]; then
pushd . >/dev/null
- cd $MY_SQROOT
+ cd $TRAF_HOME
source ./sqenv.sh
popd >/dev/null
export MANPATH=$MANPATH:$MPI_ROOT/share/man
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/0d467cad/install/installer/dcs_installer
----------------------------------------------------------------------
diff --git a/install/installer/dcs_installer b/install/installer/dcs_installer
index d6a3f40..97a892d 100755
--- a/install/installer/dcs_installer
+++ b/install/installer/dcs_installer
@@ -38,7 +38,7 @@ Usage: $(basename $0) [options]
Options:
--help Print this message and exit.
--dcs_build <file> Path to the DCS build tar file.
- --dcs_install_path <dir> Path to the install directory. (defaults to $MY_SQROOT)
+ --dcs_install_path <dir> Path to the install directory. (defaults to $TRAF_HOME)
--dcs_servers <count> Total number of DCS servers to start. These
will be allocated in a round-robin fashion on
all nodes. (default, 1 per node)
@@ -65,7 +65,7 @@ function checkOpts {
# Default parameters
typeset DCS_BUILD_FILE=""
-typeset DCS_INSTALL_PATH="$MY_SQROOT"
+typeset DCS_INSTALL_PATH="$TRAF_HOME"
typeset DCS_SERVER_COUNT=""
# Parse input parameters
@@ -113,8 +113,8 @@ source $TRAF_CONFIG
echo "***INFO: Start of DCS install"
# Make sure required env vars have been set first
-if [[ -z "$MY_SQROOT" ]]; then
- echo "***ERROR: environment variable MY_SQROOT has no value."
+if [[ -z "$TRAF_HOME" ]]; then
+ echo "***ERROR: environment variable TRAF_HOME has no value."
exit -1
fi
if [[ -z "$NODE_LIST" ]]; then
@@ -131,8 +131,8 @@ mkdir -p $DCS_INSTALL_PATH
cd $DCS_INSTALL_PATH
if [[ "$ONE_TAR_INSTALL" == "Y" ]]; then
- DCS_DIR=$(ls $MY_SQROOT | grep dcs)
- DCS_DIR=$MY_SQROOT/$DCS_DIR
+ DCS_DIR=$(ls $TRAF_HOME | grep dcs)
+ DCS_DIR=$TRAF_HOME/$DCS_DIR
echo "***INFO: DCS Install Directory: $DCS_DIR"
else
# untar DCS build into install directory
@@ -146,9 +146,9 @@ else
fi
# set env var in sqenvcom.sh for DCS install directory
-grep --invert-match "DCS_INSTALL_DIR=" $MY_SQROOT/sqenvcom.sh > $MY_SQROOT/sqenvcom.temp
-echo "export DCS_INSTALL_DIR=$DCS_DIR" >> $MY_SQROOT/sqenvcom.temp
-mv $MY_SQROOT/sqenvcom.temp $MY_SQROOT/sqenvcom.sh
+grep --invert-match "DCS_INSTALL_DIR=" $TRAF_HOME/sqenvcom.sh > $TRAF_HOME/sqenvcom.temp
+echo "export DCS_INSTALL_DIR=$DCS_DIR" >> $TRAF_HOME/sqenvcom.temp
+mv $TRAF_HOME/sqenvcom.temp $TRAF_HOME/sqenvcom.sh
cd $DCS_DIR/conf
@@ -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" $MY_SQROOT/trafci/bin/trafci
+ sed -i -e "s/HNAME=localhost:23400/$newHName/g" $TRAF_HOME/trafci/bin/trafci
else
######Configure trafci wrapper script
newHName="HNAME=$DCS_PRIMARY_MASTER_NODE:23400"
- sed -i -e "s/HNAME=localhost:23400/$newHName/g" $MY_SQROOT/trafci/bin/trafci
+ sed -i -e "s/HNAME=localhost:23400/$newHName/g" $TRAF_HOME/trafci/bin/trafci
fi
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/0d467cad/install/installer/rest_installer
----------------------------------------------------------------------
diff --git a/install/installer/rest_installer b/install/installer/rest_installer
index 1ce5208..35b4981 100755
--- a/install/installer/rest_installer
+++ b/install/installer/rest_installer
@@ -37,13 +37,13 @@ Usage: $(basename $0) [options]
Options:
--help Print this message and exit.
--rest_build <file> Path to the REST build tar file.
- --rest_install_path <dir> Path to the install directory. (defaults to $MY_SQROOT)
+ --rest_install_path <dir> Path to the install directory. (defaults to $TRAF_HOME)
EOF
}
# Default parameters
typeset REST_BUILD_FILE=""
-typeset REST_INSTALL_PATH="$MY_SQROOT"
+typeset REST_INSTALL_PATH="$TRAF_HOME"
typeset TRAF_CONFIG="/etc/trafodion/trafodion_config"
# Parse input parameters
while [[ $# -gt 0 ]]; do
@@ -80,8 +80,8 @@ echo "***INFO: Start of REST Server install"
source $TRAF_CONFIG
# Make sure required env vars have been set first
-if [[ -z "$MY_SQROOT" ]]; then
- echo "***ERROR: environment variable MY_SQROOT has no value."
+if [[ -z "$TRAF_HOME" ]]; then
+ echo "***ERROR: environment variable TRAF_HOME has no value."
exit -1
fi
if [[ -z "$NODE_LIST" ]]; then
@@ -94,8 +94,8 @@ mkdir -p $REST_INSTALL_PATH
cd $REST_INSTALL_PATH
if [[ "$ONE_TAR_INSTALL" == "Y" ]]; then
- REST_DIR=$(ls $MY_SQROOT | grep rest)
- REST_DIR=$MY_SQROOT/$REST_DIR
+ REST_DIR=$(ls $TRAF_HOME | grep rest)
+ REST_DIR=$TRAF_HOME/$REST_DIR
echo "***INFO: Rest Install Directory: $REST_DIR"
else
@@ -109,9 +109,9 @@ else
fi
# set env var in sqenvcom.sh for DCS install directory
-grep --invert-match "REST_INSTALL_DIR=" $MY_SQROOT/sqenvcom.sh > $MY_SQROOT/sqenvcom.temp
-echo "export REST_INSTALL_DIR=$REST_DIR" >> $MY_SQROOT/sqenvcom.temp
-mv $MY_SQROOT/sqenvcom.temp $MY_SQROOT/sqenvcom.sh
+grep --invert-match "REST_INSTALL_DIR=" $TRAF_HOME/sqenvcom.sh > $TRAF_HOME/sqenvcom.temp
+echo "export REST_INSTALL_DIR=$REST_DIR" >> $TRAF_HOME/sqenvcom.temp
+mv $TRAF_HOME/sqenvcom.temp $TRAF_HOME/sqenvcom.sh
cd $REST_DIR/conf
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/0d467cad/install/installer/traf_add_kerberos
----------------------------------------------------------------------
diff --git a/install/installer/traf_add_kerberos b/install/installer/traf_add_kerberos
index 0ff1e74..ca79a60 100755
--- a/install/installer/traf_add_kerberos
+++ b/install/installer/traf_add_kerberos
@@ -141,7 +141,7 @@ echo "***INFO: Done creating principals and keytabs"
# The RENEW_TOOL is a script that get run that automatically
# renews the ticket when it get ready to expire.
-RENEW_TOOL='$MY_SQROOT/sql/scripts/krb5service start'
+RENEW_TOOL='$TRAF_HOME/sql/scripts/krb5service start'
# modify .bashrc to add kinit command
# Steps:
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/0d467cad/install/installer/traf_add_ldap
----------------------------------------------------------------------
diff --git a/install/installer/traf_add_ldap b/install/installer/traf_add_ldap
index d0c8226..2c59813 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 $MY_SQROOT/sql/scripts/.traf_authentication_config" 2>&1
- sudo su $TRAF_USER --command "chmod 750 $MY_SQROOT/sql/scripts/.traf_authentication_config"
+ sudo su $TRAF_USER --command "cp $HOME_DIR/$TRAF_USER/$LDAP_AUTH_FILE $TRAF_HOME/sql/scripts/.traf_authentication_config" 2>&1
+ sudo su $TRAF_USER --command "chmod 750 $TRAF_HOME/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 $MY_SQROOT/sql/scripts/.traf_authentication_config"
- sudo su $TRAF_USER --command "$TRAF_PDSH chmod 750 $MY_SQROOT/sql/scripts/.traf_authentication_config"
+ sudo su $TRAF_USER --command "$TRAF_PDSH cp $HOME_DIR/$TRAF_USER/$LDAP_AUTH_FILE $TRAF_HOME/sql/scripts/.traf_authentication_config"
+ sudo su $TRAF_USER --command "$TRAF_PDSH chmod 750 $TRAF_HOME/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 $MY_SQROOT/sqenvcom.sh $LOCAL_WORKDIR/sqenvcom.sh
+sudo cp -r $TRAF_HOME/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 $MY_SQROOT/sqenvcom.sh"
+ sudo su $TRAF_USER --command "$TRAF_PDCP $HOME_DIR/$TRAF_USER/sqenvcom.sh $TRAF_HOME/sqenvcom.sh"
else
- sudo cp $HOME_DIR/$TRAF_USER/sqenvcom.sh $MY_SQROOT/sqenvcom.sh
+ sudo cp $HOME_DIR/$TRAF_USER/sqenvcom.sh $TRAF_HOME/sqenvcom.sh
fi
rm $LOCAL_WORKDIR/sqenvcom.sh
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/0d467cad/install/installer/traf_authentication_conf_default
----------------------------------------------------------------------
diff --git a/install/installer/traf_authentication_conf_default b/install/installer/traf_authentication_conf_default
index 7562d4a..248d962 100755
--- a/install/installer/traf_authentication_conf_default
+++ b/install/installer/traf_authentication_conf_default
@@ -24,9 +24,9 @@
# directory service configuration.
#
# To use authentication in Trafodion, this file must be configured
-# as described below and placed in $MY_SQROOT/sql/scripts and be named
+# as described below and placed in $TRAF_HOME/sql/scripts and be named
# .traf_authentication_config. You must also enable authentication by
-# running the script traf_authentication_setup in $MY_SQROOT/sql/scripts.
+# running the script traf_authentication_setup in $TRAF_HOME/sql/scripts.
#
# NOTE: the format of this configuration file is expected to change in the
# next release of Trafodion. Backward compatilibity is not guaranteed.
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/0d467cad/install/installer/traf_config
----------------------------------------------------------------------
diff --git a/install/installer/traf_config b/install/installer/traf_config
index 74e68e8..2b87173 100755
--- a/install/installer/traf_config
+++ b/install/installer/traf_config
@@ -67,8 +67,8 @@ fi
#============================================
# Create install directory
-mkdir -p $MY_SQROOT
-echo $MY_SQROOT
+mkdir -p $TRAF_HOME
+echo $TRAF_HOME
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 $MY_SQROOT
+ cp -rf $HOME/sqenvcom.sh $TRAF_HOME
fi
-cd $MY_SQROOT
+cd $TRAF_HOME
# untar Trafodion build into install directory
if [[ "$ONE_TAR_INSTALL" == "N" ]]; then
- echo "***INFO: untarring file $TRAF_BUILD to $MY_SQROOT" | tee -a $INSTALL_LOG
+ echo "***INFO: untarring file $TRAF_BUILD to $TRAF_HOME" | tee -a $INSTALL_LOG
tar -xzf $TRAF_BUILD 2>&1 | tee -a $INSTALL_LOG
else
- echo "***INFO: untarring file $TRAF_BUILD to $MY_SQROOT" | tee -a $INSTALL_LOG
+ echo "***INFO: untarring file $TRAF_BUILD to $TRAF_HOME" | 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=$MY_SQROOT/sql/scripts/sqconfig
+ SQCONFIG_MASTER=$TRAF_HOME/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 $MY_SQROOT's value has slashes in it
-sed -e "s@export MY_SQROOT=.*@export MY_SQROOT=$MY_SQROOT@" <bashrc_temp >$HOME/.bashrc
+# because $TRAF_HOME's value has slashes in it
+sed -e "s@export TRAF_HOME=.*@export TRAF_HOME=$TRAF_HOME@" <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 $MY_SQROOT/sql/scripts/sqconfig" | tee -a $INSTALL_LOG
- cp $SQCONFIG_MASTER $MY_SQROOT/sql/scripts/sqconfig
+ echo "***INFO: copying sqconfig file ($SQCONFIG_MASTER) to $TRAF_HOME/sql/scripts/sqconfig" | tee -a $INSTALL_LOG
+ cp $SQCONFIG_MASTER $TRAF_HOME/sql/scripts/sqconfig
fi
-cd $MY_SQROOT
+cd $TRAF_HOME
#=================================================
if [ "$all_node_count" -ne "1" ]; then
- 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
+ echo "***INFO: Creating $TRAF_HOME directory on all nodes" | tee -a $INSTALL_LOG
+ $PDSH $ALL_NODES -x $HOSTNAME $PDSH_SSH_CMD mkdir -p $TRAF_HOME
if [[ -f $HOME/sqenvcom.sh ]]; then
echo "****INFO: Copying over sqenvcom.sh"
- $PDCP $ALL_NODES $HOME/sqenvcom.sh $MY_SQROOT
+ $PDCP $ALL_NODES $HOME/sqenvcom.sh $TRAF_HOME
fi
fi
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/0d467cad/install/installer/traf_config_check
----------------------------------------------------------------------
diff --git a/install/installer/traf_config_check b/install/installer/traf_config_check
index a270c45..45a300e 100755
--- a/install/installer/traf_config_check
+++ b/install/installer/traf_config_check
@@ -856,10 +856,10 @@ fi
function checkSQROOT {
-if [[ -z $MY_SQROOT ]]; then
+if [[ -z $TRAF_HOME ]]; then
errorFound=1
echo "SQ ROOT" >> $ERROR_LOG
- echo "***ERROR: MY_SQROOT variable not set in config file" >> $ERROR_LOG
+ echo "***ERROR: TRAF_HOME variable not set in config file" >> $ERROR_LOG
fi
}
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/0d467cad/install/installer/traf_config_setup
----------------------------------------------------------------------
diff --git a/install/installer/traf_config_setup b/install/installer/traf_config_setup
index d938b9d..8180ae2 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"
-MY_SQROOT=""
+TRAF_HOME=""
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 [$MY_SQROOT])
+*Full pathname to the install directory location (default [$TRAF_HOME])
*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")
-MY_SQROOT="$HOME_DIR/$TRAF_USER/${traf_filename%.tar.gz}"
+TRAF_HOME="$HOME_DIR/$TRAF_USER/${traf_filename%.tar.gz}"
-echo -n "Enter directory to install trafodion to, default is [$MY_SQROOT]: "
+echo -n "Enter directory to install trafodion to, default is [$TRAF_HOME]: "
read answer
if [ -z $answer ]; then
- echo "export MY_SQROOT=\"$MY_SQROOT\"" >> $LOCAL_TRAF_CONFIG
+ echo "export TRAF_HOME=\"$TRAF_HOME\"" >> $LOCAL_TRAF_CONFIG
else
- echo "export MY_SQROOT=\"$answer\"" >> $LOCAL_TRAF_CONFIG
+ echo "export TRAF_HOME=\"$answer\"" >> $LOCAL_TRAF_CONFIG
fi
#==============================================
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/0d467cad/install/installer/traf_secure
----------------------------------------------------------------------
diff --git a/install/installer/traf_secure b/install/installer/traf_secure
index fcbdd53..cbb3d11 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 $MY_SQROOT/logs/securityErrors.txt 2>/dev/null
+rm $TRAF_HOME/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 $MY_SQROOT/logs/securityErrors.txt
+echo "***INFO: Starting Trafodion instance, if not already started" | tee -a $TRAF_HOME/logs/securityErrors.txt
-ssh $STARTING_NODE "cd $MY_SQROOT/sql/scripts; sqstart"
+ssh $STARTING_NODE "cd $TRAF_HOME/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 $MY_SQROOT/sqmon.log file for details." | tee -a $MY_SQROOT/logs/securityErrors.txt
+ echo "***ERROR: sqstart failed with RC=$SQSTART_RC. Check $TRAF_HOME/sqmon.log file for details." | tee -a $TRAF_HOME/logs/securityErrors.txt
exit -1;
fi
# Do initialize authorization and alter predefined users
-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)
+echo "***INFO: Initialize authorization and set up predefined users" | tee -a $TRAF_HOME/logs/securityErrors.txt
+ssh $STARTING_NODE "cd $TRAF_HOME/sql/scripts; echo \"initialize authorization; alter user DB__ROOT set external name \"$DB_ROOT_NAME\";\" | sqlci" | tee -a $TRAF_HOME/logs/securityErrors.txt
+foundError=$(grep "ERROR" $TRAF_HOME/logs/securityErrors.txt | wc -l)
if [ "$foundError" -ge "1" ];then
- echo "***ERROR: Security installation failed, continuing. Check files $MY_SQROOT/logs/securityErrors.txt for details." | tee -a $MY_SQROOT/logs/securityErrors.txt
+ echo "***ERROR: Security installation failed, continuing. Check files $TRAF_HOME/logs/securityErrors.txt for details." | tee -a $TRAF_HOME/logs/securityErrors.txt
fi
-echo "***INFO: Please check the install log $MY_SQROOT/logs/securityErrors.txt for any issues" | tee -a $MY_SQROOT/logs/securityErrors.txt
+echo "***INFO: Please check the install log $TRAF_HOME/logs/securityErrors.txt for any issues" | tee -a $TRAF_HOME/logs/securityErrors.txt
#==========================================
-echo "***INFO: Installation setup completed successfully." | tee -a $MY_SQROOT/logs/securityErrors.txt
+echo "***INFO: Installation setup completed successfully." | tee -a $TRAF_HOME/logs/securityErrors.txt
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/0d467cad/install/installer/traf_sqgen
----------------------------------------------------------------------
diff --git a/install/installer/traf_sqgen b/install/installer/traf_sqgen
index fc311a8..28aa500 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 $MY_SQROOT/sql/scripts
+cd $TRAF_HOME/sql/scripts
#If sqconfig.db exists remove it and then sqgen can be run
-if [[ -e $MY_SQROOT/sql/scripts/sqconfig.db ]]; then
- $TRAF_PDSH rm -rf $MY_SQROOT/sql/scripts/sqconfig.db
+if [[ -e $TRAF_HOME/sql/scripts/sqconfig.db ]]; then
+ $TRAF_PDSH rm -rf $TRAF_HOME/sql/scripts/sqconfig.db
fi
-$MY_SQROOT/sql/scripts/sqgen
+$TRAF_HOME/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 $MY_SQROOT $MY_SQROOT/..
+ $PDCP $ALL_NODES -x $HOSTNAME -r $TRAF_HOME $TRAF_HOME/..
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/0d467cad/install/installer/traf_start
----------------------------------------------------------------------
diff --git a/install/installer/traf_start b/install/installer/traf_start
index 06f2739..7a74d81 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 $MY_SQROOT/sql/scripts; sqstart"
+ ssh $STARTING_NODE "cd $TRAF_HOME/sql/scripts; sqstart"
SQSTART_RC=$?
if [ "$SQSTART_RC" != "0" ]; then
- echo "***ERROR: sqstart failed with RC=$SQSTART_RC. Check $MY_SQROOT/sqmon.log file for details." | tee -a $INSTALL_LOG
+ echo "***ERROR: sqstart failed with RC=$SQSTART_RC. Check $TRAF_HOME/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 $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)
+ ssh $STARTING_NODE "cd $TRAF_HOME/sql/scripts; echo \"initialize Trafodion;\" | sqlci" | tee -a $TRAF_HOME/initializeErrors.txt
+ error1392=$(grep "1392" $TRAF_HOME/initializeErrors.txt | wc -l)
+ error1395=$(grep "1395" $TRAF_HOME/initializeErrors.txt | wc -l)
if [ "$error1395" -ge "1" ] || [ "$error1392" -ge "1" ]; then
- 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)
+ ssh $STARTING_NODE "cd $TRAF_HOME/sql/scripts; echo \"get version of metadata;\" | sqlci" | tee $TRAF_HOME/initializeErrors.txt
+ metadataCurrent=$(grep "Metadata is current" $TRAF_HOME/initializeErrors.txt | wc -l)
if [[ "$metadataCurrent" -ne "1" ]]; then
- ssh $STARTING_NODE "cd $MY_SQROOT/sql/scripts; echo \"initialize Trafodion, upgrade;\" | sqlci" | tee $MY_SQROOT/initializeErrors.txt
+ ssh $STARTING_NODE "cd $TRAF_HOME/sql/scripts; echo \"initialize Trafodion, upgrade;\" | sqlci" | tee $TRAF_HOME/initializeErrors.txt
fi
fi
- anyError=$(grep "ERROR" $MY_SQROOT/initializeErrors.txt | wc -l)
+ anyError=$(grep "ERROR" $TRAF_HOME/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/0d467cad/install/installer/trafodion_config_default
----------------------------------------------------------------------
diff --git a/install/installer/trafodion_config_default b/install/installer/trafodion_config_default
index 6f67491..bfea34a 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 MY_SQROOT="/opt/trafodion/trafodion"
+export TRAF_HOME="/opt/trafodion/trafodion"
# Start Trafodion after install completes
export START="Y"
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/0d467cad/install/installer/trafodion_install
----------------------------------------------------------------------
diff --git a/install/installer/trafodion_install b/install/installer/trafodion_install
index 6590b66..a37fda5 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 $MY_SQROOT/sql/scripts/sqcheck ]]; then
+ if [[ -e $TRAF_HOME/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 $MY_SQROOT
-sudo chown $TRAF_USER.trafodion $MY_SQROOT
+sudo mkdir -p $TRAF_HOME
+sudo chown $TRAF_USER.trafodion $TRAF_HOME
/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/0d467cad/install/installer/trafodion_uninstaller
----------------------------------------------------------------------
diff --git a/install/installer/trafodion_uninstaller b/install/installer/trafodion_uninstaller
index 6eaabf0..c0ad19e 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 "$MY_SQROOT/sql/scripts/krb5service stop 2>/dev/null"
+ sudo su $TRAF_USER --login --command "$TRAF_HOME/sql/scripts/krb5service stop 2>/dev/null"
else
- $TRAF_PDSH "sudo su $TRAF_USER --login --command \"$MY_SQROOT/sql/scripts/krb5service stop 2>/dev/null\""
+ $TRAF_PDSH "sudo su $TRAF_USER --login --command \"$TRAF_HOME/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 $MY_SQROOT"
-$TRAF_PDSH sudo rm -rf $MY_SQROOT
+echo "***INFO: removing all files from $TRAF_HOME"
+$TRAF_PDSH sudo rm -rf $TRAF_HOME
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/0d467cad/install/python-installer/bashrc.template
----------------------------------------------------------------------
diff --git a/install/python-installer/bashrc.template b/install/python-installer/bashrc.template
index 4f1b798..a85de3c 100644
--- a/install/python-installer/bashrc.template
+++ b/install/python-installer/bashrc.template
@@ -36,7 +36,7 @@ cd $HOME
#-------------------------------------------
# full path of your Trafodion installation
#-------------------------------------------
-export MY_SQROOT="{{ my_sqroot }}"
+export TRAF_HOME="{{ traf_home }}"
#-------------------------------------------
# other env vars needed by Trafodion
@@ -54,9 +54,9 @@ export ENABLE_HA="{{ enable_ha }}"
# Execute the sqenv.sh script if it exists.
#-------------------------------------------
PATH=".:$PATH"
-if [ -f $MY_SQROOT/sqenv.sh ]; then
+if [ -f $TRAF_HOME/sqenv.sh ]; then
pushd . >/dev/null
- cd $MY_SQROOT
+ cd $TRAF_HOME
source ./sqenv.sh
popd >/dev/null
export MANPATH=$MANPATH:$MPI_ROOT/share/man
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/0d467cad/install/python-installer/db_config_default
----------------------------------------------------------------------
diff --git a/install/python-installer/db_config_default b/install/python-installer/db_config_default
index c4a2c4e..3087b5b 100644
--- a/install/python-installer/db_config_default
+++ b/install/python-installer/db_config_default
@@ -55,7 +55,7 @@ traf_package =
dcs_cnt_per_node = 4
# scratch file location, seperated by comma if more than one
-scratch_locs = $MY_SQROOT/tmp
+scratch_locs = $TRAF_HOME/tmp
# start trafodion instance after installation completed
traf_start = Y
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/0d467cad/install/python-installer/dcs_setup.py
----------------------------------------------------------------------
diff --git a/install/python-installer/dcs_setup.py b/install/python-installer/dcs_setup.py
index c3d1a9a..3a196db 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)
- MY_SQROOT = os.environ['MY_SQROOT']
+ TRAF_HOME = os.environ['TRAF_HOME']
TRAF_VER = dbcfgs['traf_version']
HBASE_XML_FILE = dbcfgs['hbase_xml_file']
- 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_INSTALL_ENV = 'export DCS_INSTALL_DIR=%s/dcs-%s' % (TRAF_HOME, TRAF_VER)
+ REST_INSTALL_ENV = 'export REST_INSTALL_DIR=%s/rest-%s' % (TRAF_HOME, TRAF_VER)
- DCS_CONF_DIR = '%s/dcs-%s/conf' % (MY_SQROOT, TRAF_VER)
+ DCS_CONF_DIR = '%s/dcs-%s/conf' % (TRAF_HOME, 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' % (MY_SQROOT, TRAF_VER)
- TRAFCI_FILE = MY_SQROOT + '/trafci/bin/trafci'
- SQENV_FILE = MY_SQROOT + '/sqenvcom.sh'
+ REST_SITE_FILE = '%s/rest-%s/conf/rest-site.xml' % (TRAF_HOME, TRAF_VER)
+ TRAFCI_FILE = TRAF_HOME + '/trafci/bin/trafci'
+ SQENV_FILE = TRAF_HOME + '/sqenvcom.sh'
### dcs setting ###
# servers
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/0d467cad/install/python-installer/prompt.json
----------------------------------------------------------------------
diff --git a/install/python-installer/prompt.json b/install/python-installer/prompt.json
index 268eca4..7ea0a90 100644
--- a/install/python-installer/prompt.json
+++ b/install/python-installer/prompt.json
@@ -110,7 +110,7 @@
"scratch_locs":
{
"prompt":"Enter trafodion scratch file folder location(should be a large disk), if more than one folder, use comma seperated",
- "default":"$MY_SQROOT/tmp"
+ "default":"$TRAF_HOME/tmp"
},
"local_repo_dir":
{
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/0d467cad/install/python-installer/traf_authentication_conf.template
----------------------------------------------------------------------
diff --git a/install/python-installer/traf_authentication_conf.template b/install/python-installer/traf_authentication_conf.template
index c3add91..f15dd70 100644
--- a/install/python-installer/traf_authentication_conf.template
+++ b/install/python-installer/traf_authentication_conf.template
@@ -24,9 +24,9 @@
# directory service configuration.
#
# To use authentication in Trafodion, this file must be configured
-# as described below and placed in $MY_SQROOT/sql/scripts and be named
+# as described below and placed in $TRAF_HOME/sql/scripts and be named
# .traf_authentication_config. You must also enable authentication by
-# running the script traf_authentication_setup in $MY_SQROOT/sql/scripts.
+# running the script traf_authentication_setup in $TRAF_HOME/sql/scripts.
#
# NOTE: the format of this configuration file is expected to change in the
# next release of Trafodion. Backward compatilibity is not guaranteed.
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/0d467cad/install/python-installer/traf_kerberos.py
----------------------------------------------------------------------
diff --git a/install/python-installer/traf_kerberos.py b/install/python-installer/traf_kerberos.py
index f4391a0..2e89d2c 100755
--- a/install/python-installer/traf_kerberos.py
+++ b/install/python-installer/traf_kerberos.py
@@ -101,7 +101,7 @@ fi
# ---------------------------------------------------------------
# Start trafodion kerberos ticket manager process
# ---------------------------------------------------------------
-$MY_SQROOT/sql/scripts/krb5service start >/dev/null 2>&1
+$TRAF_HOME/sql/scripts/krb5service start >/dev/null 2>&1
""" % (traf_keytab, traf_principal)
traf_bashrc = '/home/%s/.bashrc' % traf_user
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/0d467cad/install/python-installer/traf_ldap.py
----------------------------------------------------------------------
diff --git a/install/python-installer/traf_ldap.py b/install/python-installer/traf_ldap.py
index bf9fbd5..e756426 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']
- MY_SQROOT = os.environ['MY_SQROOT']
- SQENV_FILE = MY_SQROOT + '/sqenvcom.sh'
- TRAF_AUTH_CONFIG = '%s/sql/scripts/.traf_authentication_config' % MY_SQROOT
+ TRAF_HOME = os.environ['TRAF_HOME']
+ SQENV_FILE = TRAF_HOME + '/sqenvcom.sh'
+ TRAF_AUTH_CONFIG = '%s/sql/scripts/.traf_authentication_config' % TRAF_HOME
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/0d467cad/install/python-installer/traf_setup.py
----------------------------------------------------------------------
diff --git a/install/python-installer/traf_setup.py b/install/python-installer/traf_setup.py
index 828f78b..44c83a2 100755
--- a/install/python-installer/traf_setup.py
+++ b/install/python-installer/traf_setup.py
@@ -32,13 +32,13 @@ from common import err, cmd_output, run_cmd
def run():
dbcfgs = json.loads(dbcfgs_json)
- TRAF_HOME = cmd_output('cat /etc/default/useradd |grep HOME |cut -d "=" -f 2').strip()
+ HOME_DIR = cmd_output('cat /etc/default/useradd |grep HOME |cut -d "=" -f 2').strip()
TRAF_USER = dbcfgs['traf_user']
- MY_SQROOT = '%s/%s/%s-%s' % (TRAF_HOME, TRAF_USER, dbcfgs['traf_basename'], dbcfgs['traf_version'])
+ TRAF_HOME = '%s/%s/%s-%s' % (HOME_DIR, TRAF_USER, dbcfgs['traf_basename'], dbcfgs['traf_version'])
TRAF_VER = dbcfgs['traf_version']
DISTRO = dbcfgs['distro']
- TRAF_LIB_PATH = MY_SQROOT + '/export/lib'
+ TRAF_LIB_PATH = TRAF_HOME + '/export/lib'
SCRATCH_LOCS = dbcfgs['scratch_locs'].split(',')
SUDOER_FILE = '/etc/sudoers.d/trafodion'
@@ -56,7 +56,7 @@ def run():
# don't set permission for HOME folder
if not os.path.exists(loc):
run_cmd('mkdir -p %s' % loc)
- if TRAF_HOME not in loc:
+ if HOME_DIR not in loc:
run_cmd('chmod 777 %s' % loc)
### copy jar files ###
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/0d467cad/install/python-installer/traf_sqconfig.py
----------------------------------------------------------------------
diff --git a/install/python-installer/traf_sqconfig.py b/install/python-installer/traf_sqconfig.py
index 8da6377..6665afd 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
- MY_SQROOT = os.environ['MY_SQROOT']
- if MY_SQROOT == '': err('MY_SQROOT var is empty')
- sqconfig_file = MY_SQROOT + '/sql/scripts/sqconfig'
+ TRAF_HOME = os.environ['TRAF_HOME']
+ if TRAF_HOME == '': err('TRAF_HOME var is empty')
+ sqconfig_file = TRAF_HOME + '/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/0d467cad/install/python-installer/traf_user.py
----------------------------------------------------------------------
diff --git a/install/python-installer/traf_user.py b/install/python-installer/traf_user.py
index 01c1c50..bb2c944 100755
--- a/install/python-installer/traf_user.py
+++ b/install/python-installer/traf_user.py
@@ -43,9 +43,9 @@ def run():
TRAF_USER = dbcfgs['traf_user']
TRAF_PWD = dbcfgs['traf_pwd']
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)
- MY_SQROOT = '%s/%s-%s' % (TRAF_USER_DIR, dbcfgs['traf_basename'], dbcfgs['traf_version'])
+ HOME_DIR = cmd_output('cat /etc/default/useradd |grep HOME |cut -d "=" -f 2').strip()
+ TRAF_USER_DIR = '%s/%s' % (HOME_DIR, TRAF_USER)
+ TRAF_HOME = '%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'],
- '{{ my_sqroot }}': MY_SQROOT,
+ '{{ traf_home }}': TRAF_HOME,
'{{ hadoop_type }}': hadoop_type,
'{{ node_list }}': ' '.join(nodes),
'{{ node_count }}': str(len(nodes)),
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/0d467cad/tests/phx/README.rst
----------------------------------------------------------------------
diff --git a/tests/phx/README.rst b/tests/phx/README.rst
index 42517d1..1907f86 100644
--- a/tests/phx/README.rst
+++ b/tests/phx/README.rst
@@ -63,7 +63,7 @@ Running Tests
* Make sure the Trafodion sqenv.sh file has been sourced into the environment
* Set environment variable LD_PRELOAD ::
- export LD_PRELOAD=$JAVA_HOME/jre/lib/amd64/libjsig.so:$MY_SQROOT/export/lib${SQ_MBTYPE}/libseabasesig.so
+ export LD_PRELOAD=$JAVA_HOME/jre/lib/amd64/libjsig.so:$TRAF_HOME/export/lib${SQ_MBTYPE}/libseabasesig.so
* Run ``phoenix_test.py`` with the following options
* For Cloudera ::
@@ -85,7 +85,7 @@ Running Tests
* Make sure the Trafodion sqenv.sh file has been sourced into the environment
* Set environment variable LD_PRELOAD ::
- export LD_PRELOAD=$JAVA_HOME/jre/lib/amd64/libjsig.so:$MY_SQROOT/export/lib${SQ_MBTYPE}/libseabasesig.so
+ export LD_PRELOAD=$JAVA_HOME/jre/lib/amd64/libjsig.so:$TRAF_HOME/export/lib${SQ_MBTYPE}/libseabasesig.so
* Run ``phoenix_test.py`` with the following options
* For Cloudera ::
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/0d467cad/tests/phx/phoenix_test.py
----------------------------------------------------------------------
diff --git a/tests/phx/phoenix_test.py b/tests/phx/phoenix_test.py
index d4c288f..dc3974b 100755
--- a/tests/phx/phoenix_test.py
+++ b/tests/phx/phoenix_test.py
@@ -354,8 +354,8 @@ def generate_pom_xml(targettype, jdbc_groupid, jdbc_artid, jdbc_path, hadoop_dis
template_text = re.sub('<!-- START_DISTRO_DEP -->', dep_string, template_text)
# look for Trafodion Hbase TRX file and Trafodion Hbase Access file
- # assume in $MY_SQROOT/export/lib
- traf_lib_file_list = os.listdir(os.environ['MY_SQROOT'] + '/export/lib')
+ # assume in $TRAF_HOME/export/lib
+ traf_lib_file_list = os.listdir(os.environ['TRAF_HOME'] + '/export/lib')
# assume regular expression used for traf_hbase_trx_file and traf_hbase_access_file
# is precise enough to ever return only 1 value
@@ -565,7 +565,7 @@ def prog_parse_args():
elif options.jdbctype == 'T2':
# check for Trafodion ENV variables to be set
req_envs_error_string = ""
- for req_env in ['SQ_MBTYPE', 'MY_SQROOT', 'MPI_TMPDIR', 'LD_PRELOAD', 'LD_LIBRARY_PATH',
+ for req_env in ['SQ_MBTYPE', 'TRAF_HOME', 'MPI_TMPDIR', 'LD_PRELOAD', 'LD_LIBRARY_PATH',
'PATH', 'LANG', 'HADOOP_CNF_DIR', 'HBASE_CNF_DIR', 'HIVE_CNF_DIR',
'HBASE_TRXDIR']:
if req_env not in os.environ:
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/0d467cad/tests/phx/pom.xml.template
----------------------------------------------------------------------
diff --git a/tests/phx/pom.xml.template b/tests/phx/pom.xml.template
index f8382be..af79023 100644
--- a/tests/phx/pom.xml.template
+++ b/tests/phx/pom.xml.template
@@ -200,7 +200,7 @@
<artifactId>hbase-trx</artifactId>
<version>${env.TRAFODION_VER}</version>
<scope>system</scope>
- <systemPath>${env.MY_SQROOT}/export/lib/TRAF_HBASE_TRX_FILE</systemPath>
+ <systemPath>${env.TRAF_HOME}/export/lib/TRAF_HBASE_TRX_FILE</systemPath>
</dependency>
<dependency>
@@ -208,7 +208,7 @@
<artifactId>trafodion-dtm</artifactId>
<version>${env.TRAFODION_VER}</version>
<scope>system</scope>
- <systemPath>${env.MY_SQROOT}/export/lib/${env.DTM_COMMON_JAR}</systemPath>
+ <systemPath>${env.TRAF_HOME}/export/lib/${env.DTM_COMMON_JAR}</systemPath>
</dependency>
<dependency>
@@ -216,7 +216,7 @@
<artifactId>trafodion-sql</artifactId>
<version>${env.TRAFODION_VER}</version>
<scope>system</scope>
- <systemPath>${env.MY_SQROOT}/export/lib/${env.SQL_JAR}</systemPath>
+ <systemPath>${env.TRAF_HOME}/export/lib/${env.SQL_JAR}</systemPath>
</dependency>
<!-- END_FOR_T2_ONLY -->
@@ -282,7 +282,7 @@
<HIVE_CNF_DIR>${env.HIVE_CNF_DIR}</HIVE_CNF_DIR>
<HBASE_TRXDIR>${env.HBASE_TRXDIR}</HBASE_TRXDIR>
<SQ_MBTYPE>${env.SQ_MBTYPE}</SQ_MBTYPE>
- <MY_SQROOT>${env.MY_SQROOT}</MY_SQROOT>
+ <TRAF_HOME>${env.TRAF_HOME}</TRAF_HOME>
<TRAFODION_VER>${env.TRAFODION_VER}</TRAFODION_VER>
<MPI_TMPDIR>${env.MPI_TMPDIR}</MPI_TMPDIR>
<LD_PRELOAD>${env.LD_PRELOAD}</LD_PRELOAD>
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/0d467cad/wms/conf/wms-env.sh
----------------------------------------------------------------------
diff --git a/wms/conf/wms-env.sh b/wms/conf/wms-env.sh
index 52bb8f0..304ee03 100644
--- a/wms/conf/wms-env.sh
+++ b/wms/conf/wms-env.sh
@@ -31,8 +31,8 @@
# export JAVA_HOME=/usr/java/jdk1.7.0/
# Add Trafodion to the classpath
-if [ "$MY_SQROOT" != "" ]; then
- if [ -d $MY_SQROOT ]; then
+if [ "$TRAF_HOME" != "" ]; then
+ if [ -d $TRAF_HOME ]; then
export WMS_CLASSPATH=${CLASSPATH}:
fi
fi
@@ -113,5 +113,5 @@ export WMS_OPTS="-XX:+UseConcMarkSweepGC"
# export WMS_MANAGES_ZK=true
# Tell WMS where the user program environment lives.
- export WMS_USER_PROGRAM_HOME=$MY_SQROOT
+ export WMS_USER_PROGRAM_HOME=$TRAF_HOME