ACCUMULO-804 pick up the new location of the hadoop jars git-svn-id: https://svn.apache.org/repos/asf/accumulo/branches/1.5@1456640 13f79535-47bb-0310-9956-ffa450edef68 (cherry picked from commit 21780bd2950df7e72a8b1bd3ddef5017b07b63ad)
Reason: Hadoop2 Compat Author: Eric C. Newton <e...@apache.org> Ref: ACCUMULO-1792 Skips changes to MiniAccumuloCluster that were already present in backport. Signed-off-by: Eric Newton <eric.new...@gmail.com> Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/4f7fb04b Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/4f7fb04b Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/4f7fb04b Branch: refs/heads/1.4.5-SNAPSHOT Commit: 4f7fb04b0b485377daa7d0bd0985994d1ce86173 Parents: 3a35096 Author: Sean Busbey <bus...@cloudera.com> Authored: Sun Oct 27 23:24:49 2013 -0400 Committer: Eric Newton <eric.new...@gmail.com> Committed: Mon Nov 25 16:06:44 2013 -0500 ---------------------------------------------------------------------- bin/accumulo | 17 +++++++++++++++-- .../1GB/native-standalone/accumulo-env.sh | 2 ++ .../1GB/native-standalone/accumulo-site.xml | 7 +++++++ conf/examples/1GB/standalone/accumulo-env.sh | 2 ++ conf/examples/1GB/standalone/accumulo-site.xml | 7 +++++++ .../2GB/native-standalone/accumulo-env.sh | 2 ++ .../2GB/native-standalone/accumulo-site.xml | 7 +++++++ conf/examples/2GB/standalone/accumulo-env.sh | 2 ++ .../3GB/native-standalone/accumulo-env.sh | 2 ++ .../3GB/native-standalone/accumulo-site.xml | 7 +++++++ conf/examples/3GB/standalone/accumulo-env.sh | 2 ++ conf/examples/3GB/standalone/accumulo-site.xml | 7 +++++++ .../512MB/native-standalone/accumulo-env.sh | 2 ++ .../512MB/native-standalone/accumulo-site.xml | 7 +++++++ conf/examples/512MB/standalone/accumulo-env.sh | 2 ++ conf/examples/512MB/standalone/accumulo-site.xml | 7 +++++++ .../start/classloader/AccumuloClassLoader.java | 18 ++++++++++++------ 17 files changed, 92 insertions(+), 8 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/accumulo/blob/4f7fb04b/bin/accumulo ---------------------------------------------------------------------- diff --git a/bin/accumulo b/bin/accumulo index bbca3f0..e2a89e9 100755 --- a/bin/accumulo +++ b/bin/accumulo @@ -131,6 +131,19 @@ CLASSPATH=${XML_FILES}:${START_JAR}:${COMMONS_JCI_JARS} JAVA=$JAVA_HOME/bin/java PLATFORM="`$JAVA -cp $CLASSPATH org.apache.accumulo.start.Platform`" - +# hadoop 1.0, 1.1 +LIB_PATH="$HADOOP_PREFIX/lib/native/$PLATFORM" +if [ ! -d "$LIB_PATH" ]; then + # hadoop-2.0 + LIB_PATH=$HADOOP_PREFIX/lib/native +fi +# # app isn't used anywhere, but it makes the process easier to spot when ps/top/snmp truncate the command line -exec $JAVA "-Dapp=$1" -classpath $CLASSPATH $ACCUMULO_OPTS -XX:OnOutOfMemoryError="${ACCUMULO_KILL_CMD:-kill -9 %p}" -Djavax.xml.parsers.DocumentBuilderFactory=com.sun.org.apache.xerces.internal.jaxp.DocumentBuilderFactoryImpl -Djava.library.path="$HADOOP_PREFIX/lib/native/$PLATFORM" -Dorg.apache.accumulo.core.home.dir="$ACCUMULO_HOME" -Dhadoop.home.dir="$HADOOP_PREFIX" -Dhadoop.conf.dir="$HADOOP_CONF_DIR" -Dzookeeper.home.dir="$ZOOKEEPER_HOME" org.apache.accumulo.start.Main "$@" +exec $JAVA "-Dapp=$1" $ACCUMULO_OPTS -classpath $CLASSPATH -XX:OnOutOfMemoryError="${ACCUMULO_KILL_CMD:-kill -9 %p}" \ + -Djavax.xml.parsers.DocumentBuilderFactory=com.sun.org.apache.xerces.internal.jaxp.DocumentBuilderFactoryImpl \ + -Djava.library.path="$LIB_PATH" \ + -Dorg.apache.accumulo.core.home.dir="$ACCUMULO_HOME" \ + -Dhadoop.home.dir="$HADOOP_PREFIX" \ + -Dzookeeper.home.dir="$ZOOKEEPER_HOME" \ + org.apache.accumulo.start.Main \ + "$@" http://git-wip-us.apache.org/repos/asf/accumulo/blob/4f7fb04b/conf/examples/1GB/native-standalone/accumulo-env.sh ---------------------------------------------------------------------- diff --git a/conf/examples/1GB/native-standalone/accumulo-env.sh b/conf/examples/1GB/native-standalone/accumulo-env.sh index 15caef6..e301eb8 100755 --- a/conf/examples/1GB/native-standalone/accumulo-env.sh +++ b/conf/examples/1GB/native-standalone/accumulo-env.sh @@ -35,6 +35,8 @@ else unset HADOOP_HOME fi test -z "$HADOOP_CONF_DIR" && export HADOOP_CONF_DIR="$HADOOP_PREFIX/conf" +# hadoop-2.0: +# test -z "$HADOOP_CONF_DIR" && export HADOOP_CONF_DIR="$HADOOP_PREFIX/etc/hadoop" test -z "$JAVA_HOME" && export JAVA_HOME=/path/to/java http://git-wip-us.apache.org/repos/asf/accumulo/blob/4f7fb04b/conf/examples/1GB/native-standalone/accumulo-site.xml ---------------------------------------------------------------------- diff --git a/conf/examples/1GB/native-standalone/accumulo-site.xml b/conf/examples/1GB/native-standalone/accumulo-site.xml index 97f70d5..e995bfe 100644 --- a/conf/examples/1GB/native-standalone/accumulo-site.xml +++ b/conf/examples/1GB/native-standalone/accumulo-site.xml @@ -94,6 +94,13 @@ <property> <name>general.classpaths</name> + <!-- + Add the following for hadoop-2.0 + $HADOOP_PREFIX/share/hadoop/common/.*.jar, + $HADOOP_PREFIX/share/hadoop/common/lib/.*.jar, + $HADOOP_PREFIX/share/hadoop/hdfs/.*.jar, + $HADOOP_PREFIX/share/hadoop/mapreduce/.*.jar, + --> <value> $ACCUMULO_HOME/src/server/target/classes/, $ACCUMULO_HOME/src/core/target/classes/, http://git-wip-us.apache.org/repos/asf/accumulo/blob/4f7fb04b/conf/examples/1GB/standalone/accumulo-env.sh ---------------------------------------------------------------------- diff --git a/conf/examples/1GB/standalone/accumulo-env.sh b/conf/examples/1GB/standalone/accumulo-env.sh index 5c54a39..9abb597 100755 --- a/conf/examples/1GB/standalone/accumulo-env.sh +++ b/conf/examples/1GB/standalone/accumulo-env.sh @@ -35,6 +35,8 @@ else unset HADOOP_HOME fi test -z "$HADOOP_CONF_DIR" && export HADOOP_CONF_DIR="$HADOOP_PREFIX/conf" +# hadoop-2.0: +# test -z "$HADOOP_CONF_DIR" && export HADOOP_CONF_DIR="$HADOOP_PREFIX/etc/hadoop" test -z "$JAVA_HOME" && export JAVA_HOME=/path/to/java http://git-wip-us.apache.org/repos/asf/accumulo/blob/4f7fb04b/conf/examples/1GB/standalone/accumulo-site.xml ---------------------------------------------------------------------- diff --git a/conf/examples/1GB/standalone/accumulo-site.xml b/conf/examples/1GB/standalone/accumulo-site.xml index f857fd0..cf081a7 100644 --- a/conf/examples/1GB/standalone/accumulo-site.xml +++ b/conf/examples/1GB/standalone/accumulo-site.xml @@ -89,6 +89,13 @@ <property> <name>general.classpaths</name> + <!-- + Add the following for hadoop-2.0 + $HADOOP_PREFIX/share/hadoop/common/.*.jar, + $HADOOP_PREFIX/share/hadoop/common/lib/.*.jar, + $HADOOP_PREFIX/share/hadoop/hdfs/.*.jar, + $HADOOP_PREFIX/share/hadoop/mapreduce/.*.jar, + --> <value> $ACCUMULO_HOME/src/server/target/classes/, $ACCUMULO_HOME/src/core/target/classes/, http://git-wip-us.apache.org/repos/asf/accumulo/blob/4f7fb04b/conf/examples/2GB/native-standalone/accumulo-env.sh ---------------------------------------------------------------------- diff --git a/conf/examples/2GB/native-standalone/accumulo-env.sh b/conf/examples/2GB/native-standalone/accumulo-env.sh index 4f93bb4..701d6e5 100755 --- a/conf/examples/2GB/native-standalone/accumulo-env.sh +++ b/conf/examples/2GB/native-standalone/accumulo-env.sh @@ -35,6 +35,8 @@ else unset HADOOP_HOME fi test -z "$HADOOP_CONF_DIR" && export HADOOP_CONF_DIR="$HADOOP_PREFIX/conf" +# hadoop-2.0: +# test -z "$HADOOP_CONF_DIR" && export HADOOP_CONF_DIR="$HADOOP_PREFIX/etc/hadoop" test -z "$JAVA_HOME" && export JAVA_HOME=/path/to/java test -z "$ZOOKEEPER_HOME" && export ZOOKEEPER_HOME=/path/to/zookeeper http://git-wip-us.apache.org/repos/asf/accumulo/blob/4f7fb04b/conf/examples/2GB/native-standalone/accumulo-site.xml ---------------------------------------------------------------------- diff --git a/conf/examples/2GB/native-standalone/accumulo-site.xml b/conf/examples/2GB/native-standalone/accumulo-site.xml index 3988e66..835e0fb 100644 --- a/conf/examples/2GB/native-standalone/accumulo-site.xml +++ b/conf/examples/2GB/native-standalone/accumulo-site.xml @@ -84,6 +84,13 @@ <property> <name>general.classpaths</name> + <!-- + Add the following for hadoop-2.0 + $HADOOP_PREFIX/share/hadoop/common/.*.jar, + $HADOOP_PREFIX/share/hadoop/common/lib/.*.jar, + $HADOOP_PREFIX/share/hadoop/hdfs/.*.jar, + $HADOOP_PREFIX/share/hadoop/mapreduce/.*.jar, + --> <value> $ACCUMULO_HOME/src/server/target/classes/, $ACCUMULO_HOME/src/core/target/classes/, http://git-wip-us.apache.org/repos/asf/accumulo/blob/4f7fb04b/conf/examples/2GB/standalone/accumulo-env.sh ---------------------------------------------------------------------- diff --git a/conf/examples/2GB/standalone/accumulo-env.sh b/conf/examples/2GB/standalone/accumulo-env.sh index 4595783..adb95b1 100755 --- a/conf/examples/2GB/standalone/accumulo-env.sh +++ b/conf/examples/2GB/standalone/accumulo-env.sh @@ -35,6 +35,8 @@ else unset HADOOP_HOME fi test -z "$HADOOP_CONF_DIR" && export HADOOP_CONF_DIR="$HADOOP_PREFIX/conf" +# hadoop-2.0: +# test -z "$HADOOP_CONF_DIR" && export HADOOP_CONF_DIR="$HADOOP_PREFIX/etc/hadoop" test -z "$JAVA_HOME" && export JAVA_HOME=/path/to/java http://git-wip-us.apache.org/repos/asf/accumulo/blob/4f7fb04b/conf/examples/3GB/native-standalone/accumulo-env.sh ---------------------------------------------------------------------- diff --git a/conf/examples/3GB/native-standalone/accumulo-env.sh b/conf/examples/3GB/native-standalone/accumulo-env.sh index d5484be..51f96a1 100755 --- a/conf/examples/3GB/native-standalone/accumulo-env.sh +++ b/conf/examples/3GB/native-standalone/accumulo-env.sh @@ -35,6 +35,8 @@ else unset HADOOP_HOME fi test -z "$HADOOP_CONF_DIR" && export HADOOP_CONF_DIR="$HADOOP_PREFIX/conf" +# hadoop-2.0: +# test -z "$HADOOP_CONF_DIR" && export HADOOP_CONF_DIR="$HADOOP_PREFIX/etc/hadoop" test -z "$JAVA_HOME" && export JAVA_HOME=/path/to/java test -z "$ZOOKEEPER_HOME" && export ZOOKEEPER_HOME=/path/to/zookeeper http://git-wip-us.apache.org/repos/asf/accumulo/blob/4f7fb04b/conf/examples/3GB/native-standalone/accumulo-site.xml ---------------------------------------------------------------------- diff --git a/conf/examples/3GB/native-standalone/accumulo-site.xml b/conf/examples/3GB/native-standalone/accumulo-site.xml index 4509c96..5709556 100644 --- a/conf/examples/3GB/native-standalone/accumulo-site.xml +++ b/conf/examples/3GB/native-standalone/accumulo-site.xml @@ -79,6 +79,13 @@ <property> <name>general.classpaths</name> + <!-- + Add the following for hadoop-2.0 + $HADOOP_PREFIX/share/hadoop/common/.*.jar, + $HADOOP_PREFIX/share/hadoop/common/lib/.*.jar, + $HADOOP_PREFIX/share/hadoop/hdfs/.*.jar, + $HADOOP_PREFIX/share/hadoop/mapreduce/.*.jar, + --> <value> $ACCUMULO_HOME/src/server/target/classes/, $ACCUMULO_HOME/src/core/target/classes/, http://git-wip-us.apache.org/repos/asf/accumulo/blob/4f7fb04b/conf/examples/3GB/standalone/accumulo-env.sh ---------------------------------------------------------------------- diff --git a/conf/examples/3GB/standalone/accumulo-env.sh b/conf/examples/3GB/standalone/accumulo-env.sh index 10b1803..ad89755 100755 --- a/conf/examples/3GB/standalone/accumulo-env.sh +++ b/conf/examples/3GB/standalone/accumulo-env.sh @@ -35,6 +35,8 @@ else unset HADOOP_HOME fi test -z "$HADOOP_CONF_DIR" && export HADOOP_CONF_DIR="$HADOOP_PREFIX/conf" +# hadoop-2.0: +# test -z "$HADOOP_CONF_DIR" && export HADOOP_CONF_DIR="$HADOOP_PREFIX/etc/hadoop" test -z "$JAVA_HOME" && export JAVA_HOME=/path/to/java test -z "$ZOOKEEPER_HOME" && export ZOOKEEPER_HOME=/path/to/zookeeper http://git-wip-us.apache.org/repos/asf/accumulo/blob/4f7fb04b/conf/examples/3GB/standalone/accumulo-site.xml ---------------------------------------------------------------------- diff --git a/conf/examples/3GB/standalone/accumulo-site.xml b/conf/examples/3GB/standalone/accumulo-site.xml index 4509c96..5709556 100644 --- a/conf/examples/3GB/standalone/accumulo-site.xml +++ b/conf/examples/3GB/standalone/accumulo-site.xml @@ -79,6 +79,13 @@ <property> <name>general.classpaths</name> + <!-- + Add the following for hadoop-2.0 + $HADOOP_PREFIX/share/hadoop/common/.*.jar, + $HADOOP_PREFIX/share/hadoop/common/lib/.*.jar, + $HADOOP_PREFIX/share/hadoop/hdfs/.*.jar, + $HADOOP_PREFIX/share/hadoop/mapreduce/.*.jar, + --> <value> $ACCUMULO_HOME/src/server/target/classes/, $ACCUMULO_HOME/src/core/target/classes/, http://git-wip-us.apache.org/repos/asf/accumulo/blob/4f7fb04b/conf/examples/512MB/native-standalone/accumulo-env.sh ---------------------------------------------------------------------- diff --git a/conf/examples/512MB/native-standalone/accumulo-env.sh b/conf/examples/512MB/native-standalone/accumulo-env.sh index 750da89..b3b733d 100755 --- a/conf/examples/512MB/native-standalone/accumulo-env.sh +++ b/conf/examples/512MB/native-standalone/accumulo-env.sh @@ -35,6 +35,8 @@ else unset HADOOP_HOME fi test -z "$HADOOP_CONF_DIR" && export HADOOP_CONF_DIR="$HADOOP_PREFIX/conf" +# hadoop-2.0: +# test -z "$HADOOP_CONF_DIR" && export HADOOP_CONF_DIR="$HADOOP_PREFIX/etc/hadoop" test -z "$JAVA_HOME" && export JAVA_HOME=/path/to/java test -z "$ZOOKEEPER_HOME" && export ZOOKEEPER_HOME=/path/to/zookeeper http://git-wip-us.apache.org/repos/asf/accumulo/blob/4f7fb04b/conf/examples/512MB/native-standalone/accumulo-site.xml ---------------------------------------------------------------------- diff --git a/conf/examples/512MB/native-standalone/accumulo-site.xml b/conf/examples/512MB/native-standalone/accumulo-site.xml index 7d22ab2..7f7d88d 100644 --- a/conf/examples/512MB/native-standalone/accumulo-site.xml +++ b/conf/examples/512MB/native-standalone/accumulo-site.xml @@ -89,6 +89,13 @@ <property> <name>general.classpaths</name> + <!-- + Add the following for hadoop-2.0 + $HADOOP_PREFIX/share/hadoop/common/.*.jar, + $HADOOP_PREFIX/share/hadoop/common/lib/.*.jar, + $HADOOP_PREFIX/share/hadoop/hdfs/.*.jar, + $HADOOP_PREFIX/share/hadoop/mapreduce/.*.jar, + --> <value> $ACCUMULO_HOME/src/server/target/classes/, $ACCUMULO_HOME/src/core/target/classes/, http://git-wip-us.apache.org/repos/asf/accumulo/blob/4f7fb04b/conf/examples/512MB/standalone/accumulo-env.sh ---------------------------------------------------------------------- diff --git a/conf/examples/512MB/standalone/accumulo-env.sh b/conf/examples/512MB/standalone/accumulo-env.sh index bf21762..975e20c 100755 --- a/conf/examples/512MB/standalone/accumulo-env.sh +++ b/conf/examples/512MB/standalone/accumulo-env.sh @@ -35,6 +35,8 @@ else unset HADOOP_HOME fi test -z "$HADOOP_CONF_DIR" && export HADOOP_CONF_DIR="$HADOOP_PREFIX/conf" +# hadoop-2.0: +# test -z "$HADOOP_CONF_DIR" && export HADOOP_CONF_DIR="$HADOOP_PREFIX/etc/hadoop" test -z "$JAVA_HOME" && export JAVA_HOME=/path/to/java test -z "$ZOOKEEPER_HOME" && export ZOOKEEPER_HOME=/path/to/zookeeper http://git-wip-us.apache.org/repos/asf/accumulo/blob/4f7fb04b/conf/examples/512MB/standalone/accumulo-site.xml ---------------------------------------------------------------------- diff --git a/conf/examples/512MB/standalone/accumulo-site.xml b/conf/examples/512MB/standalone/accumulo-site.xml index 34868b5..99a5153 100644 --- a/conf/examples/512MB/standalone/accumulo-site.xml +++ b/conf/examples/512MB/standalone/accumulo-site.xml @@ -89,6 +89,13 @@ <property> <name>general.classpaths</name> + <!-- + Add the following for hadoop-2.0 + $HADOOP_PREFIX/share/hadoop/common/.*.jar, + $HADOOP_PREFIX/share/hadoop/common/lib/.*.jar, + $HADOOP_PREFIX/share/hadoop/hdfs/.*.jar, + $HADOOP_PREFIX/share/hadoop/mapreduce/.*.jar, + --> <value> $ACCUMULO_HOME/src/server/target/classes/, $ACCUMULO_HOME/src/core/target/classes/, http://git-wip-us.apache.org/repos/asf/accumulo/blob/4f7fb04b/src/start/src/main/java/org/apache/accumulo/start/classloader/AccumuloClassLoader.java ---------------------------------------------------------------------- diff --git a/src/start/src/main/java/org/apache/accumulo/start/classloader/AccumuloClassLoader.java b/src/start/src/main/java/org/apache/accumulo/start/classloader/AccumuloClassLoader.java index ff02d13..5a30b78 100644 --- a/src/start/src/main/java/org/apache/accumulo/start/classloader/AccumuloClassLoader.java +++ b/src/start/src/main/java/org/apache/accumulo/start/classloader/AccumuloClassLoader.java @@ -106,12 +106,18 @@ public class AccumuloClassLoader { public static final String DYNAMIC_CLASSPATH_PROPERTY_NAME = "general.dynamic.classpaths"; - public static final String ACCUMULO_CLASSPATH_VALUE = - "$ACCUMULO_CONF_DIR,\n" - + "$ACCUMULO_HOME/lib/[^.].*.jar,\n" - + "$ZOOKEEPER_HOME/zookeeper[^.].*.jar,\n" - + "$HADOOP_PREFIX/[^.].*.jar,\n" + "$HADOOP_CONF_DIR,\n" - + "$HADOOP_PREFIX/lib/[^.].*.jar,\n"; + public static final String ACCUMULO_CLASSPATH_VALUE = + "$ACCUMULO_CONF_DIR,\n" + + "$ACCUMULO_HOME/lib/[^.].*.jar,\n" + + "$ZOOKEEPER_HOME/zookeeper[^.].*.jar,\n" + + "$HADOOP_CONF_DIR,\n" + + "$HADOOP_PREFIX/[^.].*.jar,\n" + + "$HADOOP_PREFIX/lib/[^.].*.jar,\n" + + "$HADOOP_PREFIX/share/hadoop/common/.*.jar,\n" + + "$HADOOP_PREFIX/share/hadoop/common/lib/.*.jar,\n" + + "$HADOOP_PREFIX/share/hadoop/hdfs/.*.jar,\n" + + "$HADOOP_PREFIX/share/hadoop/mapreduce/.*.jar,\n" + ; /** * Dynamic classpath. These locations will be monitored for changes.
