[fluo-muchos] branch main updated: Respect existing CLASSPATH in accumulo-env.sh (#400)

[ctubbsii]

This is an automated email from the ASF dual-hosted git repository.

ctubbsii pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/fluo-muchos.git


The following commit(s) were added to refs/heads/main by this push:
     new 6df76d5  Respect existing CLASSPATH in accumulo-env.sh (#400)
6df76d5 is described below

commit 6df76d55f7e49003d1fc3362c44cfe0a1f2d0f6d
Author: Brian Loss <brianl...@apache.org>
AuthorDate: Mon Jun 14 12:03:14 2021 -0400

    Respect existing CLASSPATH in accumulo-env.sh (#400)
    
    With Accumulo 2.0, the accumulo-env.sh file attempts to respect the
    existing CLASSPATH supplied to it. Update the muchos version to do the
    same.
---
 ansible/roles/accumulo/templates/accumulo-env.sh | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/ansible/roles/accumulo/templates/accumulo-env.sh 
b/ansible/roles/accumulo/templates/accumulo-env.sh
index 5c71a3d..ea225c1 100755
--- a/ansible/roles/accumulo/templates/accumulo-env.sh
+++ b/ansible/roles/accumulo/templates/accumulo-env.sh
@@ -45,7 +45,13 @@ add_jar_prefix_to_classpath() {
     CLASSPATH="${CLASSPATH}:${JAR}"
   done
 }
-CLASSPATH="${conf}:${lib}/*:${HADOOP_CONF_DIR}:${ZOOKEEPER_HOME}/*"
+## Build using existing CLASSPATH, conf/ directory, dependencies in lib/, and 
external Hadoop & Zookeeper dependencies
+if [[ -n "$CLASSPATH" ]]; then
+  CLASSPATH="${CLASSPATH}:${conf}"
+else
+  CLASSPATH="${conf}"
+fi
+CLASSPATH="${CLASSPATH}:${lib}/*:${HADOOP_CONF_DIR}:${ZOOKEEPER_HOME}/*"
 add_jar_prefix_to_classpath "${ZOOKEEPER_HOME}/lib/zookeeper-"
 CLASSPATH="${CLASSPATH}:${HADOOP_HOME}/share/hadoop/client/*"
 {% if cluster_type == 'azure' and use_adlsg2 %}