You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@kudu.apache.org by to...@apache.org on 2016/12/19 09:11:44 UTC
[2/2] kudu git commit: csd: add another path for KUDU_HOME
csd: add another path for KUDU_HOME
Kudu is provided in the CDH parcel in some new versions of CDH, and the
convention is for the CDH parcel to communicate component locations via
CDH_COMPONENT_HOME, not COMPONENT_HOME.
Change-Id: I4aa80a99ce2a368086f8c4988fa15056c755ab9f
Reviewed-on: http://gerrit.cloudera.org:8080/5539
Tested-by: Kudu Jenkins
Reviewed-by: Todd Lipcon <to...@apache.org>
Project: http://git-wip-us.apache.org/repos/asf/kudu/repo
Commit: http://git-wip-us.apache.org/repos/asf/kudu/commit/b9dadad6
Tree: http://git-wip-us.apache.org/repos/asf/kudu/tree/b9dadad6
Diff: http://git-wip-us.apache.org/repos/asf/kudu/diff/b9dadad6
Branch: refs/heads/master
Commit: b9dadad6b2a42bf6c862c0602fd51ff076810df5
Parents: a32ea34
Author: Adar Dembo <ad...@cloudera.com>
Authored: Fri Dec 16 18:33:48 2016 -0800
Committer: Todd Lipcon <to...@apache.org>
Committed: Mon Dec 19 09:10:47 2016 +0000
----------------------------------------------------------------------
java/kudu-csd/src/scripts/kudu.sh | 8 +++++++-
1 file changed, 7 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/kudu/blob/b9dadad6/java/kudu-csd/src/scripts/kudu.sh
----------------------------------------------------------------------
diff --git a/java/kudu-csd/src/scripts/kudu.sh b/java/kudu-csd/src/scripts/kudu.sh
index f3b2b94..18159f8 100644
--- a/java/kudu-csd/src/scripts/kudu.sh
+++ b/java/kudu-csd/src/scripts/kudu.sh
@@ -22,7 +22,13 @@ set -x
# Time marker for both stderr and stdout
date 1>&2
-export KUDU_HOME=${KUDU_HOME:-/usr/lib/kudu}
+# Preference order:
+# 1. KUDU_HOME (set by kudu_env.sh in the KUDU parcel).
+# 2. CDH_KUDU_HOME (set by cdh_env.sh in the CDH parcel).
+# 3. Hardcoded default value (where the Cloudera packages install Kudu).
+DEFAULT_KUDU_HOME=/usr/lib/kudu
+export KUDU_HOME=${KUDU_HOME:-$CDH_KUDU_HOME}
+export KUDU_HOME=${KUDU_HOME:-$DEFAULT_KUDU_HOME}
CMD=$1
shift 2