Browse Source

YARN-9639. DecommissioningNodesWatcher cause memory leak. Contributed by Bilwa S T.

bibinchundatt 6 years ago
parent
commit
be80334cdf

+ 5 - 0
hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/DecommissioningNodesWatcher.java

@@ -194,6 +194,11 @@ public class DecommissioningNodesWatcher {
     }
     }
   }
   }
 
 
+  public void stop() {
+    pollTimer.cancel();
+    pollTimer = null;
+  }
+
   /**
   /**
    * Status about a specific decommissioning node.
    * Status about a specific decommissioning node.
    *
    *

+ 1 - 0
hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/ResourceTrackerService.java

@@ -268,6 +268,7 @@ public class ResourceTrackerService extends AbstractService implements
 
 
   @Override
   @Override
   protected void serviceStop() throws Exception {
   protected void serviceStop() throws Exception {
+    decommissioningWatcher.stop();
     if (this.server != null) {
     if (this.server != null) {
       this.server.stop();
       this.server.stop();
     }
     }