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 23498fe7ca9..b0d68295725 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 @@ -315,11 +315,12 @@ public void init(Context context) throws IOException { 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 2c402c013d6..d25e27533f7 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 @@ private void checkDiskScheduler() { public List teardown() throws ResourceHandlerException { return null; } + + @Override + public String toString() { + return "CGroupsBlkioResourceHandlerImpl"; + } } 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 37221f45551..e42bc1bad59 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,13 @@ public static boolean cpuLimitsExist(String path) throws ResourceHandlerException { return null; } + + @Override + public String toString() { + return "CGroupsCpuResourceHandlerImpl{" + + " strictResourceUsageMode=" + strictResourceUsageMode + + ", yarnProcessors=" + yarnProcessors + + ", nodeVCores=" + nodeVCores + + '}'; + } } 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 1b2c7804bde..98f09a60aaf 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 @@ -622,4 +622,18 @@ public String getCGroupParam(CGroupController controller, String cGroupId, public String getCGroupMountPath() { return cGroupMountPath; } + + @Override + public String toString() { + return "CGroupsHandlerImpl{" + + "mtabFile='" + mtabFile + '\'' + + ", cGroupPrefix='" + cGroupPrefix + '\'' + + ", enableCGroupMount=" + enableCGroupMount + + ", cGroupMountPath='" + cGroupMountPath + '\'' + + ", deleteCGroupTimeout=" + deleteCGroupTimeout + + ", deleteCGroupDelay=" + deleteCGroupDelay + + ", controllerPaths=" + controllerPaths + + ", parsedMtab=" + parsedMtab + + '}'; + } } \ 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 ee5ce2acdf7..82c907dbddb 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 @@ -171,4 +171,13 @@ int getSwappiness() { public List teardown() throws ResourceHandlerException { return null; } + + @Override + public String toString() { + return "CGroupsMemoryResourceHandlerImpl{" + + " enforce=" + enforce + + ", swappiness=" + swappiness + + ", softLimit=" + softLimit + + '}'; + } } 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 3f6d4b63406..8c18c309f68 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,12 @@ public NetworkTagMappingManager createNetworkTagMappingManager( Configuration conf) { return NetworkTagMappingManagerFactory.getManager(conf); } + + @Override + public String toString() { + return "NetworkPacketTaggingHandlerImpl{" + + " conf=" + conf + + ", tagMappingManager=" + tagMappingManager + + '}'; + } } 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 2fc301a4ed8..26c15f71309 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 ResourceHandlerChain(List resourceHandlers) { return Collections.unmodifiableList(resourceHandlers); } + @Override + public String toString() { + return "ResourceHandlerChain{" + + "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 f8a319340cf..c2f0402b84e 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 @@ private static CGroupsHandler getInitializedCGroupsHandler(Configuration conf) if (cGroupsHandler == null) { cGroupsHandler = new CGroupsHandlerImpl(conf, PrivilegedOperationExecutor.getInstance(conf)); + if (LOG.isDebugEnabled()) { + LOG.debug("Value of CGroupsHandler is: " + cGroupsHandler); + } } } } @@ -306,16 +309,32 @@ private static void addHandlersFromConfiguredResourcePlugins( List handlerList, Configuration conf, Context nmContext) throws ResourceHandlerException { ResourcePluginManager pluginManager = nmContext.getResourcePluginManager(); - if (pluginManager != null) { - Map 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 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 a65de02a671..34624ff5874 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,19 @@ public TrafficControlBandwidthHandlerImpl(PrivilegedOperationExecutor return null; } + + @Override + public String toString() { + return "TrafficControlBandwidthHandlerImpl{" + + "privilegedOperationExecutor=" + privilegedOperationExecutor + + ", trafficController=" + trafficController + + ", containerIdClassIdMap=" + containerIdClassIdMap + + ", conf=" + conf + + ", device='" + device + '\'' + + ", strictMode=" + strictMode + + ", containerBandwidthMbit=" + containerBandwidthMbit + + ", rootBandwidthMbit=" + rootBandwidthMbit + + ", yarnBandwidthMbit=" + yarnBandwidthMbit + + '}'; + } } 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 11f7114a401..fd30eaf1ed0 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 @@ -223,4 +223,13 @@ public String getRequestedIPID(Container container) { public List teardown() throws ResourceHandlerException { return null; } + + @Override + public String toString() { + return "FpgaResourceHandlerImpl{" + + "vendorPlugin=" + vendorPlugin + + ", allocator=" + allocator + + ", privilegedOperationExecutor=" + privilegedOperationExecutor + + '}'; + } } 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 81a965522ce..9413a91c40d 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 @@ -304,4 +304,12 @@ public synchronized void cleanupAssignGpus(ContainerId containerId) { } return assigns; } + + @Override + public String toString() { + return "GpuResourceAllocator{" + + "allowedGpuDevices=" + allowedGpuDevices + + ", usedDevices=" + usedDevices + + '}'; + } } 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 e25a6b5bee7..8914fae289c 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 @@ -185,4 +185,12 @@ public GpuResourceAllocator getGpuAllocator() { public List teardown() throws ResourceHandlerException { return null; } + + @Override + public String toString() { + return "GpuResourceHandlerImpl{" + + "gpuAllocator=" + gpuAllocator + + ", privilegedOperationExecutor=" + privilegedOperationExecutor + + '}'; + } } 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 8ffba242354..1bebc5ee1c1 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 @@ -111,4 +111,12 @@ public NumaResourceHandlerImpl(Configuration conf, Context nmContext) { public List teardown() throws ResourceHandlerException { return null; } + + @Override + public String toString() { + return "NumaResourceHandlerImpl{" + + "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 6dfe817111f..bd47cfe0879 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 @@ -39,6 +39,7 @@ import org.slf4j.LoggerFactory; import java.lang.reflect.Method; +import java.util.Arrays; import java.util.Collections; import java.util.HashMap; import java.util.Map; @@ -67,6 +68,12 @@ public synchronized void initialize(Context context) Map pluginMap = new HashMap<>(); 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) { // Initialize each plugins for (String resourceName : plugins) { @@ -75,23 +82,21 @@ public synchronized void initialize(Context context) 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(); } @@ -101,6 +106,7 @@ public synchronized void initialize(Context context) + " 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/deviceframework/DevicePluginAdapter.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/deviceframework/DevicePluginAdapter.java index 1636cb89ff5..efe5303fdd3 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/deviceframework/DevicePluginAdapter.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/deviceframework/DevicePluginAdapter.java @@ -99,4 +99,9 @@ public NMResourceInfo getNMResourceInfo() throws YarnException { public DeviceResourceHandlerImpl getDeviceResourceHandler() { return deviceResourceHandler; } + + @Override + public String toString() { + return "DevicePluginAdapter"; + } } 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/deviceframework/DeviceResourceHandlerImpl.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/deviceframework/DeviceResourceHandlerImpl.java index d33b8da3251..f640a35acbd 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/deviceframework/DeviceResourceHandlerImpl.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/deviceframework/DeviceResourceHandlerImpl.java @@ -142,4 +142,15 @@ public DeviceResourceHandlerImpl(String reseName, throws ResourceHandlerException { return null; } + + @Override + public String toString() { + return "DeviceResourceHandlerImpl{" + + "resourceName='" + resourceName + '\'' + + ", devicePlugin=" + devicePlugin + + ", deviceMappingManager=" + deviceMappingManager + + ", privilegedOperationExecutor=" + privilegedOperationExecutor + + ", devicePluginAdapter=" + devicePluginAdapter + + '}'; + } } 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 44d093e62f4..aeb33586747 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 DockerCommandPlugin getDockerCommandPluginInstance() { public NMResourceInfo getNMResourceInfo() throws YarnException { return null; } + + @Override + public String toString() { + return "FpgaResourcePlugin"; + } } 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 f28218de224..7980dd4fbf5 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 NMResourceInfo getNMResourceInfo() throws YarnException { return new NMGpuResourceInfo(gpuDeviceInformation, totalGpus, assignedGpuDevices); } + + @Override + public String toString() { + return "GpuResourcePlugin"; + } } 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/scheduler/ContainerScheduler.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/main/java/org/apache/hadoop/yarn/server/nodemanager/containermanager/scheduler/ContainerScheduler.java index 34aac8111d6..e78f8d22309 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/main/java/org/apache/hadoop/yarn/server/nodemanager/containermanager/scheduler/ContainerScheduler.java +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/main/java/org/apache/hadoop/yarn/server/nodemanager/containermanager/scheduler/ContainerScheduler.java @@ -142,7 +142,6 @@ public void serviceInit(Configuration conf) throws Exception { != null)); } if (resourceHandlerChain != null) { - LOG.debug("Bootstrapping resource handler chain"); resourceHandlerChain.bootstrap(conf); } } catch (ResourceHandlerException e) {