HIVE-19979: Backport HIVE-19304 to branch-3 (Daniel Voros via Zoltan Haindrich)
Signed-off-by: Zoltan Haindrich <k...@rxd.hu> Project: http://git-wip-us.apache.org/repos/asf/hive/repo Commit: http://git-wip-us.apache.org/repos/asf/hive/commit/e965ddc2 Tree: http://git-wip-us.apache.org/repos/asf/hive/tree/e965ddc2 Diff: http://git-wip-us.apache.org/repos/asf/hive/diff/e965ddc2 Branch: refs/heads/branch-3 Commit: e965ddc28e4a66b08f59352c717e690971983c37 Parents: 9fae0d1 Author: Daniel Voros <daniel.vo...@gmail.com> Authored: Tue Jul 3 14:08:13 2018 +0200 Committer: Zoltan Haindrich <k...@rxd.hu> Committed: Tue Jul 3 14:08:13 2018 +0200 ---------------------------------------------------------------------- llap-server/src/main/resources/templates.py | 18 ++++++++++++++---- 1 file changed, 14 insertions(+), 4 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/hive/blob/e965ddc2/llap-server/src/main/resources/templates.py ---------------------------------------------------------------------- diff --git a/llap-server/src/main/resources/templates.py b/llap-server/src/main/resources/templates.py index 00a84cf..1dc1611 100644 --- a/llap-server/src/main/resources/templates.py +++ b/llap-server/src/main/resources/templates.py @@ -6,10 +6,9 @@ yarnfile = """ "configuration": { "properties": { "yarn.service.rolling-log.include-pattern": ".*\\\\.done", - "yarn.component.placement.policy" : "%(placement)d", - "yarn.container.health.threshold.percent": "%(health_percent)d", - "yarn.container.health.threshold.window.secs": "%(health_time_window)d", - "yarn.container.health.threshold.init.delay.secs": "%(health_init_delay)d"%(service_appconfig_global_append)s + "yarn.service.container-health-threshold.percent": "%(health_percent)d", + "yarn.service.container-health-threshold.window-secs": "%(health_time_window)d", + "yarn.service.container-health-threshold.init-delay-secs": "%(health_init_delay)d"%(service_appconfig_global_append)s } }, "components": [ @@ -25,6 +24,17 @@ yarnfile = """ "cpus": 1, "memory": "%(container.mb)d" }, + "placement_policy": { + "constraints": [ + { + "type": "ANTI_AFFINITY", + "scope": "NODE", + "target_tags": [ + "llap" + ] + } + ] + }, "configuration": { "env": { "JAVA_HOME": "%(java_home)s",