YARN-9013. Fix CheckStyle.

Author: slfan1989

hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-globalpolicygenerator/src/main/java/org/apache/hadoop/yarn/server/globalpolicygenerator/applicationcleaner/DefaultApplicationCleaner.java

@@ -24,7 +24,7 @@
 import java.util.Set;
 import java.util.stream.Collectors;
 
-import org.apache.hadoop.thirdparty.com.google.common.collect.Sets;
+import org.apache.hadoop.util.Sets;
 import org.apache.hadoop.yarn.api.records.ApplicationId;
 import org.apache.hadoop.yarn.server.federation.store.records.ApplicationHomeSubCluster;
 import org.apache.hadoop.yarn.server.federation.utils.FederationStateStoreFacade;
@@ -56,6 +56,10 @@ public void run() {
       }
       LOG.info("{} app entries in FederationStateStore", allStateStoreApps.size());
 
+      // Get the candidate list from Registry before calling router
+      List<String> allRegistryApps = getRegistryClient().getAllApplications();
+      LOG.info("{} app entries in FederationRegistry", allStateStoreApps.size());
+
       // Get the list of known apps from Router
       Set<ApplicationId> routerApps = getRouterKnownApplications();
       LOG.info("{} known applications from Router", routerApps.size());
@@ -65,10 +69,9 @@ public void run() {
           Sets.difference(allStateStoreApps, routerApps);
 
       LOG.info("Deleting {} applications from statestore", toDelete.size());
-      if (LOG.isDebugEnabled()) {
-        LOG.debug("Apps to delete: {}.", toDelete.stream().map(Object::toString)
-            .collect(Collectors.joining(",")));
-      }
+      LOG.debug("Apps to delete: {}.",
+          toDelete.stream().map(Object::toString).collect(Collectors.joining(",")));
+
       for (ApplicationId appId : toDelete) {
         try {
           LOG.debug("Deleting {} from statestore ", appId);
@@ -77,8 +80,15 @@ public void run() {
           LOG.error("deleteApplicationHomeSubCluster failed at application {}.", appId, e);
         }
       }
-      // Clean up registry entries
-      cleanupAppRecordInRegistry(routerApps);
+
+      // Clean up Registry entries
+      for (String app : allRegistryApps) {
+        ApplicationId appId = ApplicationId.fromString(app);
+        if (!routerApps.contains(appId)) {
+          LOG.debug("removing finished application entry for {}", app);
+          getRegistryClient().removeAppFromRegistry(appId, true);
+        }
+      }
     } catch (Throwable e) {
       LOG.error("Application cleaner started at time {} fails. ", now, e);
     }