SLIDER-824 Update documentation with new placement configuration options
Project: http://git-wip-us.apache.org/repos/asf/incubator-slider/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-slider/commit/9cf916b7 Tree: http://git-wip-us.apache.org/repos/asf/incubator-slider/tree/9cf916b7 Diff: http://git-wip-us.apache.org/repos/asf/incubator-slider/diff/9cf916b7 Branch: refs/heads/develop Commit: 9cf916b7ab1bfef973dcdbc182dc6165a0535cc1 Parents: 1004966 Author: Steve Loughran <[email protected]> Authored: Wed Mar 25 17:57:27 2015 +0000 Committer: Steve Loughran <[email protected]> Committed: Wed Mar 25 17:57:27 2015 +0000 ---------------------------------------------------------------------- app-packages/accumulo/jmx_metrics.json | 76 ++++++++++---------- app-packages/accumulo/resources-default.json | 1 - app-packages/accumulo/timeline_metrics.json | 70 +++++++++--------- .../app-pkg-template/resources-default.json | 8 ++- .../command-logger/slider-pkg/appConfig.json | 35 +++++---- .../command-logger/slider-pkg/resources.json | 23 +++--- app-packages/hbase-win/resources-default.json | 27 ++++--- app-packages/hbase/resources-default.json | 15 ++-- 8 files changed, 135 insertions(+), 120 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-slider/blob/9cf916b7/app-packages/accumulo/jmx_metrics.json ---------------------------------------------------------------------- diff --git a/app-packages/accumulo/jmx_metrics.json b/app-packages/accumulo/jmx_metrics.json index cf410d8..bffdd7b 100644 --- a/app-packages/accumulo/jmx_metrics.json +++ b/app-packages/accumulo/jmx_metrics.json @@ -1,41 +1,41 @@ { - "Component": { - "ACCUMULO_MASTER": { - "MasterGoalState": { - "metric": "/stats/masterGoalState", - "pointInTime": true, - "temporal": false - }, - "MasterState": { - "metric": "/stats/masterState", - "pointInTime": true, - "temporal": false - }, - "DeadTabletServers": { - "metric": "/stats/deadTabletServers", - "pointInTime": true, - "temporal": false - }, - "TotalIngestRate": { - "metric": "/stats/totals/ingestrate", - "pointInTime": true, - "temporal": false - }, - "TotalQueryRate": { - "metric": "/stats/totals/queryrate", - "pointInTime": true, - "temporal": false - }, - "TotalDiskRate": { - "metric": "/stats/totals/diskrate", - "pointInTime": true, - "temporal": false - }, - "BadTabletServers": { - "metric": "/stats/badTabletServers", - "pointInTime": true, - "temporal": false - } - } + "Component": { + "ACCUMULO_MASTER": { + "MasterGoalState": { + "metric": "/stats/masterGoalState", + "pointInTime": true, + "temporal": false + }, + "MasterState": { + "metric": "/stats/masterState", + "pointInTime": true, + "temporal": false + }, + "DeadTabletServers": { + "metric": "/stats/deadTabletServers", + "pointInTime": true, + "temporal": false + }, + "TotalIngestRate": { + "metric": "/stats/totals/ingestrate", + "pointInTime": true, + "temporal": false + }, + "TotalQueryRate": { + "metric": "/stats/totals/queryrate", + "pointInTime": true, + "temporal": false + }, + "TotalDiskRate": { + "metric": "/stats/totals/diskrate", + "pointInTime": true, + "temporal": false + }, + "BadTabletServers": { + "metric": "/stats/badTabletServers", + "pointInTime": true, + "temporal": false + } } + } } http://git-wip-us.apache.org/repos/asf/incubator-slider/blob/9cf916b7/app-packages/accumulo/resources-default.json ---------------------------------------------------------------------- diff --git a/app-packages/accumulo/resources-default.json b/app-packages/accumulo/resources-default.json index 90cbf3f..3d41d3d 100644 --- a/app-packages/accumulo/resources-default.json +++ b/app-packages/accumulo/resources-default.json @@ -9,7 +9,6 @@ "components": { "ACCUMULO_MASTER": { "yarn.role.priority": "1", - "yarn.component.instances": "1", "yarn.memory": "256" }, "slider-appmaster": { http://git-wip-us.apache.org/repos/asf/incubator-slider/blob/9cf916b7/app-packages/accumulo/timeline_metrics.json ---------------------------------------------------------------------- diff --git a/app-packages/accumulo/timeline_metrics.json b/app-packages/accumulo/timeline_metrics.json index a284f79..ba14e20 100644 --- a/app-packages/accumulo/timeline_metrics.json +++ b/app-packages/accumulo/timeline_metrics.json @@ -1,38 +1,38 @@ { - "Component": { - "ACCUMULO_MASTER": { - "master_files_pending_repl_avg_time": { - "metric": "master.MasterReplication.FilesPendingReplicationAvgTime", - "pointInTime": false, - "temporal": true - }, - "master_max_repl_threads_avg_time": { - "metric": "master.MasterReplication.MaxReplicationThreadsAvgTime", - "pointInTime": false, - "temporal": true - }, - "master_num_peers_avg_time": { - "metric": "master.MasterReplication.NumPeersAvgTime", - "pointInTime": false, - "temporal": true - } - }, - "ACCUMULO_TSERVER": { - "tserver_entries": { - "metric": "tserver.general.entries", - "pointInTime": false, - "temporal": true - }, - "tserver_minc_avg_count": { - "metric": "tserver.MinorCompactions.MincAvgCount", - "pointInTime": false, - "temporal": true - }, - "tserver_scans_result_avg_count": { - "metric": "tserver.Scans.ResultAvgCount", - "pointInTime": false, - "temporal": true - } - } + "Component": { + "ACCUMULO_MASTER": { + "master_files_pending_repl_avg_time": { + "metric": "master.MasterReplication.FilesPendingReplicationAvgTime", + "pointInTime": false, + "temporal": true + }, + "master_max_repl_threads_avg_time": { + "metric": "master.MasterReplication.MaxReplicationThreadsAvgTime", + "pointInTime": false, + "temporal": true + }, + "master_num_peers_avg_time": { + "metric": "master.MasterReplication.NumPeersAvgTime", + "pointInTime": false, + "temporal": true + } + }, + "ACCUMULO_TSERVER": { + "tserver_entries": { + "metric": "tserver.general.entries", + "pointInTime": false, + "temporal": true + }, + "tserver_minc_avg_count": { + "metric": "tserver.MinorCompactions.MincAvgCount", + "pointInTime": false, + "temporal": true + }, + "tserver_scans_result_avg_count": { + "metric": "tserver.Scans.ResultAvgCount", + "pointInTime": false, + "temporal": true + } } + } } http://git-wip-us.apache.org/repos/asf/incubator-slider/blob/9cf916b7/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 index 0e95879..2285a76 100644 --- a/app-packages/app-pkg-template/resources-default.json +++ b/app-packages/app-pkg-template/resources-default.json @@ -3,6 +3,8 @@ "metadata" : { }, "global" : { + "yarn.log.include.patterns": "", + "yarn.log.exclude.patterns": "" }, "components": { "slider-appmaster": { @@ -10,7 +12,11 @@ "MYAPP_COMPONENT": { "yarn.role.priority": "1", "yarn.component.instances": "1", - "yarn.memory": "256" + "yarn.memory": "256", + "yarn.vcores": "1", + "yarn.component.placement.policy": "0", + "yarn.container.failure.threshold": "5", + "yarn.placement.escalate.seconds": "60" } } } \ No newline at end of file http://git-wip-us.apache.org/repos/asf/incubator-slider/blob/9cf916b7/app-packages/command-logger/slider-pkg/appConfig.json ---------------------------------------------------------------------- diff --git a/app-packages/command-logger/slider-pkg/appConfig.json b/app-packages/command-logger/slider-pkg/appConfig.json index 09e9252..884b2e2 100644 --- a/app-packages/command-logger/slider-pkg/appConfig.json +++ b/app-packages/command-logger/slider-pkg/appConfig.json @@ -1,22 +1,21 @@ { - "schema": "http://example.org/specification/v2.0.0";, - "metadata": { + "schema": "http://example.org/specification/v2.0.0";, + "metadata": { + }, + "global": { + "application.def": ".slider/package/CMD_LOGGER/command-logger-slider-package.zip", + "java_home": "/usr/jdk64/jdk1.7.0_67", + "site.global.application_id": "CommandLogger", + "site.global.app_root": "${AGENT_WORK_ROOT}/app/install/command-logger", + "site.cl-site.logfile.location": "${AGENT_WORK_ROOT}/app/install/command-logger-app/operations.log", + "site.cl-site.datetime.format": "%A, %d. %B %Y %I:%M%p", + "site.cl-site.pattern.for.test.to.verify": "verify this pattern" + }, + "components": { + "COMMAND_LOGGER": { }, - "global": { - "application.def": ".slider/package/CMD_LOGGER/command-logger-slider-package.zip", - "java_home": "/usr/jdk64/jdk1.7.0_67", - "site.global.application_id": "CommandLogger", - "site.global.app_root": "${AGENT_WORK_ROOT}/app/install/command-logger", - - "site.cl-site.logfile.location": "${AGENT_WORK_ROOT}/app/install/command-logger-app/operations.log", - "site.cl-site.datetime.format": "%A, %d. %B %Y %I:%M%p", - "site.cl-site.pattern.for.test.to.verify": "verify this pattern" - }, - "components": { - "COMMAND_LOGGER": { - }, - "slider-appmaster": { - "jvm.heapsize": "256M" - } + "slider-appmaster": { + "jvm.heapsize": "256M" } + } } http://git-wip-us.apache.org/repos/asf/incubator-slider/blob/9cf916b7/app-packages/command-logger/slider-pkg/resources.json ---------------------------------------------------------------------- diff --git a/app-packages/command-logger/slider-pkg/resources.json b/app-packages/command-logger/slider-pkg/resources.json index 8345661..f9edf51 100644 --- a/app-packages/command-logger/slider-pkg/resources.json +++ b/app-packages/command-logger/slider-pkg/resources.json @@ -1,15 +1,16 @@ { - "schema": "http://example.org/specification/v2.0.0";, - "metadata": { + "schema": "http://example.org/specification/v2.0.0";, + "metadata": { + }, + "global": { + }, + "components": { + "COMMAND_LOGGER": { + "yarn.role.priority": "1", + "yarn.component.instances": "1", + "yarn.placement.escalate.seconds": "10" }, - "global": { - }, - "components": { - "COMMAND_LOGGER": { - "yarn.role.priority": "1", - "yarn.component.instances": "1" - }, - "slider-appmaster": { - } + "slider-appmaster": { } + } } http://git-wip-us.apache.org/repos/asf/incubator-slider/blob/9cf916b7/app-packages/hbase-win/resources-default.json ---------------------------------------------------------------------- diff --git a/app-packages/hbase-win/resources-default.json b/app-packages/hbase-win/resources-default.json index ba00847..879d1ad 100644 --- a/app-packages/hbase-win/resources-default.json +++ b/app-packages/hbase-win/resources-default.json @@ -4,39 +4,44 @@ }, "global": { "yarn.log.include.patterns": "", - "yarn.log.exclude.patterns": "" + "yarn.log.exclude.patterns": "", + "yarn.component.instances": "1", + "yarn.vcores": "1" }, "components": { + "slider-appmaster": { + "yarn.memory": "1024" + }, "HBASE_MASTER": { "yarn.role.priority": "1", "yarn.component.instances": "1", - "yarn.memory": "512" - }, - "slider-appmaster": { - "yarn.memory": "1024" + "yarn.placement.escalate.seconds": "10", + "yarn.memory": "1500" }, "HBASE_REGIONSERVER": { "yarn.role.priority": "2", "yarn.component.instances": "1", - "yarn.memory": "512" + "yarn.memory": "1500", + "yarn.container.failure.threshold": "15", + "yarn.placement.escalate.seconds": "60" }, "HBASE_REST": { "yarn.role.priority": "3", "yarn.component.instances": "1", "yarn.component.placement.policy": "1", - "yarn.memory": "512" + "yarn.memory": "556" }, "HBASE_THRIFT": { "yarn.role.priority": "4", - "yarn.component.instances": "1", + "yarn.component.instances": "0", "yarn.component.placement.policy": "1", - "yarn.memory": "512" + "yarn.memory": "556" }, "HBASE_THRIFT2": { "yarn.role.priority": "5", - "yarn.component.instances": "0", + "yarn.component.instances": "1", "yarn.component.placement.policy": "1", - "yarn.memory": "512" + "yarn.memory": "556" } } } http://git-wip-us.apache.org/repos/asf/incubator-slider/blob/9cf916b7/app-packages/hbase/resources-default.json ---------------------------------------------------------------------- diff --git a/app-packages/hbase/resources-default.json b/app-packages/hbase/resources-default.json index d8dd9de..879d1ad 100644 --- a/app-packages/hbase/resources-default.json +++ b/app-packages/hbase/resources-default.json @@ -4,21 +4,26 @@ }, "global": { "yarn.log.include.patterns": "", - "yarn.log.exclude.patterns": "" + "yarn.log.exclude.patterns": "", + "yarn.component.instances": "1", + "yarn.vcores": "1" }, "components": { + "slider-appmaster": { + "yarn.memory": "1024" + }, "HBASE_MASTER": { "yarn.role.priority": "1", "yarn.component.instances": "1", + "yarn.placement.escalate.seconds": "10", "yarn.memory": "1500" }, - "slider-appmaster": { - "yarn.memory": "1024" - }, "HBASE_REGIONSERVER": { "yarn.role.priority": "2", "yarn.component.instances": "1", - "yarn.memory": "1500" + "yarn.memory": "1500", + "yarn.container.failure.threshold": "15", + "yarn.placement.escalate.seconds": "60" }, "HBASE_REST": { "yarn.role.priority": "3",
