[fluo-muchos] branch master updated: Fix accumulo-env.sh classpath for ZK 3.5 and reduce hadoop lib jars used (#320)

[billie]

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

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


The following commit(s) were added to refs/heads/master by this push:
     new 9bf799a  Fix accumulo-env.sh classpath for ZK 3.5 and reduce hadoop 
lib jars used (#320)
9bf799a is described below

commit 9bf799ab88471cd479baa9ec9193b642b0197246
Author: billierinaldi <bil...@apache.org>
AuthorDate: Thu Feb 6 03:34:41 2020 -0800

    Fix accumulo-env.sh classpath for ZK 3.5 and reduce hadoop lib jars used 
(#320)
---
 ansible/roles/accumulo/templates/accumulo-env.sh | 25 +++++++++++++++++++++---
 1 file changed, 22 insertions(+), 3 deletions(-)

diff --git a/ansible/roles/accumulo/templates/accumulo-env.sh 
b/ansible/roles/accumulo/templates/accumulo-env.sh
index 71fb224..365050c 100755
--- a/ansible/roles/accumulo/templates/accumulo-env.sh
+++ b/ansible/roles/accumulo/templates/accumulo-env.sh
@@ -40,10 +40,29 @@ export MALLOC_ARENA_MAX=${MALLOC_ARENA_MAX:-1}
 export HADOOP_HOME={{ hadoop_home }}
 export HADOOP_CONF_DIR="$HADOOP_HOME/etc/hadoop"
 
-CLASSPATH="${conf}:${lib}/*:${HADOOP_CONF_DIR}:${ZOOKEEPER_HOME}/*:${HADOOP_HOME}/share/hadoop/client/*"
+add_jar_prefix_to_classpath() {
+  for JAR in "$1"*jar; do
+    CLASSPATH="${CLASSPATH}:${JAR}"
+  done
+}
+CLASSPATH="${conf}:${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 %}
-CLASSPATH="${CLASSPATH}:${HADOOP_HOME}/share/hadoop/tools/lib/*"
-CLASSPATH="${CLASSPATH}:${HADOOP_HOME}/share/hadoop/common/lib/*"
+add_jar_prefix_to_classpath 
"${HADOOP_HOME}/share/hadoop/tools/lib/azure-data-lake-store-sdk-"
+add_jar_prefix_to_classpath 
"${HADOOP_HOME}/share/hadoop/tools/lib/azure-keyvault-core-"
+add_jar_prefix_to_classpath 
"${HADOOP_HOME}/share/hadoop/tools/lib/hadoop-azure-"
+add_jar_prefix_to_classpath 
"${HADOOP_HOME}/share/hadoop/tools/lib/azure-storage-"
+add_jar_prefix_to_classpath 
"${HADOOP_HOME}/share/hadoop/tools/lib/wildfly-openssl-"
+add_jar_prefix_to_classpath "${HADOOP_HOME}/share/hadoop/common/lib/jaxb-api-"
+add_jar_prefix_to_classpath "${HADOOP_HOME}/share/hadoop/common/lib/jaxb-impl-"
+add_jar_prefix_to_classpath 
"${HADOOP_HOME}/share/hadoop/common/lib/commons-lang3-"
+add_jar_prefix_to_classpath 
"${HADOOP_HOME}/share/hadoop/common/lib/httpclient-"
+add_jar_prefix_to_classpath 
"${HADOOP_HOME}/share/hadoop/common/lib/jackson-core-asl-"
+add_jar_prefix_to_classpath 
"${HADOOP_HOME}/share/hadoop/common/lib/jackson-mapper-asl-"
+{% if not use_hdfs|default(True) %}
+add_jar_prefix_to_classpath 
"${HADOOP_HOME}/share/hadoop/hdfs/lib/jetty-util-ajax-"
+{% endif %}
 {% endif %}
 export CLASSPATH