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 de061d6016a..1274b64f4f6 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 @@ -65,7 +65,7 @@ private DeviceMappingManager deviceMappingManager = null; - public synchronized void initialize(Context context) + public void initialize(Context context) throws YarnException, ClassNotFoundException { Configuration conf = context.getConf(); Map pluginMap = new HashMap<>(); @@ -274,7 +274,7 @@ public DeviceMappingManager getDeviceMappingManager() { return deviceMappingManager; } - public synchronized void cleanup() throws YarnException { + public void cleanup() throws YarnException { for (ResourcePlugin plugin : configuredPlugins.values()) { plugin.cleanup(); } 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 393d76e1f5b..b8c563d12a7 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 @@ -47,7 +47,7 @@ public GpuResourcePlugin(GpuNodeResourceUpdateHandler resourceDiscoverHandler, } @Override - public synchronized void initialize(Context context) throws YarnException { + public void initialize(Context context) throws YarnException { this.gpuDiscoverer.initialize(context.getConf()); this.dockerCommandPlugin = GpuDockerCommandPluginFactory.createGpuDockerCommandPlugin( @@ -55,7 +55,7 @@ public synchronized void initialize(Context context) throws YarnException { } @Override - public synchronized ResourceHandler createResourceHandler( + public ResourceHandler createResourceHandler( Context context, CGroupsHandler cGroupsHandler, PrivilegedOperationExecutor privilegedOperationExecutor) { if (gpuResourceHandler == null) { @@ -67,7 +67,7 @@ public synchronized ResourceHandler createResourceHandler( } @Override - public synchronized NodeResourceUpdaterPlugin getNodeResourceHandlerInstance() { + public NodeResourceUpdaterPlugin getNodeResourceHandlerInstance() { return resourceDiscoverHandler; }