Repository: incubator-slider Updated Branches: refs/heads/feature/SLIDER-149_Support_a_YARN_service_registry 969b734fc -> 733745eaf
SLIDER-450 rename sample template and resources files for accumulo Project: http://git-wip-us.apache.org/repos/asf/incubator-slider/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-slider/commit/bb4e7d31 Tree: http://git-wip-us.apache.org/repos/asf/incubator-slider/tree/bb4e7d31 Diff: http://git-wip-us.apache.org/repos/asf/incubator-slider/diff/bb4e7d31 Branch: refs/heads/feature/SLIDER-149_Support_a_YARN_service_registry Commit: bb4e7d31704d8d711ff85288166192f7d41d2648 Parents: 43f9a94 Author: Billie Rinaldi <billie.rina...@gmail.com> Authored: Fri Sep 26 07:29:34 2014 -0700 Committer: Billie Rinaldi <billie.rina...@gmail.com> Committed: Fri Sep 26 07:29:34 2014 -0700 ---------------------------------------------------------------------- app-packages/accumulo/appConfig-default.json | 57 ++++++++++++++++++++ app-packages/accumulo/appConfig.json | 57 -------------------- app-packages/accumulo/pom.xml | 2 + app-packages/accumulo/resources-default.json | 39 ++++++++++++++ app-packages/accumulo/resources.json | 39 -------------- app-packages/accumulo/src/assembly/accumulo.xml | 4 +- .../funtest/accumulo/AccumuloBasicIT.groovy | 3 +- 7 files changed, 102 insertions(+), 99 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-slider/blob/bb4e7d31/app-packages/accumulo/appConfig-default.json ---------------------------------------------------------------------- diff --git a/app-packages/accumulo/appConfig-default.json b/app-packages/accumulo/appConfig-default.json new file mode 100644 index 0000000..62050af --- /dev/null +++ b/app-packages/accumulo/appConfig-default.json @@ -0,0 +1,57 @@ +{ + "schema": "http://example.org/specification/v2.0.0";, + "metadata": { + }, + "global": { + "application.def": ".slider/package/ACCUMULO/${app.package.name}.zip", + "java_home": "/usr/lib/jvm/java", + "site.global.app_user": "${app.user}", + "site.global.app_log_dir": "${AGENT_LOG_ROOT}", + "site.global.app_pid_dir": "${AGENT_WORK_ROOT}/app/run", + "site.global.app_root": "${AGENT_WORK_ROOT}/app/install/accumulo-${accumulo.version}", + "site.global.tserver_heapsize": "256m", + "site.global.master_heapsize": "128m", + "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_conf_dir": "/etc/hadoop/conf", + "site.global.zookeeper_home": "${zk.dir}/zookeeper", + "site.global.accumulo_instance_name": "${USER}-${CLUSTER_NAME}", + "site.global.accumulo_root_password": "NOT_USED", + "site.global.user_group": "${app.user.group}", + "site.global.security_enabled": "false", + "site.global.ssl_cert_dir": "ssl", + "site.global.monitor_protocol": "http", + "site.accumulo-site.instance.volumes": "${DEFAULT_DATA_DIR}/data", + "site.accumulo-site.instance.zookeeper.host": "${ZK_HOST}", + "site.accumulo-site.instance.security.authenticator": "org.apache.slider.accumulo.CustomAuthenticator", + "site.accumulo-site.general.security.credential.provider.paths": "jceks://hdfs/user/${USER}/accumulo-${CLUSTER_NAME}.jceks", + "site.accumulo-site.general.kerberos.keytab": "${accumulo.keytab}", + "site.accumulo-site.general.kerberos.principal": "${accumulo.principal}", + "site.accumulo-site.tserver.memory.maps.native.enabled": "false", + "site.accumulo-site.tserver.memory.maps.max": "80M", + "site.accumulo-site.tserver.cache.data.size": "7M", + "site.accumulo-site.tserver.cache.index.size": "20M", + "site.accumulo-site.trace.user": "root", + "site.accumulo-site.tserver.sort.buffer.size": "50M", + "site.accumulo-site.tserver.walog.max.size": "40M", + "site.accumulo-site.master.port.client": "0", + "site.accumulo-site.trace.port.client": "0", + "site.accumulo-site.tserver.port.client": "0", + "site.accumulo-site.gc.port.client": "0", + "site.accumulo-site.monitor.port.client": "${ACCUMULO_MONITOR.ALLOCATED_PORT}", + "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," + }, + "credentials": { + "jceks://hdfs/user/${USER}/accumulo-${CLUSTER_NAME}.jceks": ["root.initial.password", "instance.secret", "trace.token.property.password"] + }, + "components": { + "slider-appmaster": { + "jvm.heapsize": "256M" + } + } +} http://git-wip-us.apache.org/repos/asf/incubator-slider/blob/bb4e7d31/app-packages/accumulo/appConfig.json ---------------------------------------------------------------------- diff --git a/app-packages/accumulo/appConfig.json b/app-packages/accumulo/appConfig.json deleted file mode 100644 index 28fb637..0000000 --- a/app-packages/accumulo/appConfig.json +++ /dev/null @@ -1,57 +0,0 @@ -{ - "schema": "http://example.org/specification/v2.0.0";, - "metadata": { - }, - "global": { - "application.def": ".slider/package/ACCUMULO/${app.package.name}.zip", - "java_home": "/usr/lib/jvm/java", - "site.global.app_user": "${app.user}", - "site.global.app_log_dir": "${AGENT_LOG_ROOT}", - "site.global.app_pid_dir": "${AGENT_WORK_ROOT}/app/run", - "site.global.app_root": "${AGENT_WORK_ROOT}/app/install/accumulo-${accumulo.version}", - "site.global.tserver_heapsize": "256m", - "site.global.master_heapsize": "128m", - "site.global.monitor_heapsize": "64m", - "site.global.gc_heapsize": "64m", - "site.global.other_heapsize": "128m", - "site.global.hadoop_prefix": "/usr/lib/hadoop", - "site.global.hadoop_conf_dir": "/etc/hadoop/conf", - "site.global.zookeeper_home": "/usr/lib/zookeeper", - "site.global.accumulo_instance_name": "${USER}-${CLUSTER_NAME}", - "site.global.accumulo_root_password": "NOT_USED", - "site.global.user_group": "${app.user.group}", - "site.global.security_enabled": "false", - "site.global.ssl_cert_dir": "ssl", - "site.global.monitor_protocol": "http", - "site.accumulo-site.instance.volumes": "${DEFAULT_DATA_DIR}/data", - "site.accumulo-site.instance.zookeeper.host": "${ZK_HOST}", - "site.accumulo-site.instance.security.authenticator": "org.apache.slider.accumulo.CustomAuthenticator", - "site.accumulo-site.general.security.credential.provider.paths": "jceks://hdfs/user/${USER}/accumulo-${CLUSTER_NAME}.jceks", - "site.accumulo-site.general.kerberos.keytab": "${accumulo.keytab}", - "site.accumulo-site.general.kerberos.principal": "${accumulo.principal}", - "site.accumulo-site.tserver.memory.maps.native.enabled": "false", - "site.accumulo-site.tserver.memory.maps.max": "80M", - "site.accumulo-site.tserver.cache.data.size": "7M", - "site.accumulo-site.tserver.cache.index.size": "20M", - "site.accumulo-site.trace.user": "root", - "site.accumulo-site.tserver.sort.buffer.size": "50M", - "site.accumulo-site.tserver.walog.max.size": "40M", - "site.accumulo-site.master.port.client": "0", - "site.accumulo-site.trace.port.client": "0", - "site.accumulo-site.tserver.port.client": "0", - "site.accumulo-site.gc.port.client": "0", - "site.accumulo-site.monitor.port.client": "${ACCUMULO_MONITOR.ALLOCATED_PORT}", - "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/usr/lib/hadoop/.*.jar,\n/usr/lib/hadoop/lib/.*.jar,\n/usr/lib/hadoop-hdfs/.*.jar,\n/usr/lib/hadoop-mapreduce/.*.jar,\n/usr/lib/hadoop-yarn/.*.jar," - }, - "credentials": { - "jceks://hdfs/user/${USER}/accumulo-${CLUSTER_NAME}.jceks": ["root.initial.password", "instance.secret", "trace.token.property.password"] - }, - "components": { - "slider-appmaster": { - "jvm.heapsize": "256M" - } - } -} http://git-wip-us.apache.org/repos/asf/incubator-slider/blob/bb4e7d31/app-packages/accumulo/pom.xml ---------------------------------------------------------------------- diff --git a/app-packages/accumulo/pom.xml b/app-packages/accumulo/pom.xml index 02a0a72..a2014f2 100644 --- a/app-packages/accumulo/pom.xml +++ b/app-packages/accumulo/pom.xml @@ -39,6 +39,8 @@ <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 --> <app.user>yarn</app.user> <app.user.group>hadoop</app.user.group> <accumulo.keytab></accumulo.keytab> http://git-wip-us.apache.org/repos/asf/incubator-slider/blob/bb4e7d31/app-packages/accumulo/resources-default.json ---------------------------------------------------------------------- diff --git a/app-packages/accumulo/resources-default.json b/app-packages/accumulo/resources-default.json new file mode 100644 index 0000000..f9cae60 --- /dev/null +++ b/app-packages/accumulo/resources-default.json @@ -0,0 +1,39 @@ +{ + "schema": "http://example.org/specification/v2.0.0";, + "metadata": { + }, + "global": { + "yarn.log.include.patterns": "", + "yarn.log.exclude.patterns": "", + "yarn.log.interval": "0" + }, + "components": { + "ACCUMULO_MASTER": { + "yarn.role.priority": "1", + "yarn.component.instances": "1", + "yarn.memory": "256" + }, + "slider-appmaster": { + }, + "ACCUMULO_TSERVER": { + "yarn.role.priority": "2", + "yarn.component.instances": "1", + "yarn.memory": "256" + }, + "ACCUMULO_MONITOR": { + "yarn.role.priority": "3", + "yarn.component.instances": "1", + "yarn.memory": "128" + }, + "ACCUMULO_GC": { + "yarn.role.priority": "4", + "yarn.component.instances": "1", + "yarn.memory": "128" + }, + "ACCUMULO_TRACER": { + "yarn.role.priority": "5", + "yarn.component.instances": "1", + "yarn.memory": "256" + } + } +} http://git-wip-us.apache.org/repos/asf/incubator-slider/blob/bb4e7d31/app-packages/accumulo/resources.json ---------------------------------------------------------------------- diff --git a/app-packages/accumulo/resources.json b/app-packages/accumulo/resources.json deleted file mode 100644 index f9cae60..0000000 --- a/app-packages/accumulo/resources.json +++ /dev/null @@ -1,39 +0,0 @@ -{ - "schema": "http://example.org/specification/v2.0.0";, - "metadata": { - }, - "global": { - "yarn.log.include.patterns": "", - "yarn.log.exclude.patterns": "", - "yarn.log.interval": "0" - }, - "components": { - "ACCUMULO_MASTER": { - "yarn.role.priority": "1", - "yarn.component.instances": "1", - "yarn.memory": "256" - }, - "slider-appmaster": { - }, - "ACCUMULO_TSERVER": { - "yarn.role.priority": "2", - "yarn.component.instances": "1", - "yarn.memory": "256" - }, - "ACCUMULO_MONITOR": { - "yarn.role.priority": "3", - "yarn.component.instances": "1", - "yarn.memory": "128" - }, - "ACCUMULO_GC": { - "yarn.role.priority": "4", - "yarn.component.instances": "1", - "yarn.memory": "128" - }, - "ACCUMULO_TRACER": { - "yarn.role.priority": "5", - "yarn.component.instances": "1", - "yarn.memory": "256" - } - } -} http://git-wip-us.apache.org/repos/asf/incubator-slider/blob/bb4e7d31/app-packages/accumulo/src/assembly/accumulo.xml ---------------------------------------------------------------------- diff --git a/app-packages/accumulo/src/assembly/accumulo.xml b/app-packages/accumulo/src/assembly/accumulo.xml index a75d2b1..2a27638 100644 --- a/app-packages/accumulo/src/assembly/accumulo.xml +++ b/app-packages/accumulo/src/assembly/accumulo.xml @@ -29,7 +29,7 @@ <files> <file> - <source>appConfig.json</source> + <source>appConfig-default.json</source> <outputDirectory>/</outputDirectory> <filtered>true</filtered> <fileMode>0755</fileMode> @@ -63,7 +63,7 @@ <exclude>pom.xml</exclude> <exclude>src/**</exclude> <exclude>target/**</exclude> - <exclude>appConfig.json</exclude> + <exclude>appConfig-default.json</exclude> <exclude>metainfo.xml</exclude> </excludes> <fileMode>0755</fileMode> http://git-wip-us.apache.org/repos/asf/incubator-slider/blob/bb4e7d31/app-packages/accumulo/src/test/groovy/org/apache/slider/funtest/accumulo/AccumuloBasicIT.groovy ---------------------------------------------------------------------- diff --git a/app-packages/accumulo/src/test/groovy/org/apache/slider/funtest/accumulo/AccumuloBasicIT.groovy b/app-packages/accumulo/src/test/groovy/org/apache/slider/funtest/accumulo/AccumuloBasicIT.groovy index 475c4e3..dad7601 100644 --- a/app-packages/accumulo/src/test/groovy/org/apache/slider/funtest/accumulo/AccumuloBasicIT.groovy +++ b/app-packages/accumulo/src/test/groovy/org/apache/slider/funtest/accumulo/AccumuloBasicIT.groovy @@ -57,7 +57,8 @@ class AccumuloBasicIT extends AccumuloAgentCommandTestBase { Configuration conf = new Configuration() FileSystem fs = FileSystem.getLocal(conf) InputStream stream = SliderUtils.getApplicationResourceInputStream( - fs, new Path(TEST_APP_PKG_DIR, TEST_APP_PKG_FILE), "appConfig.json"); + fs, new Path(TEST_APP_PKG_DIR, TEST_APP_PKG_FILE), + "appConfig-default.json"); assert stream!=null, "Couldn't pull appConfig.json from app pkg" ConfTreeSerDeser c = new ConfTreeSerDeser() ConfTree t = c.fromStream(stream)
