You are viewing a plain text version of this content. The canonical link for it is here.
Posted to common-commits@hadoop.apache.org by ha...@apache.org on 2019/08/06 21:01:22 UTC
[hadoop] branch trunk updated: YARN-9559. Create
AbstractContainersLauncher for pluggable ContainersLauncher logic.
(Contributed by Jonathan Hung)
This is an automated email from the ASF dual-hosted git repository.
haibochen pushed a commit to branch trunk
in repository https://gitbox.apache.org/repos/asf/hadoop.git
The following commit(s) were added to refs/heads/trunk by this push:
new f51702d YARN-9559. Create AbstractContainersLauncher for pluggable ContainersLauncher logic. (Contributed by Jonathan Hung)
f51702d is described below
commit f51702d5398531835b24d812f6f95094a0e0493e
Author: Haibo Chen <ha...@apache.org>
AuthorDate: Tue Aug 6 13:51:11 2019 -0700
YARN-9559. Create AbstractContainersLauncher for pluggable ContainersLauncher logic. (Contributed by Jonathan Hung)
---
.../apache/hadoop/yarn/conf/YarnConfiguration.java | 6 ++++
.../src/main/resources/yarn-default.xml | 9 +++++
.../containermanager/ContainerManagerImpl.java | 22 +++++++++---
.../launcher/AbstractContainersLauncher.java | 41 ++++++++++++++++++++++
.../launcher/ContainersLauncher.java | 35 +++++++++++-------
.../containermanager/launcher/package-info.java | 22 ++++++++++++
6 files changed, 119 insertions(+), 16 deletions(-)
diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-api/src/main/java/org/apache/hadoop/yarn/conf/YarnConfiguration.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-api/src/main/java/org/apache/hadoop/yarn/conf/YarnConfiguration.java
index 917d32b..134b698 100644
--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-api/src/main/java/org/apache/hadoop/yarn/conf/YarnConfiguration.java
+++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-api/src/main/java/org/apache/hadoop/yarn/conf/YarnConfiguration.java
@@ -4053,6 +4053,12 @@ public class YarnConfiguration extends Configuration {
public static final int
DEFAULT_RM_ACTIVITIES_MANAGER_APP_ACTIVITIES_MAX_QUEUE_LENGTH = 100;
+ /**
+ * Containers launcher implementation to use.
+ */
+ public static final String NM_CONTAINERS_LAUNCHER_CLASS =
+ NM_PREFIX + "containers-launcher.class";
+
public YarnConfiguration() {
super();
}
diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/resources/yarn-default.xml b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/resources/yarn-default.xml
index f379844..4b93d1e 100644
--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/resources/yarn-default.xml
+++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/resources/yarn-default.xml
@@ -4230,4 +4230,13 @@
<name>yarn.resourcemanager.activities-manager.app-activities.max-queue-length</name>
<value>100</value>
</property>
+
+ <property>
+ <description>
+ Containers launcher implementation for determining how containers
+ are launched within NodeManagers.
+ </description>
+ <name>yarn.nodemanager.containers-launcher.class</name>
+ <value>org.apache.hadoop.yarn.server.nodemanager.containermanager.launcher.ContainersLauncher</value>
+ </property>
</configuration>
diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/main/java/org/apache/hadoop/yarn/server/nodemanager/containermanager/ContainerManagerImpl.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/main/java/org/apache/hadoop/yarn/server/nodemanager/containermanager/ContainerManagerImpl.java
index c43b825..eb862ef 100644
--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/main/java/org/apache/hadoop/yarn/server/nodemanager/containermanager/ContainerManagerImpl.java
+++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/main/java/org/apache/hadoop/yarn/server/nodemanager/containermanager/ContainerManagerImpl.java
@@ -20,6 +20,7 @@ package org.apache.hadoop.yarn.server.nodemanager.containermanager;
import com.google.common.annotations.VisibleForTesting;
import com.google.protobuf.ByteString;
+import org.apache.hadoop.util.ReflectionUtils;
import org.apache.hadoop.yarn.api.protocolrecords.GetLocalizationStatusesRequest;
import org.apache.hadoop.yarn.api.protocolrecords.GetLocalizationStatusesResponse;
import org.apache.hadoop.yarn.api.records.LocalizationStatus;
@@ -131,6 +132,7 @@ import org.apache.hadoop.yarn.server.nodemanager.containermanager.container.Cont
import org.apache.hadoop.yarn.server.nodemanager.containermanager.container.ContainerImpl;
import org.apache.hadoop.yarn.server.nodemanager.containermanager.container.ContainerKillEvent;
import org.apache.hadoop.yarn.server.nodemanager.containermanager.container.ContainerReInitEvent;
+import org.apache.hadoop.yarn.server.nodemanager.containermanager.launcher.AbstractContainersLauncher;
import org.apache.hadoop.yarn.server.nodemanager.containermanager.launcher.ContainersLauncher;
import org.apache.hadoop.yarn.server.nodemanager.containermanager.launcher.ContainersLauncherEventType;
import org.apache.hadoop.yarn.server.nodemanager.containermanager.launcher.SignalContainersLauncherEvent;
@@ -208,7 +210,7 @@ public class ContainerManagerImpl extends CompositeService implements
private final ContainersMonitor containersMonitor;
private Server server;
private final ResourceLocalizationService rsrcLocalizationSrvc;
- private final ContainersLauncher containersLauncher;
+ private final AbstractContainersLauncher containersLauncher;
private final AuxServices auxiliaryServices;
private final NodeManagerMetrics metrics;
@@ -567,9 +569,21 @@ public class ContainerManagerImpl extends CompositeService implements
return nmTimelinePublisherLocal;
}
- protected ContainersLauncher createContainersLauncher(Context context,
- ContainerExecutor exec) {
- return new ContainersLauncher(context, this.dispatcher, exec, dirsHandler, this);
+ protected AbstractContainersLauncher createContainersLauncher(
+ Context ctxt, ContainerExecutor exec) {
+ Class<? extends AbstractContainersLauncher> containersLauncherClass =
+ ctxt.getConf()
+ .getClass(YarnConfiguration.NM_CONTAINERS_LAUNCHER_CLASS,
+ ContainersLauncher.class, AbstractContainersLauncher.class);
+ AbstractContainersLauncher launcher;
+ try {
+ launcher = ReflectionUtils.newInstance(containersLauncherClass,
+ ctxt.getConf());
+ launcher.init(ctxt, this.dispatcher, exec, dirsHandler, this);
+ } catch (Exception e) {
+ throw new RuntimeException(e);
+ }
+ return launcher;
}
protected EventHandler<ApplicationEvent> createApplicationEventDispatcher() {
diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/main/java/org/apache/hadoop/yarn/server/nodemanager/containermanager/launcher/AbstractContainersLauncher.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/main/java/org/apache/hadoop/yarn/server/nodemanager/containermanager/launcher/AbstractContainersLauncher.java
new file mode 100644
index 0000000..c2dfb37
--- /dev/null
+++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/main/java/org/apache/hadoop/yarn/server/nodemanager/containermanager/launcher/AbstractContainersLauncher.java
@@ -0,0 +1,41 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.apache.hadoop.yarn.server.nodemanager.containermanager.launcher;
+
+import org.apache.hadoop.service.Service;
+import org.apache.hadoop.yarn.event.Dispatcher;
+import org.apache.hadoop.yarn.event.EventHandler;
+import org.apache.hadoop.yarn.server.nodemanager.ContainerExecutor;
+import org.apache.hadoop.yarn.server.nodemanager.Context;
+import org.apache.hadoop.yarn.server.nodemanager.LocalDirsHandlerService;
+import org.apache.hadoop.yarn.server.nodemanager.containermanager.ContainerManagerImpl;
+
+
+/**
+ * Pluggable ContainersLauncher interface for processing
+ * ContainersLauncherEvents.
+ */
+public interface AbstractContainersLauncher extends Service,
+ EventHandler<ContainersLauncherEvent> {
+
+ void init(Context context, Dispatcher dispatcher,
+ ContainerExecutor exec, LocalDirsHandlerService dirsHandler,
+ ContainerManagerImpl containerManager);
+
+}
diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/main/java/org/apache/hadoop/yarn/server/nodemanager/containermanager/launcher/ContainersLauncher.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/main/java/org/apache/hadoop/yarn/server/nodemanager/containermanager/launcher/ContainersLauncher.java
index 90ccd67..1f7e8a7 100644
--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/main/java/org/apache/hadoop/yarn/server/nodemanager/containermanager/launcher/ContainersLauncher.java
+++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/main/java/org/apache/hadoop/yarn/server/nodemanager/containermanager/launcher/ContainersLauncher.java
@@ -38,7 +38,6 @@ import org.apache.hadoop.util.StringUtils;
import org.apache.hadoop.util.concurrent.HadoopExecutors;
import org.apache.hadoop.yarn.api.records.ContainerId;
import org.apache.hadoop.yarn.event.Dispatcher;
-import org.apache.hadoop.yarn.event.EventHandler;
import org.apache.hadoop.yarn.exceptions.YarnRuntimeException;
import org.apache.hadoop.yarn.server.nodemanager.ContainerExecutor;
import org.apache.hadoop.yarn.server.nodemanager.Context;
@@ -58,15 +57,15 @@ import com.google.common.util.concurrent.ThreadFactoryBuilder;
*
*/
public class ContainersLauncher extends AbstractService
- implements EventHandler<ContainersLauncherEvent> {
+ implements AbstractContainersLauncher {
private static final Logger LOG =
LoggerFactory.getLogger(ContainersLauncher.class);
- private final Context context;
- private final ContainerExecutor exec;
- private final Dispatcher dispatcher;
- private final ContainerManagerImpl containerManager;
+ private Context context;
+ private ContainerExecutor exec;
+ private Dispatcher dispatcher;
+ private ContainerManagerImpl containerManager;
private LocalDirsHandlerService dirsHandler;
@VisibleForTesting
@@ -79,15 +78,27 @@ public class ContainersLauncher extends AbstractService
public final Map<ContainerId, ContainerLaunch> running =
Collections.synchronizedMap(new HashMap<ContainerId, ContainerLaunch>());
+ public ContainersLauncher() {
+ super("containers-launcher");
+ }
+
+ @VisibleForTesting
public ContainersLauncher(Context context, Dispatcher dispatcher,
ContainerExecutor exec, LocalDirsHandlerService dirsHandler,
ContainerManagerImpl containerManager) {
- super("containers-launcher");
- this.exec = exec;
- this.context = context;
- this.dispatcher = dispatcher;
- this.dirsHandler = dirsHandler;
- this.containerManager = containerManager;
+ this();
+ init(context, dispatcher, exec, dirsHandler, containerManager);
+ }
+
+ @Override
+ public void init(Context nmContext, Dispatcher nmDispatcher,
+ ContainerExecutor containerExec, LocalDirsHandlerService nmDirsHandler,
+ ContainerManagerImpl nmContainerManager) {
+ this.exec = containerExec;
+ this.context = nmContext;
+ this.dispatcher = nmDispatcher;
+ this.dirsHandler = nmDirsHandler;
+ this.containerManager = nmContainerManager;
}
@Override
diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/main/java/org/apache/hadoop/yarn/server/nodemanager/containermanager/launcher/package-info.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/main/java/org/apache/hadoop/yarn/server/nodemanager/containermanager/launcher/package-info.java
new file mode 100644
index 0000000..ef9e85f
--- /dev/null
+++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/main/java/org/apache/hadoop/yarn/server/nodemanager/containermanager/launcher/package-info.java
@@ -0,0 +1,22 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+/**
+ * This package contains classes related to NM container launch.
+ */
+package org.apache.hadoop.yarn.server.nodemanager.containermanager.launcher;
---------------------------------------------------------------------
To unsubscribe, e-mail: common-commits-unsubscribe@hadoop.apache.org
For additional commands, e-mail: common-commits-help@hadoop.apache.org