Return-Path: X-Original-To: archive-asf-public-internal@cust-asf2.ponee.io Delivered-To: archive-asf-public-internal@cust-asf2.ponee.io Received: from cust-asf.ponee.io (cust-asf.ponee.io [163.172.22.183]) by cust-asf2.ponee.io (Postfix) with ESMTP id B023B200BD1 for ; Mon, 28 Nov 2016 22:16:05 +0100 (CET) Received: by cust-asf.ponee.io (Postfix) id AF10B160B28; Mon, 28 Nov 2016 21:16:05 +0000 (UTC) Delivered-To: archive-asf-public@cust-asf.ponee.io Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by cust-asf.ponee.io (Postfix) with SMTP id D42B9160B00 for ; Mon, 28 Nov 2016 22:16:04 +0100 (CET) Received: (qmail 49290 invoked by uid 500); 28 Nov 2016 21:15:52 -0000 Mailing-List: contact common-commits-help@hadoop.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Delivered-To: mailing list common-commits@hadoop.apache.org Received: (qmail 47128 invoked by uid 99); 28 Nov 2016 21:15:51 -0000 Received: from git1-us-west.apache.org (HELO git1-us-west.apache.org) (140.211.11.23) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 28 Nov 2016 21:15:51 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 2EB6EF17F7; Mon, 28 Nov 2016 21:15:51 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: jianhe@apache.org To: common-commits@hadoop.apache.org Date: Mon, 28 Nov 2016 21:16:31 -0000 Message-Id: In-Reply-To: <3022f5161bb4468c92a2825216e9111f@git.apache.org> References: <3022f5161bb4468c92a2825216e9111f@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [43/63] [abbrv] hadoop git commit: YARN-5680. Add 2 new fields in Slider status output - image-name and is-privileged-container. Contributed by Billie Rinaldi archived-at: Mon, 28 Nov 2016 21:16:05 -0000 YARN-5680. Add 2 new fields in Slider status output - image-name and is-privileged-container. Contributed by Billie Rinaldi Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/686c663c Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/686c663c Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/686c663c Branch: refs/heads/yarn-native-services Commit: 686c663c3cbbf9b246e2d9564a95890e9d48d67a Parents: 5c2a782 Author: Gour Saha Authored: Tue Oct 25 20:00:27 2016 -0700 Committer: Jian He Committed: Mon Nov 28 13:09:08 2016 -0800 ---------------------------------------------------------------------- .../org/apache/slider/providers/docker/DockerKeys.java | 1 + .../slider/providers/docker/DockerProviderService.java | 2 +- .../apache/slider/server/appmaster/state/AppState.java | 12 ++++++++++++ 3 files changed, 14 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/hadoop/blob/686c663c/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-slider/hadoop-yarn-slider-core/src/main/java/org/apache/slider/providers/docker/DockerKeys.java ---------------------------------------------------------------------- diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-slider/hadoop-yarn-slider-core/src/main/java/org/apache/slider/providers/docker/DockerKeys.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-slider/hadoop-yarn-slider-core/src/main/java/org/apache/slider/providers/docker/DockerKeys.java index 40b73a2..0e1d288 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-slider/hadoop-yarn-slider-core/src/main/java/org/apache/slider/providers/docker/DockerKeys.java +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-slider/hadoop-yarn-slider-core/src/main/java/org/apache/slider/providers/docker/DockerKeys.java @@ -26,6 +26,7 @@ public interface DockerKeys { String DOCKER_START_COMMAND = DOCKER_PREFIX + "startCommand"; String DEFAULT_DOCKER_NETWORK = "bridge"; + Boolean DEFAULT_DOCKER_USE_PRIVILEGED = false; String OUT_FILE = "stdout.txt"; String ERR_FILE = "stderr.txt"; http://git-wip-us.apache.org/repos/asf/hadoop/blob/686c663c/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-slider/hadoop-yarn-slider-core/src/main/java/org/apache/slider/providers/docker/DockerProviderService.java ---------------------------------------------------------------------- diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-slider/hadoop-yarn-slider-core/src/main/java/org/apache/slider/providers/docker/DockerProviderService.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-slider/hadoop-yarn-slider-core/src/main/java/org/apache/slider/providers/docker/DockerProviderService.java index af36620..cc319ee 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-slider/hadoop-yarn-slider-core/src/main/java/org/apache/slider/providers/docker/DockerProviderService.java +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-slider/hadoop-yarn-slider-core/src/main/java/org/apache/slider/providers/docker/DockerProviderService.java @@ -131,7 +131,7 @@ public class DockerProviderService extends AbstractProviderService implements launcher.setDockerNetwork(appConf.getComponentOpt(roleGroup, DOCKER_NETWORK, DEFAULT_DOCKER_NETWORK)); launcher.setRunPrivilegedContainer(appConf.getComponentOptBool(roleGroup, - DOCKER_USE_PRIVILEGED, false)); + DOCKER_USE_PRIVILEGED, DEFAULT_DOCKER_USE_PRIVILEGED)); // Set the environment Map standardTokens = providerUtils.getStandardTokenMap( http://git-wip-us.apache.org/repos/asf/hadoop/blob/686c663c/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-slider/hadoop-yarn-slider-core/src/main/java/org/apache/slider/server/appmaster/state/AppState.java ---------------------------------------------------------------------- diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-slider/hadoop-yarn-slider-core/src/main/java/org/apache/slider/server/appmaster/state/AppState.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-slider/hadoop-yarn-slider-core/src/main/java/org/apache/slider/server/appmaster/state/AppState.java index 49e7b78..6db375d 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-slider/hadoop-yarn-slider-core/src/main/java/org/apache/slider/server/appmaster/state/AppState.java +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-slider/hadoop-yarn-slider-core/src/main/java/org/apache/slider/server/appmaster/state/AppState.java @@ -91,6 +91,9 @@ import java.util.concurrent.atomic.AtomicInteger; import static org.apache.slider.api.ResourceKeys.*; import static org.apache.slider.api.RoleKeys.*; import static org.apache.slider.api.StateValues.*; +import static org.apache.slider.providers.docker.DockerKeys.DEFAULT_DOCKER_USE_PRIVILEGED; +import static org.apache.slider.providers.docker.DockerKeys.DOCKER_IMAGE; +import static org.apache.slider.providers.docker.DockerKeys.DOCKER_USE_PRIVILEGED; /** * The model of all the ongoing state of a Slider AM. @@ -1823,6 +1826,15 @@ public class AppState { if (SliderUtils.isSet(prefix)) { cd.setRoleOpt(rolename, ROLE_PREFIX, SliderUtils.trimPrefix(prefix)); } + String dockerImage = instanceDefinition.getAppConfOperations() + .getComponentOpt(role.getGroup(), DOCKER_IMAGE, null); + if (SliderUtils.isSet(dockerImage)) { + cd.setRoleOpt(rolename, DOCKER_IMAGE, dockerImage); + Boolean dockerUsePrivileged = instanceDefinition.getAppConfOperations() + .getComponentOptBool(role.getGroup(), DOCKER_USE_PRIVILEGED, + DEFAULT_DOCKER_USE_PRIVILEGED); + cd.setRoleOpt(rolename, DOCKER_USE_PRIVILEGED, dockerUsePrivileged); + } List instances = instanceMap.get(rolename); int nodeCount = instances != null ? instances.size(): 0; cd.setRoleOpt(rolename, COMPONENT_INSTANCES, --------------------------------------------------------------------- To unsubscribe, e-mail: common-commits-unsubscribe@hadoop.apache.org For additional commands, e-mail: common-commits-help@hadoop.apache.org