You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@omid.apache.org by fp...@apache.org on 2016/06/03 21:27:38 UTC
[11/23] incubator-omid git commit: [OMID-33] Add HADOOP_CONF_DIR and
HBASE_CONF_DIR evn variables into tso server start scripts
[OMID-33] Add HADOOP_CONF_DIR and HBASE_CONF_DIR evn variables into tso server start scripts
Change-Id: Id0ac8745cbb1d34e6c2a00e5a8c706ce3370a8e3
Project: http://git-wip-us.apache.org/repos/asf/incubator-omid/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-omid/commit/3ca14fca
Tree: http://git-wip-us.apache.org/repos/asf/incubator-omid/tree/3ca14fca
Diff: http://git-wip-us.apache.org/repos/asf/incubator-omid/diff/3ca14fca
Branch: refs/heads/master
Commit: 3ca14fca12e3241f1b6ac487e79ce3d3ae0c38b2
Parents: 5d5864e
Author: Igor Katkov <ka...@yahoo-inc.com>
Authored: Fri May 20 12:11:04 2016 -0700
Committer: Igor Katkov <ka...@yahoo-inc.com>
Committed: Fri May 20 12:11:04 2016 -0700
----------------------------------------------------------------------
tso-server/bin/omid.sh | 2 +-
tso-server/conf/omid-env.sh | 7 +++++++
2 files changed, 8 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-omid/blob/3ca14fca/tso-server/bin/omid.sh
----------------------------------------------------------------------
diff --git a/tso-server/bin/omid.sh b/tso-server/bin/omid.sh
index 66382d7..cede88c 100755
--- a/tso-server/bin/omid.sh
+++ b/tso-server/bin/omid.sh
@@ -2,7 +2,7 @@
SCRIPTDIR=`dirname $0`
cd $SCRIPTDIR;
-CLASSPATH=../conf
+CLASSPATH=../conf:$(HBASE_CONF_DIR):$(HADOOP_CONF_DIR)
. ../conf/omid-env.sh
http://git-wip-us.apache.org/repos/asf/incubator-omid/blob/3ca14fca/tso-server/conf/omid-env.sh
----------------------------------------------------------------------
diff --git a/tso-server/conf/omid-env.sh b/tso-server/conf/omid-env.sh
index 5828123..2d836bd 100644
--- a/tso-server/conf/omid-env.sh
+++ b/tso-server/conf/omid-env.sh
@@ -1,2 +1,9 @@
# Set the flags to pass to the jvm when running omid
# export JVM_FLAGS=-Xmx8096m
+# ---------------------------------------------------------------------------------------------------------------------
+# Check if HADOOP_CONF_DIR and HBASE_CONF_DIR are set
+# ---------------------------------------------------------------------------------------------------------------------
+
+if [ -z ${HADOOP_CONF_DIR+x} ]; then echo "WARNING: HADOOP_CONF_DIR is unset"; else echo "HADOOP_CONF_DIR is set to '$HADOOP_CONF_DIR'"; fi
+if [ -z ${HBASE_CONF_DIR+x} ]; then echo "WARNING: HBASE_CONF_DIR is unset"; else echo "HBASE_CONF_DIR is set to '$HBASE_CONF_DIR'"; fi
+