Repository: accumulo Updated Branches: refs/heads/1.6 48ad87a81 -> 6425c37dc refs/heads/1.7 4dd8c5433 -> 5f76160c1 refs/heads/master b8e19a4ac -> b16c6453a
ACCUMULO-3952 Verify the log4j jar was found in the Hadoop installation. The `find` command may fail (personally, ran into this when the cwd was a directory that was not readable by the user). We miss this and blindly proceed. Presently, Accumulo processes will fail miserably when log4j isn't present. Since the user _may_ add a log4j jar to the CLASSPATH, we avoid erroring out when CLASSPATH is non-empty Conflicts: assemble/bin/accumulo Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/6425c37d Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/6425c37d Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/6425c37d Branch: refs/heads/1.6 Commit: 6425c37dc5ad13b5b9a9cf8151f53a76be845a03 Parents: 48ad87a Author: Josh Elser <els...@apache.org> Authored: Wed Aug 5 12:30:24 2015 -0400 Committer: Josh Elser <els...@apache.org> Committed: Wed Aug 5 12:36:19 2015 -0400 ---------------------------------------------------------------------- assemble/bin/accumulo | 8 ++++++++ 1 file changed, 8 insertions(+) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/accumulo/blob/6425c37d/assemble/bin/accumulo ---------------------------------------------------------------------- diff --git a/assemble/bin/accumulo b/assemble/bin/accumulo index 0c6c137..301d9a3 100755 --- a/assemble/bin/accumulo +++ b/assemble/bin/accumulo @@ -117,6 +117,14 @@ esac XML_FILES="${ACCUMULO_CONF_DIR}" LOG4J_JAR=$(find -H "${HADOOP_PREFIX}/lib" "${HADOOP_PREFIX}"/share/hadoop/common/lib -name 'log4j*.jar' -print 2>/dev/null | head -1) + +# The `find` command could fail for environmental reasons or bad configuration +# Avoid trying to run Accumulo when we can't find the jar +if [ -z "${LOG4J_JAR}" ]; then + echo "Could not locate Log4j jar in Hadoop installation at ${HADOOP_PREFIX}" + exit 1 +fi + CLASSPATH="${XML_FILES}:${START_JAR}:${LOG4J_JAR}" if [ -z "${JAVA_HOME}" -o ! -d "${JAVA_HOME}" ]; then