SLIDER-450. The template and resources json files embedded within the app package should be named default and include comments to that effect
Project: http://git-wip-us.apache.org/repos/asf/incubator-slider/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-slider/commit/772759c3 Tree: http://git-wip-us.apache.org/repos/asf/incubator-slider/tree/772759c3 Diff: http://git-wip-us.apache.org/repos/asf/incubator-slider/diff/772759c3 Branch: refs/heads/feature/SLIDER-158_slider_diagnostic_option Commit: 772759c305bd11e940a4fa0f4f2d7994d1581471 Parents: ed960d3 Author: Sumit Mohanty <[email protected]> Authored: Thu Sep 25 22:25:49 2014 -0700 Committer: Sumit Mohanty <[email protected]> Committed: Thu Sep 25 22:25:49 2014 -0700 ---------------------------------------------------------------------- app-packages/accumulo/README.txt | 9 ++-- app-packages/app-pkg-template/README.txt | 7 ++- .../app-pkg-template/appConfig-default.json | 21 +++++++++ app-packages/app-pkg-template/appConfig.json | 21 --------- .../app-pkg-template/resources-default.json | 16 +++++++ app-packages/app-pkg-template/resources.json | 16 ------- app-packages/hbase-win/README.txt | 8 ++-- app-packages/hbase/README.txt | 7 ++- app-packages/memcached-win/README.txt | 7 ++- .../memcached-win/appConfig-default.json | 24 ++++++++++ app-packages/memcached-win/appConfig.json | 24 ---------- .../memcached-win/resources-default.json | 16 +++++++ app-packages/memcached-win/resources.json | 16 ------- app-packages/memcached/README.txt | 7 ++- app-packages/memcached/appConfig-default.json | 24 ++++++++++ app-packages/memcached/appConfig.json | 24 ---------- app-packages/memcached/resources-default.json | 16 +++++++ app-packages/memcached/resources.json | 16 ------- app-packages/storm/README.txt | 7 ++- app-packages/storm/appConfig-default.json | 46 ++++++++++++++++++++ app-packages/storm/appConfig.json | 46 -------------------- app-packages/storm/resources-default.json | 34 +++++++++++++++ app-packages/storm/resources.json | 34 --------------- app-packages/storm/src/assembly/storm.xml | 4 +- 24 files changed, 222 insertions(+), 228 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-slider/blob/772759c3/app-packages/accumulo/README.txt ---------------------------------------------------------------------- diff --git a/app-packages/accumulo/README.txt b/app-packages/accumulo/README.txt index f75814c..3a857ee 100644 --- a/app-packages/accumulo/README.txt +++ b/app-packages/accumulo/README.txt @@ -32,10 +32,9 @@ slider version, and in the second case it will match the pkg.version Verify the content using zip -Tv slider-accumulo-app-package*.zip -While appConfig.json and resources.json are not required for the package they -work well as the default configuration for Slider apps. So it is advisable that -when you create an application package for Slider, include sample/default -resources.json and appConfig.json for a minimal Yarn cluster. +appConfig-default.json and resources-default.json are not required to be packaged. +These files are included as reference configuration for Slider apps and are suitable +for a one-node cluster. In the maven packaging case, the version of Accumulo used for the app package can be adjusted by adding a flag such as @@ -45,7 +44,7 @@ can be adjusted by adding a flag such as package are designed for Accumulo 1.6.0 only and may need to be modified to be applicable for other versions of the app package. -Note also that the sample appConfig.json provided only works with Accumulo 1.6, +Note also that the sample appConfig-default.json provided only works with Accumulo 1.6, while for Accumulo 1.5 the instance.volumes property must be replaced with instance.dfs.dir (and it cannot use the provided variable ${DEFAULT_DATA_DIR} which is an HDFS URI). http://git-wip-us.apache.org/repos/asf/incubator-slider/blob/772759c3/app-packages/app-pkg-template/README.txt ---------------------------------------------------------------------- diff --git a/app-packages/app-pkg-template/README.txt b/app-packages/app-pkg-template/README.txt index 00dfdbc..266f34f 100644 --- a/app-packages/app-pkg-template/README.txt +++ b/app-packages/app-pkg-template/README.txt @@ -28,7 +28,6 @@ Create a zip package at the root of the package (<slider enlistment>/app-package Verify the content using zip -Tv myapp-1.0.0.zip -While appConfig.json and resources.json are not required for the package they work -well as the default configuration for Slider apps. So its advisable that when you -create an application package for Slider, include sample/default resources.json and -appConfig.json for a one-node Yarn cluster. +appConfig-default.json and resources-default.json are not required to be packaged. +These files are included as reference configuration for Slider apps and are suitable +for a one-node cluster. http://git-wip-us.apache.org/repos/asf/incubator-slider/blob/772759c3/app-packages/app-pkg-template/appConfig-default.json ---------------------------------------------------------------------- diff --git a/app-packages/app-pkg-template/appConfig-default.json b/app-packages/app-pkg-template/appConfig-default.json new file mode 100644 index 0000000..3908030 --- /dev/null +++ b/app-packages/app-pkg-template/appConfig-default.json @@ -0,0 +1,21 @@ +{ + "schema": "http://example.org/specification/v2.0.0";, + "metadata": { + }, + "global": { + "application.def": "myapp-1.0.0.zip", + "java_home": "/usr/jdk64/jdk1.7.0_45", + + "site.global.app_user": "yarn", + "site.global.app_root": "${AGENT_WORK_ROOT}/app/install/myapp-1.0.0", + + "site.global.listen_port": "${MYAPP_COMPONENT.ALLOCATED_PORT}" + }, + "components": { + "slider-appmaster": { + "jvm.heapsize": "256M" + }, + "MYAPP_COMPONENT": { + } + } +} http://git-wip-us.apache.org/repos/asf/incubator-slider/blob/772759c3/app-packages/app-pkg-template/appConfig.json ---------------------------------------------------------------------- diff --git a/app-packages/app-pkg-template/appConfig.json b/app-packages/app-pkg-template/appConfig.json deleted file mode 100644 index 3908030..0000000 --- a/app-packages/app-pkg-template/appConfig.json +++ /dev/null @@ -1,21 +0,0 @@ -{ - "schema": "http://example.org/specification/v2.0.0";, - "metadata": { - }, - "global": { - "application.def": "myapp-1.0.0.zip", - "java_home": "/usr/jdk64/jdk1.7.0_45", - - "site.global.app_user": "yarn", - "site.global.app_root": "${AGENT_WORK_ROOT}/app/install/myapp-1.0.0", - - "site.global.listen_port": "${MYAPP_COMPONENT.ALLOCATED_PORT}" - }, - "components": { - "slider-appmaster": { - "jvm.heapsize": "256M" - }, - "MYAPP_COMPONENT": { - } - } -} http://git-wip-us.apache.org/repos/asf/incubator-slider/blob/772759c3/app-packages/app-pkg-template/resources-default.json ---------------------------------------------------------------------- diff --git a/app-packages/app-pkg-template/resources-default.json b/app-packages/app-pkg-template/resources-default.json new file mode 100644 index 0000000..0e95879 --- /dev/null +++ b/app-packages/app-pkg-template/resources-default.json @@ -0,0 +1,16 @@ +{ + "schema" : "http://example.org/specification/v2.0.0";, + "metadata" : { + }, + "global" : { + }, + "components": { + "slider-appmaster": { + }, + "MYAPP_COMPONENT": { + "yarn.role.priority": "1", + "yarn.component.instances": "1", + "yarn.memory": "256" + } + } +} \ No newline at end of file http://git-wip-us.apache.org/repos/asf/incubator-slider/blob/772759c3/app-packages/app-pkg-template/resources.json ---------------------------------------------------------------------- diff --git a/app-packages/app-pkg-template/resources.json b/app-packages/app-pkg-template/resources.json deleted file mode 100644 index 0e95879..0000000 --- a/app-packages/app-pkg-template/resources.json +++ /dev/null @@ -1,16 +0,0 @@ -{ - "schema" : "http://example.org/specification/v2.0.0";, - "metadata" : { - }, - "global" : { - }, - "components": { - "slider-appmaster": { - }, - "MYAPP_COMPONENT": { - "yarn.role.priority": "1", - "yarn.component.instances": "1", - "yarn.memory": "256" - } - } -} \ No newline at end of file http://git-wip-us.apache.org/repos/asf/incubator-slider/blob/772759c3/app-packages/hbase-win/README.txt ---------------------------------------------------------------------- diff --git a/app-packages/hbase-win/README.txt b/app-packages/hbase-win/README.txt index 6865168..0e64a84 100644 --- a/app-packages/hbase-win/README.txt +++ b/app-packages/hbase-win/README.txt @@ -17,10 +17,10 @@ Create Slider App Package for HBase on Windows -While appConfig.json and resources.json are not required for the package they -work well as the default configuration for Slider apps. So it is advisable that -when you create an application package for Slider, include sample/default -resources.json and appConfig.json for a minimal Yarn cluster. +appConfig-default.json and resources-default.json are not required to be packaged. +These files are included as reference configuration for Slider apps and are suitable +for a one-node cluster. + OPTION-I: Use a downloaded hbase tarball fro Windows http://git-wip-us.apache.org/repos/asf/incubator-slider/blob/772759c3/app-packages/hbase/README.txt ---------------------------------------------------------------------- diff --git a/app-packages/hbase/README.txt b/app-packages/hbase/README.txt index d0e3067..1d59730 100644 --- a/app-packages/hbase/README.txt +++ b/app-packages/hbase/README.txt @@ -17,10 +17,9 @@ Create Slider App Package for HBase -While appConfig.json and resources.json are not required for the package they -work well as the default configuration for Slider apps. So it is advisable that -when you create an application package for Slider, include sample/default -resources.json and appConfig.json for a minimal Yarn cluster. +appConfig-default.json and resources-default.json are not required to be packaged. +These files are included as reference configuration for Slider apps and are suitable +for a one-node cluster. OPTION-I: Use a downloaded tarball OPTION-II: Use the tarball from the local repository http://git-wip-us.apache.org/repos/asf/incubator-slider/blob/772759c3/app-packages/memcached-win/README.txt ---------------------------------------------------------------------- diff --git a/app-packages/memcached-win/README.txt b/app-packages/memcached-win/README.txt index 4d93b91..84d2728 100644 --- a/app-packages/memcached-win/README.txt +++ b/app-packages/memcached-win/README.txt @@ -30,7 +30,6 @@ Create a zip package at the root of the package (<slider enlistment>/app-package Verify the content using unzip -l "$@" jmemcached-1.0.0.zip -While appConfig.json and resources.json are not required for the package they work -well as the default configuration for Slider apps. So its advisable that when you -create an application package for Slider, include sample/default resources.json and -appConfig.json for a minimal Yarn cluster. +appConfig-default.json and resources-default.json are not required to be packaged. +These files are included as reference configuration for Slider apps and are suitable +for a one-node cluster. http://git-wip-us.apache.org/repos/asf/incubator-slider/blob/772759c3/app-packages/memcached-win/appConfig-default.json ---------------------------------------------------------------------- diff --git a/app-packages/memcached-win/appConfig-default.json b/app-packages/memcached-win/appConfig-default.json new file mode 100644 index 0000000..059c712 --- /dev/null +++ b/app-packages/memcached-win/appConfig-default.json @@ -0,0 +1,24 @@ +{ + "schema": "http://example.org/specification/v2.0.0";, + "metadata": { + }, + "global": { + "application.def": ".slider/package/MEMCACHED/jmemcached-1.0.0.zip", + "java_home": "C:\\java", + + "site.global.app_user": "hadoop", + "site.global.pid_file": "${AGENT_WORK_ROOT}/app/run/component.pid", + "site.global.app_root": "${AGENT_WORK_ROOT}\\app\\install", + "site.global.additional_cp": "C:\\hdp\\hadoop-2.4.0.2.1.3.0-1990\\share\\hadoop\\common\\lib\\*", + "site.global.xmx_val": "256m", + "site.global.xms_val": "128m", + "site.global.memory_val": "200M", + "site.global.listen_port": "${MEMCACHED.ALLOCATED_PORT}{PER_CONTAINER}" + + }, + "components": { + "slider-appmaster": { + "jvm.heapsize": "256M" + } + } +} http://git-wip-us.apache.org/repos/asf/incubator-slider/blob/772759c3/app-packages/memcached-win/appConfig.json ---------------------------------------------------------------------- diff --git a/app-packages/memcached-win/appConfig.json b/app-packages/memcached-win/appConfig.json deleted file mode 100644 index 059c712..0000000 --- a/app-packages/memcached-win/appConfig.json +++ /dev/null @@ -1,24 +0,0 @@ -{ - "schema": "http://example.org/specification/v2.0.0";, - "metadata": { - }, - "global": { - "application.def": ".slider/package/MEMCACHED/jmemcached-1.0.0.zip", - "java_home": "C:\\java", - - "site.global.app_user": "hadoop", - "site.global.pid_file": "${AGENT_WORK_ROOT}/app/run/component.pid", - "site.global.app_root": "${AGENT_WORK_ROOT}\\app\\install", - "site.global.additional_cp": "C:\\hdp\\hadoop-2.4.0.2.1.3.0-1990\\share\\hadoop\\common\\lib\\*", - "site.global.xmx_val": "256m", - "site.global.xms_val": "128m", - "site.global.memory_val": "200M", - "site.global.listen_port": "${MEMCACHED.ALLOCATED_PORT}{PER_CONTAINER}" - - }, - "components": { - "slider-appmaster": { - "jvm.heapsize": "256M" - } - } -} http://git-wip-us.apache.org/repos/asf/incubator-slider/blob/772759c3/app-packages/memcached-win/resources-default.json ---------------------------------------------------------------------- diff --git a/app-packages/memcached-win/resources-default.json b/app-packages/memcached-win/resources-default.json new file mode 100644 index 0000000..f0e02ac --- /dev/null +++ b/app-packages/memcached-win/resources-default.json @@ -0,0 +1,16 @@ +{ + "schema" : "http://example.org/specification/v2.0.0";, + "metadata" : { + }, + "global" : { + }, + "components": { + "slider-appmaster": { + }, + "MEMCACHED": { + "yarn.role.priority": "1", + "yarn.component.instances": "1", + "yarn.memory": "256" + } + } +} \ No newline at end of file http://git-wip-us.apache.org/repos/asf/incubator-slider/blob/772759c3/app-packages/memcached-win/resources.json ---------------------------------------------------------------------- diff --git a/app-packages/memcached-win/resources.json b/app-packages/memcached-win/resources.json deleted file mode 100644 index f0e02ac..0000000 --- a/app-packages/memcached-win/resources.json +++ /dev/null @@ -1,16 +0,0 @@ -{ - "schema" : "http://example.org/specification/v2.0.0";, - "metadata" : { - }, - "global" : { - }, - "components": { - "slider-appmaster": { - }, - "MEMCACHED": { - "yarn.role.priority": "1", - "yarn.component.instances": "1", - "yarn.memory": "256" - } - } -} \ No newline at end of file http://git-wip-us.apache.org/repos/asf/incubator-slider/blob/772759c3/app-packages/memcached/README.txt ---------------------------------------------------------------------- diff --git a/app-packages/memcached/README.txt b/app-packages/memcached/README.txt index eed2954..d9d8810 100644 --- a/app-packages/memcached/README.txt +++ b/app-packages/memcached/README.txt @@ -29,7 +29,6 @@ Create a zip package at the root of the package (<slider enlistment>/app-package Verify the content using unzip -l "$@" jmemcached-1.0.0.zip -While appConfig.json and resources.json are not required for the package they work -well as the default configuration for Slider apps. So its advisable that when you -create an application package for Slider, include sample/default resources.json and -appConfig.json for a minimal Yarn cluster. +appConfig-default.json and resources-default.json are not required to be packaged. +These files are included as reference configuration for Slider apps and are suitable +for a one-node cluster. http://git-wip-us.apache.org/repos/asf/incubator-slider/blob/772759c3/app-packages/memcached/appConfig-default.json ---------------------------------------------------------------------- diff --git a/app-packages/memcached/appConfig-default.json b/app-packages/memcached/appConfig-default.json new file mode 100644 index 0000000..7b4aa97 --- /dev/null +++ b/app-packages/memcached/appConfig-default.json @@ -0,0 +1,24 @@ +{ + "schema": "http://example.org/specification/v2.0.0";, + "metadata": { + }, + "global": { + "application.def": ".slider/package/MEMCACHED/jmemcached-1.0.0.zip", + "java_home": "/usr/jdk64/jdk1.7.0_45", + + "site.global.app_user": "yarn", + "site.global.app_root": "${AGENT_WORK_ROOT}/app/install/jmemcached-1.0.0", + "site.global.pid_file": "${AGENT_WORK_ROOT}/app/run/component.pid", + + "site.global.additional_cp": "/usr/lib/hadoop/lib/*", + "site.global.xmx_val": "256m", + "site.global.xms_val": "128m", + "site.global.memory_val": "200M", + "site.global.listen_port": "${MEMCACHED.ALLOCATED_PORT}{PER_CONTAINER}" + }, + "components": { + "slider-appmaster": { + "jvm.heapsize": "256M" + } + } +} http://git-wip-us.apache.org/repos/asf/incubator-slider/blob/772759c3/app-packages/memcached/appConfig.json ---------------------------------------------------------------------- diff --git a/app-packages/memcached/appConfig.json b/app-packages/memcached/appConfig.json deleted file mode 100644 index 7b4aa97..0000000 --- a/app-packages/memcached/appConfig.json +++ /dev/null @@ -1,24 +0,0 @@ -{ - "schema": "http://example.org/specification/v2.0.0";, - "metadata": { - }, - "global": { - "application.def": ".slider/package/MEMCACHED/jmemcached-1.0.0.zip", - "java_home": "/usr/jdk64/jdk1.7.0_45", - - "site.global.app_user": "yarn", - "site.global.app_root": "${AGENT_WORK_ROOT}/app/install/jmemcached-1.0.0", - "site.global.pid_file": "${AGENT_WORK_ROOT}/app/run/component.pid", - - "site.global.additional_cp": "/usr/lib/hadoop/lib/*", - "site.global.xmx_val": "256m", - "site.global.xms_val": "128m", - "site.global.memory_val": "200M", - "site.global.listen_port": "${MEMCACHED.ALLOCATED_PORT}{PER_CONTAINER}" - }, - "components": { - "slider-appmaster": { - "jvm.heapsize": "256M" - } - } -} http://git-wip-us.apache.org/repos/asf/incubator-slider/blob/772759c3/app-packages/memcached/resources-default.json ---------------------------------------------------------------------- diff --git a/app-packages/memcached/resources-default.json b/app-packages/memcached/resources-default.json new file mode 100644 index 0000000..f0e02ac --- /dev/null +++ b/app-packages/memcached/resources-default.json @@ -0,0 +1,16 @@ +{ + "schema" : "http://example.org/specification/v2.0.0";, + "metadata" : { + }, + "global" : { + }, + "components": { + "slider-appmaster": { + }, + "MEMCACHED": { + "yarn.role.priority": "1", + "yarn.component.instances": "1", + "yarn.memory": "256" + } + } +} \ No newline at end of file http://git-wip-us.apache.org/repos/asf/incubator-slider/blob/772759c3/app-packages/memcached/resources.json ---------------------------------------------------------------------- diff --git a/app-packages/memcached/resources.json b/app-packages/memcached/resources.json deleted file mode 100644 index f0e02ac..0000000 --- a/app-packages/memcached/resources.json +++ /dev/null @@ -1,16 +0,0 @@ -{ - "schema" : "http://example.org/specification/v2.0.0";, - "metadata" : { - }, - "global" : { - }, - "components": { - "slider-appmaster": { - }, - "MEMCACHED": { - "yarn.role.priority": "1", - "yarn.component.instances": "1", - "yarn.memory": "256" - } - } -} \ No newline at end of file http://git-wip-us.apache.org/repos/asf/incubator-slider/blob/772759c3/app-packages/storm/README.txt ---------------------------------------------------------------------- diff --git a/app-packages/storm/README.txt b/app-packages/storm/README.txt index df48305..12dc140 100644 --- a/app-packages/storm/README.txt +++ b/app-packages/storm/README.txt @@ -31,7 +31,6 @@ mvn clean package -Pstorm-app-package -Dpkg.version=0.9.3.2.2.0.0-578 App package can be found in app-packages/storm/target/slider-storm-app-package-${pkg.version}.zip -While appConfig.json and resources.json are not required for the package they work -well as the default configuration for Slider apps. So its advisable that when you -create an application package for Slider, include sample/default resources.json and -appConfig.json for a minimal Yarn cluster. +appConfig-default.json and resources-default.json are not required to be packaged. +These files are included as reference configuration for Slider apps and are suitable +for a one-node cluster. http://git-wip-us.apache.org/repos/asf/incubator-slider/blob/772759c3/app-packages/storm/appConfig-default.json ---------------------------------------------------------------------- diff --git a/app-packages/storm/appConfig-default.json b/app-packages/storm/appConfig-default.json new file mode 100644 index 0000000..683b8cc --- /dev/null +++ b/app-packages/storm/appConfig-default.json @@ -0,0 +1,46 @@ +{ + "schema": "http://example.org/specification/v2.0.0";, + "metadata": { + }, + "global": { + "application.def": ".slider/package/STORM/slider-storm-app-package-${pkg.version}.zip", + "java_home": "/usr/jdk64/jdk1.7.0_45", + "create.default.zookeeper.node": "true", + "system_configs": "core-site", + + "site.global.app_user": "yarn", + "site.global.app_root": "${AGENT_WORK_ROOT}/app/install/apache-storm-${pkg.version}", + "site.global.user_group": "hadoop", + "site.global.security_enabled": "false", + "site.global.ganglia_server_host": "${NN_HOST}", + "site.global.ganglia_server_id": "Application2", + "site.global.ganglia_enabled":"true", + "site.global.ganglia_server_port": "8668", + "site.global.rest_api_port": "${STORM_REST_API.ALLOCATED_PORT}", + "site.global.rest_api_admin_port": "${STORM_REST_API.ALLOCATED_PORT}", + + "site.storm-site.storm.log.dir" : "${AGENT_LOG_ROOT}", + "site.storm-site.storm.zookeeper.servers": "['${ZK_HOST}']", + "site.storm-site.nimbus.thrift.port": "${NIMBUS.ALLOCATED_PORT}", + "site.storm-site.storm.local.dir": "${AGENT_WORK_ROOT}/app/tmp/storm", + "site.storm-site.transactional.zookeeper.root": "/transactional", + "site.storm-site.storm.zookeeper.port": "2181", + "site.storm-site.nimbus.childopts": "-Xmx1024m -javaagent:${AGENT_WORK_ROOT}/app/install/apache-storm-${pkg.version}/external/storm-jmxetric/lib/jmxetric-1.0.4.jar=host=${@//site/global/ganglia_server_host},port=${@//site/global/ganglia_server_port},wireformat31x=true,mode=multicast,config=${AGENT_WORK_ROOT}/app/install/apache-storm-${pkg.version}/external/storm-jmxetric/conf/jmxetric-conf.xml,process=Nimbus_JVM", + "site.storm-site.worker.childopts": "-Xmx768m -javaagent:${AGENT_WORK_ROOT}/app/install/apache-storm-${pkg.version}/external/storm-jmxetric/lib/jmxetric-1.0.4.jar=host=${@//site/global/ganglia_server_host},port=${@//site/global/ganglia_server_port},wireformat31x=true,mode=multicast,config=${AGENT_WORK_ROOT}/app/install/apache-storm-${pkg.version}/external/storm-jmxetric/conf/jmxetric-conf.xml,process=Worker_%ID%_JVM", + "site.storm-site.dev.zookeeper.path": "${AGENT_WORK_ROOT}/app/tmp/dev-storm-zookeeper", + "site.storm-site.drpc.invocations.port": "0", + "site.storm-site.storm.zookeeper.root": "${DEF_ZK_PATH}", + "site.storm-site.transactional.zookeeper.port": "null", + "site.storm-site.nimbus.host": "${NIMBUS_HOST}", + "site.storm-site.ui.port": "${STORM_UI_SERVER.ALLOCATED_PORT}", + "site.storm-site.supervisor.slots.ports": "[${SUPERVISOR.ALLOCATED_PORT}{PER_CONTAINER},${SUPERVISOR.ALLOCATED_PORT}{PER_CONTAINER}]", + "site.storm-site.supervisor.childopts": "-Xmx256m -Dcom.sun.management.jmxremote -Dcom.sun.management.jmxremote.ssl=false -Dcom.sun.management.jmxremote.authenticate=false -Dcom.sun.management.jmxremote.port=0 -javaagent:${AGENT_WORK_ROOT}/app/install/apache-storm-${pkg.version}/external/storm-jmxetric/lib/jmxetric-1.0.4.jar=host=${NN_HOST},port=8668,wireformat31x=true,mode=multicast,config=${AGENT_WORK_ROOT}/app/install/apache-storm-${pkg.version}/external/storm-jmxetric/conf/jmxetric-conf.xml,process=Supervisor_JVM", + "site.storm-site.drpc.port": "0", + "site.storm-site.logviewer.port": "${SUPERVISOR.ALLOCATED_PORT}{PER_CONTAINER}" + }, + "components": { + "slider-appmaster": { + "jvm.heapsize": "256M" + } + } +} http://git-wip-us.apache.org/repos/asf/incubator-slider/blob/772759c3/app-packages/storm/appConfig.json ---------------------------------------------------------------------- diff --git a/app-packages/storm/appConfig.json b/app-packages/storm/appConfig.json deleted file mode 100644 index 683b8cc..0000000 --- a/app-packages/storm/appConfig.json +++ /dev/null @@ -1,46 +0,0 @@ -{ - "schema": "http://example.org/specification/v2.0.0";, - "metadata": { - }, - "global": { - "application.def": ".slider/package/STORM/slider-storm-app-package-${pkg.version}.zip", - "java_home": "/usr/jdk64/jdk1.7.0_45", - "create.default.zookeeper.node": "true", - "system_configs": "core-site", - - "site.global.app_user": "yarn", - "site.global.app_root": "${AGENT_WORK_ROOT}/app/install/apache-storm-${pkg.version}", - "site.global.user_group": "hadoop", - "site.global.security_enabled": "false", - "site.global.ganglia_server_host": "${NN_HOST}", - "site.global.ganglia_server_id": "Application2", - "site.global.ganglia_enabled":"true", - "site.global.ganglia_server_port": "8668", - "site.global.rest_api_port": "${STORM_REST_API.ALLOCATED_PORT}", - "site.global.rest_api_admin_port": "${STORM_REST_API.ALLOCATED_PORT}", - - "site.storm-site.storm.log.dir" : "${AGENT_LOG_ROOT}", - "site.storm-site.storm.zookeeper.servers": "['${ZK_HOST}']", - "site.storm-site.nimbus.thrift.port": "${NIMBUS.ALLOCATED_PORT}", - "site.storm-site.storm.local.dir": "${AGENT_WORK_ROOT}/app/tmp/storm", - "site.storm-site.transactional.zookeeper.root": "/transactional", - "site.storm-site.storm.zookeeper.port": "2181", - "site.storm-site.nimbus.childopts": "-Xmx1024m -javaagent:${AGENT_WORK_ROOT}/app/install/apache-storm-${pkg.version}/external/storm-jmxetric/lib/jmxetric-1.0.4.jar=host=${@//site/global/ganglia_server_host},port=${@//site/global/ganglia_server_port},wireformat31x=true,mode=multicast,config=${AGENT_WORK_ROOT}/app/install/apache-storm-${pkg.version}/external/storm-jmxetric/conf/jmxetric-conf.xml,process=Nimbus_JVM", - "site.storm-site.worker.childopts": "-Xmx768m -javaagent:${AGENT_WORK_ROOT}/app/install/apache-storm-${pkg.version}/external/storm-jmxetric/lib/jmxetric-1.0.4.jar=host=${@//site/global/ganglia_server_host},port=${@//site/global/ganglia_server_port},wireformat31x=true,mode=multicast,config=${AGENT_WORK_ROOT}/app/install/apache-storm-${pkg.version}/external/storm-jmxetric/conf/jmxetric-conf.xml,process=Worker_%ID%_JVM", - "site.storm-site.dev.zookeeper.path": "${AGENT_WORK_ROOT}/app/tmp/dev-storm-zookeeper", - "site.storm-site.drpc.invocations.port": "0", - "site.storm-site.storm.zookeeper.root": "${DEF_ZK_PATH}", - "site.storm-site.transactional.zookeeper.port": "null", - "site.storm-site.nimbus.host": "${NIMBUS_HOST}", - "site.storm-site.ui.port": "${STORM_UI_SERVER.ALLOCATED_PORT}", - "site.storm-site.supervisor.slots.ports": "[${SUPERVISOR.ALLOCATED_PORT}{PER_CONTAINER},${SUPERVISOR.ALLOCATED_PORT}{PER_CONTAINER}]", - "site.storm-site.supervisor.childopts": "-Xmx256m -Dcom.sun.management.jmxremote -Dcom.sun.management.jmxremote.ssl=false -Dcom.sun.management.jmxremote.authenticate=false -Dcom.sun.management.jmxremote.port=0 -javaagent:${AGENT_WORK_ROOT}/app/install/apache-storm-${pkg.version}/external/storm-jmxetric/lib/jmxetric-1.0.4.jar=host=${NN_HOST},port=8668,wireformat31x=true,mode=multicast,config=${AGENT_WORK_ROOT}/app/install/apache-storm-${pkg.version}/external/storm-jmxetric/conf/jmxetric-conf.xml,process=Supervisor_JVM", - "site.storm-site.drpc.port": "0", - "site.storm-site.logviewer.port": "${SUPERVISOR.ALLOCATED_PORT}{PER_CONTAINER}" - }, - "components": { - "slider-appmaster": { - "jvm.heapsize": "256M" - } - } -} http://git-wip-us.apache.org/repos/asf/incubator-slider/blob/772759c3/app-packages/storm/resources-default.json ---------------------------------------------------------------------- diff --git a/app-packages/storm/resources-default.json b/app-packages/storm/resources-default.json new file mode 100644 index 0000000..acecd91 --- /dev/null +++ b/app-packages/storm/resources-default.json @@ -0,0 +1,34 @@ +{ + "schema" : "http://example.org/specification/v2.0.0";, + "metadata" : { + }, + "global" : { + "yarn.log.include.patterns": "", + "yarn.log.exclude.patterns": "", + "yarn.log.interval": "0" + }, + "components": { + "slider-appmaster": { + }, + "NIMBUS": { + "yarn.role.priority": "1", + "yarn.component.instances": "1" + }, + "STORM_UI_SERVER": { + "yarn.role.priority": "2", + "yarn.component.instances": "1" + }, + "DRPC_SERVER": { + "yarn.role.priority": "3", + "yarn.component.instances": "1" + }, + "SUPERVISOR": { + "yarn.role.priority": "4", + "yarn.component.instances": "1" + }, + "STORM_REST_API": { + "yarn.role.priority": "5", + "yarn.component.instances": "0" + } + } +} http://git-wip-us.apache.org/repos/asf/incubator-slider/blob/772759c3/app-packages/storm/resources.json ---------------------------------------------------------------------- diff --git a/app-packages/storm/resources.json b/app-packages/storm/resources.json deleted file mode 100644 index acecd91..0000000 --- a/app-packages/storm/resources.json +++ /dev/null @@ -1,34 +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": { - "slider-appmaster": { - }, - "NIMBUS": { - "yarn.role.priority": "1", - "yarn.component.instances": "1" - }, - "STORM_UI_SERVER": { - "yarn.role.priority": "2", - "yarn.component.instances": "1" - }, - "DRPC_SERVER": { - "yarn.role.priority": "3", - "yarn.component.instances": "1" - }, - "SUPERVISOR": { - "yarn.role.priority": "4", - "yarn.component.instances": "1" - }, - "STORM_REST_API": { - "yarn.role.priority": "5", - "yarn.component.instances": "0" - } - } -} http://git-wip-us.apache.org/repos/asf/incubator-slider/blob/772759c3/app-packages/storm/src/assembly/storm.xml ---------------------------------------------------------------------- diff --git a/app-packages/storm/src/assembly/storm.xml b/app-packages/storm/src/assembly/storm.xml index 47d223a..cc000c5 100644 --- a/app-packages/storm/src/assembly/storm.xml +++ b/app-packages/storm/src/assembly/storm.xml @@ -30,7 +30,7 @@ <files> <file> - <source>appConfig.json</source> + <source>appConfig-default.json</source> <outputDirectory>/</outputDirectory> <filtered>true</filtered> <fileMode>0755</fileMode> @@ -57,7 +57,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>
