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 su...@apache.org on 2019/02/27 06:25:10 UTC
[hadoop] branch branch-3.2 updated: YARN-9087. Improve logging for
initialization of Resource plugins. Contributed by Szilard Nemeth.
This is an automated email from the ASF dual-hosted git repository.
sunilg pushed a commit to branch branch-3.2
in repository https://gitbox.apache.org/repos/asf/hadoop.git
The following commit(s) were added to refs/heads/branch-3.2 by this push:
new a95a0cb YARN-9087. Improve logging for initialization of Resource plugins. Contributed by Szilard Nemeth.
a95a0cb is described below
commit a95a0cbf2fb89697cec181fa09a734898ffba361
Author: Sunil G <su...@apache.org>
AuthorDate: Wed Feb 27 11:54:36 2019 +0530
YARN-9087. Improve logging for initialization of Resource plugins. Contributed by Szilard Nemeth.
---
.../server/nodemanager/LinuxContainerExecutor.java | 7 ++--
.../resources/CGroupsBlkioResourceHandlerImpl.java | 5 +++
.../resources/CGroupsCpuResourceHandlerImpl.java | 5 +++
.../linux/resources/CGroupsHandlerImpl.java | 14 +++++++-
.../CGroupsMemoryResourceHandlerImpl.java | 5 +++
.../resources/NetworkPacketTaggingHandlerImpl.java | 5 +++
.../linux/resources/ResourceHandlerChain.java | 6 ++++
.../linux/resources/ResourceHandlerModule.java | 37 ++++++++++++++++------
.../TrafficControlBandwidthHandlerImpl.java | 5 +++
.../resources/fpga/FpgaResourceHandlerImpl.java | 14 ++++++--
.../linux/resources/gpu/GpuResourceAllocator.java | 5 +++
.../resources/gpu/GpuResourceHandlerImpl.java | 15 ++++++---
.../resources/numa/NumaResourceHandlerImpl.java | 12 +++++--
.../resourceplugin/ResourcePluginManager.java | 18 +++++++----
.../resourceplugin/fpga/FpgaResourcePlugin.java | 5 +++
.../resourceplugin/gpu/GpuResourcePlugin.java | 5 +++
16 files changed, 135 insertions(+), 28 deletions(-)
diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/main/java/org/apache/hadoop/yarn/server/nodemanager/LinuxContainerExecutor.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/main/java/org/apache/hadoop/yarn/server/nodemanager/LinuxContainerExecutor.java
index bf7031c..56e3e6a 100644
--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/main/java/org/apache/hadoop/yarn/server/nodemanager/LinuxContainerExecutor.java
+++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/main/java/org/apache/hadoop/yarn/server/nodemanager/LinuxContainerExecutor.java
@@ -312,11 +312,12 @@ public class LinuxContainerExecutor extends ContainerExecutor {
resourceHandlerChain = ResourceHandlerModule
.getConfiguredResourceHandlerChain(conf, nmContext);
if (LOG.isDebugEnabled()) {
- LOG.debug("Resource handler chain enabled = " + (resourceHandlerChain
- != null));
+ final boolean enabled = resourceHandlerChain != null;
+ LOG.debug("Resource handler chain enabled = " + enabled);
}
if (resourceHandlerChain != null) {
- LOG.debug("Bootstrapping resource handler chain");
+ LOG.debug("Bootstrapping resource handler chain: " +
+ resourceHandlerChain);
resourceHandlerChain.bootstrap(conf);
}
} catch (ResourceHandlerException e) {
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/linux/resources/CGroupsBlkioResourceHandlerImpl.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/main/java/org/apache/hadoop/yarn/server/nodemanager/containermanager/linux/resources/CGroupsBlkioResourceHandlerImpl.java
index 2c402c0..140484b 100644
--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/main/java/org/apache/hadoop/yarn/server/nodemanager/containermanager/linux/resources/CGroupsBlkioResourceHandlerImpl.java
+++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/main/java/org/apache/hadoop/yarn/server/nodemanager/containermanager/linux/resources/CGroupsBlkioResourceHandlerImpl.java
@@ -173,4 +173,9 @@ public class CGroupsBlkioResourceHandlerImpl implements DiskResourceHandler {
public List<PrivilegedOperation> teardown() throws ResourceHandlerException {
return null;
}
+
+ @Override
+ public String toString() {
+ return CGroupsBlkioResourceHandlerImpl.class.getName();
+ }
}
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/linux/resources/CGroupsCpuResourceHandlerImpl.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/main/java/org/apache/hadoop/yarn/server/nodemanager/containermanager/linux/resources/CGroupsCpuResourceHandlerImpl.java
index 37221f4..e0711df 100644
--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/main/java/org/apache/hadoop/yarn/server/nodemanager/containermanager/linux/resources/CGroupsCpuResourceHandlerImpl.java
+++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/main/java/org/apache/hadoop/yarn/server/nodemanager/containermanager/linux/resources/CGroupsCpuResourceHandlerImpl.java
@@ -256,4 +256,9 @@ public class CGroupsCpuResourceHandlerImpl implements CpuResourceHandler {
throws ResourceHandlerException {
return null;
}
+
+ @Override
+ public String toString() {
+ return CGroupsCpuResourceHandlerImpl.class.getName();
+ }
}
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/linux/resources/CGroupsHandlerImpl.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/main/java/org/apache/hadoop/yarn/server/nodemanager/containermanager/linux/resources/CGroupsHandlerImpl.java
index a547e8f..5045ac3 100644
--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/main/java/org/apache/hadoop/yarn/server/nodemanager/containermanager/linux/resources/CGroupsHandlerImpl.java
+++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/main/java/org/apache/hadoop/yarn/server/nodemanager/containermanager/linux/resources/CGroupsHandlerImpl.java
@@ -64,7 +64,7 @@ class CGroupsHandlerImpl implements CGroupsHandler {
private static final String MTAB_FILE = "/proc/mounts";
private static final String CGROUPS_FSTYPE = "cgroup";
- private String mtabFile;
+ private final String mtabFile;
private final String cGroupPrefix;
private final boolean enableCGroupMount;
private final String cGroupMountPath;
@@ -621,4 +621,16 @@ class CGroupsHandlerImpl implements CGroupsHandler {
public String getCGroupMountPath() {
return cGroupMountPath;
}
+
+ @Override
+ public String toString() {
+ return CGroupsHandlerImpl.class.getName() + "{" +
+ "mtabFile='" + mtabFile + '\'' +
+ ", cGroupPrefix='" + cGroupPrefix + '\'' +
+ ", enableCGroupMount=" + enableCGroupMount +
+ ", cGroupMountPath='" + cGroupMountPath + '\'' +
+ ", deleteCGroupTimeout=" + deleteCGroupTimeout +
+ ", deleteCGroupDelay=" + deleteCGroupDelay +
+ '}';
+ }
}
\ No newline at end of file
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/linux/resources/CGroupsMemoryResourceHandlerImpl.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/main/java/org/apache/hadoop/yarn/server/nodemanager/containermanager/linux/resources/CGroupsMemoryResourceHandlerImpl.java
index 053b796..fe34906 100644
--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/main/java/org/apache/hadoop/yarn/server/nodemanager/containermanager/linux/resources/CGroupsMemoryResourceHandlerImpl.java
+++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/main/java/org/apache/hadoop/yarn/server/nodemanager/containermanager/linux/resources/CGroupsMemoryResourceHandlerImpl.java
@@ -196,4 +196,9 @@ public class CGroupsMemoryResourceHandlerImpl implements MemoryResourceHandler {
}
return Optional.empty();
}
+
+ @Override
+ public String toString() {
+ return CGroupsMemoryResourceHandlerImpl.class.getName();
+ }
}
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/linux/resources/NetworkPacketTaggingHandlerImpl.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/main/java/org/apache/hadoop/yarn/server/nodemanager/containermanager/linux/resources/NetworkPacketTaggingHandlerImpl.java
index 3f6d4b6..9ef89f3 100644
--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/main/java/org/apache/hadoop/yarn/server/nodemanager/containermanager/linux/resources/NetworkPacketTaggingHandlerImpl.java
+++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/main/java/org/apache/hadoop/yarn/server/nodemanager/containermanager/linux/resources/NetworkPacketTaggingHandlerImpl.java
@@ -166,4 +166,9 @@ public class NetworkPacketTaggingHandlerImpl
Configuration conf) {
return NetworkTagMappingManagerFactory.getManager(conf);
}
+
+ @Override
+ public String toString() {
+ return NetworkPacketTaggingHandlerImpl.class.getName();
+ }
}
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/linux/resources/ResourceHandlerChain.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/main/java/org/apache/hadoop/yarn/server/nodemanager/containermanager/linux/resources/ResourceHandlerChain.java
index 2fc301a..3292f94 100644
--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/main/java/org/apache/hadoop/yarn/server/nodemanager/containermanager/linux/resources/ResourceHandlerChain.java
+++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/main/java/org/apache/hadoop/yarn/server/nodemanager/containermanager/linux/resources/ResourceHandlerChain.java
@@ -159,4 +159,10 @@ public class ResourceHandlerChain implements ResourceHandler {
return Collections.unmodifiableList(resourceHandlers);
}
+ @Override
+ public String toString() {
+ return ResourceHandlerChain.class.getName() + "{" +
+ "resourceHandlers=" + resourceHandlers +
+ '}';
+ }
}
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/linux/resources/ResourceHandlerModule.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/main/java/org/apache/hadoop/yarn/server/nodemanager/containermanager/linux/resources/ResourceHandlerModule.java
index f8a3193..c2f0402 100644
--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/main/java/org/apache/hadoop/yarn/server/nodemanager/containermanager/linux/resources/ResourceHandlerModule.java
+++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/main/java/org/apache/hadoop/yarn/server/nodemanager/containermanager/linux/resources/ResourceHandlerModule.java
@@ -84,6 +84,9 @@ public class ResourceHandlerModule {
if (cGroupsHandler == null) {
cGroupsHandler = new CGroupsHandlerImpl(conf,
PrivilegedOperationExecutor.getInstance(conf));
+ if (LOG.isDebugEnabled()) {
+ LOG.debug("Value of CGroupsHandler is: " + cGroupsHandler);
+ }
}
}
}
@@ -306,16 +309,32 @@ public class ResourceHandlerModule {
List<ResourceHandler> handlerList, Configuration conf,
Context nmContext) throws ResourceHandlerException {
ResourcePluginManager pluginManager = nmContext.getResourcePluginManager();
- if (pluginManager != null) {
- Map<String, ResourcePlugin> pluginMap = pluginManager.getNameToPlugins();
- if (pluginMap != null) {
- for (ResourcePlugin plugin : pluginMap.values()) {
- addHandlerIfNotNull(handlerList, plugin
- .createResourceHandler(nmContext,
- getInitializedCGroupsHandler(conf),
- PrivilegedOperationExecutor.getInstance(conf)));
- }
+
+ if (pluginManager == null) {
+ LOG.warn("Plugin manager was null while trying to add " +
+ "ResourceHandlers from configuration!");
+ return;
+ }
+
+ Map<String, ResourcePlugin> pluginMap = pluginManager.getNameToPlugins();
+ if (pluginMap == null) {
+ if (LOG.isDebugEnabled()) {
+ LOG.debug("List of plugins of ResourcePluginManager was empty " +
+ "while trying to add ResourceHandlers from configuration!");
}
+ return;
+ } else {
+ if (LOG.isDebugEnabled()) {
+ LOG.debug("List of plugins of ResourcePluginManager: " +
+ pluginManager.getNameToPlugins());
+ }
+ }
+
+ for (ResourcePlugin plugin : pluginMap.values()) {
+ addHandlerIfNotNull(handlerList,
+ plugin.createResourceHandler(nmContext,
+ getInitializedCGroupsHandler(conf),
+ PrivilegedOperationExecutor.getInstance(conf)));
}
}
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/linux/resources/TrafficControlBandwidthHandlerImpl.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/main/java/org/apache/hadoop/yarn/server/nodemanager/containermanager/linux/resources/TrafficControlBandwidthHandlerImpl.java
index a65de02..d1dac4b 100644
--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/main/java/org/apache/hadoop/yarn/server/nodemanager/containermanager/linux/resources/TrafficControlBandwidthHandlerImpl.java
+++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/main/java/org/apache/hadoop/yarn/server/nodemanager/containermanager/linux/resources/TrafficControlBandwidthHandlerImpl.java
@@ -283,4 +283,9 @@ public class TrafficControlBandwidthHandlerImpl
return null;
}
+
+ @Override
+ public String toString() {
+ return TrafficControlBandwidthHandlerImpl.class.getName();
+ }
}
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/linux/resources/fpga/FpgaResourceHandlerImpl.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/main/java/org/apache/hadoop/yarn/server/nodemanager/containermanager/linux/resources/fpga/FpgaResourceHandlerImpl.java
index 11f7114..c952906 100644
--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/main/java/org/apache/hadoop/yarn/server/nodemanager/containermanager/linux/resources/fpga/FpgaResourceHandlerImpl.java
+++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/main/java/org/apache/hadoop/yarn/server/nodemanager/containermanager/linux/resources/fpga/FpgaResourceHandlerImpl.java
@@ -55,11 +55,11 @@ public class FpgaResourceHandlerImpl implements ResourceHandler {
private final String REQUEST_FPGA_IP_ID_KEY = "REQUESTED_FPGA_IP_ID";
- private AbstractFpgaVendorPlugin vendorPlugin;
+ private final AbstractFpgaVendorPlugin vendorPlugin;
- private FpgaResourceAllocator allocator;
+ private final FpgaResourceAllocator allocator;
- private CGroupsHandler cGroupsHandler;
+ private final CGroupsHandler cGroupsHandler;
public static final String EXCLUDED_FPGAS_CLI_OPTION = "--excluded_fpgas";
public static final String CONTAINER_ID_CLI_OPTION = "--container_id";
@@ -223,4 +223,12 @@ public class FpgaResourceHandlerImpl implements ResourceHandler {
public List<PrivilegedOperation> teardown() throws ResourceHandlerException {
return null;
}
+
+ @Override
+ public String toString() {
+ return FpgaResourceHandlerImpl.class.getName() + "{" +
+ "vendorPlugin=" + vendorPlugin +
+ ", allocator=" + allocator +
+ '}';
+ }
}
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/linux/resources/gpu/GpuResourceAllocator.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/main/java/org/apache/hadoop/yarn/server/nodemanager/containermanager/linux/resources/gpu/GpuResourceAllocator.java
index 49aac6d..2496ac8 100644
--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/main/java/org/apache/hadoop/yarn/server/nodemanager/containermanager/linux/resources/gpu/GpuResourceAllocator.java
+++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/main/java/org/apache/hadoop/yarn/server/nodemanager/containermanager/linux/resources/gpu/GpuResourceAllocator.java
@@ -301,4 +301,9 @@ public class GpuResourceAllocator {
}
return assigns;
}
+
+ @Override
+ public String toString() {
+ return GpuResourceAllocator.class.getName();
+ }
}
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/linux/resources/gpu/GpuResourceHandlerImpl.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/main/java/org/apache/hadoop/yarn/server/nodemanager/containermanager/linux/resources/gpu/GpuResourceHandlerImpl.java
index 84ef55f..d3be720 100644
--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/main/java/org/apache/hadoop/yarn/server/nodemanager/containermanager/linux/resources/gpu/GpuResourceHandlerImpl.java
+++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/main/java/org/apache/hadoop/yarn/server/nodemanager/containermanager/linux/resources/gpu/GpuResourceHandlerImpl.java
@@ -48,10 +48,10 @@ public class GpuResourceHandlerImpl implements ResourceHandler {
public static final String EXCLUDED_GPUS_CLI_OPTION = "--excluded_gpus";
public static final String CONTAINER_ID_CLI_OPTION = "--container_id";
- private Context nmContext;
- private GpuResourceAllocator gpuAllocator;
- private CGroupsHandler cGroupsHandler;
- private PrivilegedOperationExecutor privilegedOperationExecutor;
+ private final Context nmContext;
+ private final GpuResourceAllocator gpuAllocator;
+ private final CGroupsHandler cGroupsHandler;
+ private final PrivilegedOperationExecutor privilegedOperationExecutor;
public GpuResourceHandlerImpl(Context nmContext,
CGroupsHandler cGroupsHandler,
@@ -184,4 +184,11 @@ public class GpuResourceHandlerImpl implements ResourceHandler {
public List<PrivilegedOperation> teardown() throws ResourceHandlerException {
return null;
}
+
+ @Override
+ public String toString() {
+ return GpuResourceHandlerImpl.class.getName() + "{" +
+ "gpuAllocator=" + gpuAllocator +
+ '}';
+ }
}
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/linux/resources/numa/NumaResourceHandlerImpl.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/main/java/org/apache/hadoop/yarn/server/nodemanager/containermanager/linux/resources/numa/NumaResourceHandlerImpl.java
index 8ffba24..e6e3159 100644
--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/main/java/org/apache/hadoop/yarn/server/nodemanager/containermanager/linux/resources/numa/NumaResourceHandlerImpl.java
+++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/main/java/org/apache/hadoop/yarn/server/nodemanager/containermanager/linux/resources/numa/NumaResourceHandlerImpl.java
@@ -41,8 +41,8 @@ public class NumaResourceHandlerImpl implements ResourceHandler {
private static final Log LOG = LogFactory
.getLog(NumaResourceHandlerImpl.class);
- private NumaResourceAllocator numaResourceAllocator;
- private String numaCtlCmd;
+ private final NumaResourceAllocator numaResourceAllocator;
+ private final String numaCtlCmd;
public NumaResourceHandlerImpl(Configuration conf, Context nmContext) {
LOG.info("NUMA resources allocation is enabled, initializing NUMA resources"
@@ -111,4 +111,12 @@ public class NumaResourceHandlerImpl implements ResourceHandler {
public List<PrivilegedOperation> teardown() throws ResourceHandlerException {
return null;
}
+
+ @Override
+ public String toString() {
+ return NumaResourceHandlerImpl.class.getName() + "{" +
+ "numaResourceAllocator=" + numaResourceAllocator +
+ ", numaCtlCmd='" + numaCtlCmd + '\'' +
+ '}';
+ }
}
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/resourceplugin/ResourcePluginManager.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/main/java/org/apache/hadoop/yarn/server/nodemanager/containermanager/resourceplugin/ResourcePluginManager.java
index f28aad2..14218c1 100644
--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/main/java/org/apache/hadoop/yarn/server/nodemanager/containermanager/resourceplugin/ResourcePluginManager.java
+++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/main/java/org/apache/hadoop/yarn/server/nodemanager/containermanager/resourceplugin/ResourcePluginManager.java
@@ -29,6 +29,7 @@ import org.apache.hadoop.yarn.server.nodemanager.containermanager.resourceplugin
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
+import java.util.Arrays;
import java.util.Collections;
import java.util.HashMap;
import java.util.Map;
@@ -52,7 +53,13 @@ public class ResourcePluginManager {
public synchronized void initialize(Context context)
throws YarnException {
Configuration conf = context.getConf();
+
String[] plugins = conf.getStrings(YarnConfiguration.NM_RESOURCE_PLUGINS);
+ if (plugins == null || plugins.length == 0) {
+ LOG.info("No Resource plugins found from configuration!");
+ }
+ LOG.info("Found Resource plugins from configuration: "
+ + Arrays.toString(plugins));
if (plugins != null) {
Map<String, ResourcePlugin> pluginMap = new HashMap<>();
@@ -64,23 +71,21 @@ public class ResourcePluginManager {
String msg =
"Trying to initialize resource plugin with name=" + resourceName
+ ", it is not supported, list of supported plugins:"
- + StringUtils.join(",",
- SUPPORTED_RESOURCE_PLUGINS);
+ + StringUtils.join(",", SUPPORTED_RESOURCE_PLUGINS);
LOG.error(msg);
throw new YarnException(msg);
}
if (pluginMap.containsKey(resourceName)) {
- // Duplicated items, ignore ...
+ LOG.warn("Ignoring duplicate Resource plugin definition: " +
+ resourceName);
continue;
}
ResourcePlugin plugin = null;
if (resourceName.equals(GPU_URI)) {
plugin = new GpuResourcePlugin();
- }
-
- if (resourceName.equals(FPGA_URI)) {
+ } else if (resourceName.equals(FPGA_URI)) {
plugin = new FpgaResourcePlugin();
}
@@ -90,6 +95,7 @@ public class ResourcePluginManager {
+ " should be loaded and initialized");
}
plugin.initialize(context);
+ LOG.info("Initialized plugin {}", plugin);
pluginMap.put(resourceName, plugin);
}
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/resourceplugin/fpga/FpgaResourcePlugin.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/main/java/org/apache/hadoop/yarn/server/nodemanager/containermanager/resourceplugin/fpga/FpgaResourcePlugin.java
index 44d093e..9add3d2 100644
--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/main/java/org/apache/hadoop/yarn/server/nodemanager/containermanager/resourceplugin/fpga/FpgaResourcePlugin.java
+++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/main/java/org/apache/hadoop/yarn/server/nodemanager/containermanager/resourceplugin/fpga/FpgaResourcePlugin.java
@@ -102,4 +102,9 @@ public class FpgaResourcePlugin implements ResourcePlugin {
public NMResourceInfo getNMResourceInfo() throws YarnException {
return null;
}
+
+ @Override
+ public String toString() {
+ return FpgaResourcePlugin.class.getName();
+ }
}
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/resourceplugin/gpu/GpuResourcePlugin.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/main/java/org/apache/hadoop/yarn/server/nodemanager/containermanager/resourceplugin/gpu/GpuResourcePlugin.java
index f28218d..e49d2f2 100644
--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/main/java/org/apache/hadoop/yarn/server/nodemanager/containermanager/resourceplugin/gpu/GpuResourcePlugin.java
+++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/main/java/org/apache/hadoop/yarn/server/nodemanager/containermanager/resourceplugin/gpu/GpuResourcePlugin.java
@@ -89,4 +89,9 @@ public class GpuResourcePlugin implements ResourcePlugin {
return new NMGpuResourceInfo(gpuDeviceInformation, totalGpus,
assignedGpuDevices);
}
+
+ @Override
+ public String toString() {
+ return GpuResourcePlugin.class.getName();
+ }
}
---------------------------------------------------------------------
To unsubscribe, e-mail: common-commits-unsubscribe@hadoop.apache.org
For additional commands, e-mail: common-commits-help@hadoop.apache.org