SLIDER-493 configurable hadoop directories for accumulo app package
Project: http://git-wip-us.apache.org/repos/asf/incubator-slider/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-slider/commit/7d2aeb0d Tree: http://git-wip-us.apache.org/repos/asf/incubator-slider/tree/7d2aeb0d Diff: http://git-wip-us.apache.org/repos/asf/incubator-slider/diff/7d2aeb0d Branch: refs/heads/feature/SLIDER-481_allow_dedicated_handling_of_exports Commit: 7d2aeb0de92258bbc4a5ab1c16ef647df3aa6bc9 Parents: 0419a5a Author: Billie Rinaldi <billie.rina...@gmail.com> Authored: Tue Oct 7 18:26:58 2014 -0700 Committer: Billie Rinaldi <billie.rina...@gmail.com> Committed: Tue Oct 7 18:26:58 2014 -0700 ---------------------------------------------------------------------- app-packages/accumulo/appConfig-default.json | 6 +++--- app-packages/accumulo/pom.xml | 7 +++++-- 2 files changed, 8 insertions(+), 5 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-slider/blob/7d2aeb0d/app-packages/accumulo/appConfig-default.json ---------------------------------------------------------------------- diff --git a/app-packages/accumulo/appConfig-default.json b/app-packages/accumulo/appConfig-default.json index 9e04564..b33261c 100644 --- a/app-packages/accumulo/appConfig-default.json +++ b/app-packages/accumulo/appConfig-default.json @@ -14,9 +14,9 @@ "site.global.monitor_heapsize": "64m", "site.global.gc_heapsize": "64m", "site.global.other_heapsize": "128m", - "site.global.hadoop_prefix": "${hadoop.dir}/hadoop", + "site.global.hadoop_prefix": "${hadoop.dir}", "site.global.hadoop_conf_dir": "/etc/hadoop/conf", - "site.global.zookeeper_home": "${zk.dir}/zookeeper", + "site.global.zookeeper_home": "${zk.dir}", "site.global.accumulo_instance_name": "${USER}-${CLUSTER_NAME}", "site.global.accumulo_root_password": "NOT_USED", "site.global.user_group": "${app.user.group}", @@ -44,7 +44,7 @@ "site.accumulo-site.monitor.port.log4j": "0", "site.accumulo-site.master.replication.coordinator.port": "0", "site.accumulo-site.replication.receipt.service.port": "0", - "site.accumulo-site.general.classpaths": "$ACCUMULO_HOME/lib/accumulo-server.jar,\n$ACCUMULO_HOME/lib/accumulo-core.jar,\n$ACCUMULO_HOME/lib/accumulo-start.jar,\n$ACCUMULO_HOME/lib/accumulo-fate.jar,\n$ACCUMULO_HOME/lib/accumulo-proxy.jar,\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$HADOOP_PREFIX/share/hadoop/yarn/.*.jar,\n${hadoop.dir}/hadoop/.*.jar,\n${hadoop.dir}/hadoop/lib/.*.jar,\n${hadoop.dir}/hadoop-hdfs/.*.jar,\n${hadoop.dir}/hadoop-mapreduce/.*.jar,\n${hadoop.dir}/hadoop-yarn/.*.jar," + "site.accumulo-site.general.classpaths": "$ACCUMULO_HOME/lib/accumulo-server.jar,\n$ACCUMULO_HOME/lib/accumulo-core.jar,\n$ACCUMULO_HOME/lib/accumulo-start.jar,\n$ACCUMULO_HOME/lib/accumulo-fate.jar,\n$ACCUMULO_HOME/lib/accumulo-proxy.jar,\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$HADOOP_PREFIX/share/hadoop/yarn/.*.jar,\n${hadoop.dir}/.*.jar,\n${hadoop.dir}/lib/.*.jar,\n${hdfs.dir}/.*.jar,\n${mapred.dir}/.*.jar,\n${yarn.dir}/.*.jar," }, "credentials": { "jceks://hdfs/user/${USER}/accumulo-${CLUSTER_NAME}.jceks": ["root.initial.password", "instance.secret", "trace.token.property.password"] http://git-wip-us.apache.org/repos/asf/incubator-slider/blob/7d2aeb0d/app-packages/accumulo/pom.xml ---------------------------------------------------------------------- diff --git a/app-packages/accumulo/pom.xml b/app-packages/accumulo/pom.xml index 4cd5cca..5dae559 100644 --- a/app-packages/accumulo/pom.xml +++ b/app-packages/accumulo/pom.xml @@ -39,8 +39,11 @@ <test.app.pkg.dir>${project.build.directory}</test.app.pkg.dir> <test.app.resources.dir>${project.build.directory}/test-config</test.app.resources.dir> <!-- these properties are used in the default and the test appConfigs --> - <hadoop.dir>/usr/lib</hadoop.dir> <!-- hadoop expected to be found at ${hadoop.dir}/hadoop --> - <zk.dir>${hadoop.dir}</zk.dir> <!-- zookeeper expected to be found at ${zk.dir}/zookeeper --> + <hadoop.dir>/usr/lib/hadoop</hadoop.dir> + <hdfs.dir>/usr/lib/hadoop-hdfs</hdfs.dir> + <yarn.dir>/usr/lib/hadoop-yarn</yarn.dir> + <mapred.dir>/usr/lib/hadoop-mapred</mapred.dir> + <zk.dir>/usr/lib/zookeeper</zk.dir> <app.java.home>${java.home}</app.java.home> <app.user>yarn</app.user> <app.user.group>hadoop</app.user.group>