goiri commented on code in PR #5934:
URL: https://github.com/apache/hadoop/pull/5934#discussion_r1305919907
##########
hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-common/src/main/java/org/apache/hadoop/yarn/server/federation/utils/FederationStateStoreFacade.java:
##########
@@ -51,38 +51,7 @@
import org.apache.hadoop.yarn.server.federation.resolver.SubClusterResolver;
import org.apache.hadoop.yarn.server.federation.store.FederationStateStore;
import
org.apache.hadoop.yarn.server.federation.store.exception.FederationStateStoreRetriableException;
-import
org.apache.hadoop.yarn.server.federation.store.records.AddApplicationHomeSubClusterRequest;
-import
org.apache.hadoop.yarn.server.federation.store.records.AddApplicationHomeSubClusterResponse;
-import
org.apache.hadoop.yarn.server.federation.store.records.AddReservationHomeSubClusterRequest;
-import
org.apache.hadoop.yarn.server.federation.store.records.AddReservationHomeSubClusterResponse;
-import
org.apache.hadoop.yarn.server.federation.store.records.ApplicationHomeSubCluster;
-import
org.apache.hadoop.yarn.server.federation.store.records.GetApplicationHomeSubClusterRequest;
-import
org.apache.hadoop.yarn.server.federation.store.records.GetApplicationHomeSubClusterResponse;
-import
org.apache.hadoop.yarn.server.federation.store.records.GetReservationHomeSubClusterRequest;
-import
org.apache.hadoop.yarn.server.federation.store.records.GetReservationHomeSubClusterResponse;
-import
org.apache.hadoop.yarn.server.federation.store.records.GetSubClusterInfoRequest;
-import
org.apache.hadoop.yarn.server.federation.store.records.GetSubClusterInfoResponse;
-import
org.apache.hadoop.yarn.server.federation.store.records.GetSubClusterPoliciesConfigurationsRequest;
-import
org.apache.hadoop.yarn.server.federation.store.records.GetSubClusterPolicyConfigurationRequest;
-import
org.apache.hadoop.yarn.server.federation.store.records.GetSubClusterPolicyConfigurationResponse;
-import
org.apache.hadoop.yarn.server.federation.store.records.SetSubClusterPolicyConfigurationRequest;
-import
org.apache.hadoop.yarn.server.federation.store.records.GetSubClustersInfoRequest;
-import
org.apache.hadoop.yarn.server.federation.store.records.ReservationHomeSubCluster;
-import org.apache.hadoop.yarn.server.federation.store.records.SubClusterId;
-import org.apache.hadoop.yarn.server.federation.store.records.SubClusterInfo;
-import
org.apache.hadoop.yarn.server.federation.store.records.SubClusterPolicyConfiguration;
-import
org.apache.hadoop.yarn.server.federation.store.records.UpdateApplicationHomeSubClusterRequest;
-import
org.apache.hadoop.yarn.server.federation.store.records.UpdateReservationHomeSubClusterRequest;
-import
org.apache.hadoop.yarn.server.federation.store.records.DeleteReservationHomeSubClusterRequest;
-import
org.apache.hadoop.yarn.server.federation.store.records.RouterMasterKeyRequest;
-import
org.apache.hadoop.yarn.server.federation.store.records.RouterMasterKeyResponse;
-import org.apache.hadoop.yarn.server.federation.store.records.RouterMasterKey;
-import org.apache.hadoop.yarn.server.federation.store.records.RouterStoreToken;
-import
org.apache.hadoop.yarn.server.federation.store.records.RouterRMTokenRequest;
-import
org.apache.hadoop.yarn.server.federation.store.records.RouterRMTokenResponse;
-import org.apache.hadoop.yarn.server.federation.store.records.SubClusterState;
-import
org.apache.hadoop.yarn.server.federation.store.records.SubClusterDeregisterRequest;
-import
org.apache.hadoop.yarn.server.federation.store.records.SubClusterDeregisterResponse;
+import org.apache.hadoop.yarn.server.federation.store.records.*;
Review Comment:
Avoid
##########
hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-globalpolicygenerator/src/main/java/org/apache/hadoop/yarn/server/globalpolicygenerator/GlobalPolicyGenerator.java:
##########
@@ -155,6 +163,16 @@ protected void serviceStart() throws Exception {
DurationFormatUtils.formatDurationISO(scCleanerIntervalMs));
}
+ // Schedule ApplicationCleaner service
+ long appCleanerIntervalMs =
config.getLong(YarnConfiguration.GPG_APPCLEANER_INTERVAL_MS,
Review Comment:
I know is a backport but... Can we use getTimeDuration?
##########
hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-globalpolicygenerator/src/test/java/org/apache/hadoop/yarn/server/globalpolicygenerator/applicationcleaner/TestDefaultApplicationCleaner.java:
##########
@@ -0,0 +1,130 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.apache.hadoop.yarn.server.globalpolicygenerator.applicationcleaner;
+
+import java.util.ArrayList;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Set;
+
+import org.apache.hadoop.conf.Configuration;
+import org.apache.hadoop.yarn.api.records.ApplicationId;
+import org.apache.hadoop.yarn.conf.YarnConfiguration;
+import org.apache.hadoop.yarn.exceptions.YarnException;
+import org.apache.hadoop.yarn.exceptions.YarnRuntimeException;
+import
org.apache.hadoop.yarn.server.federation.store.impl.MemoryFederationStateStore;
+import
org.apache.hadoop.yarn.server.federation.store.records.AddApplicationHomeSubClusterRequest;
+import
org.apache.hadoop.yarn.server.federation.store.records.ApplicationHomeSubCluster;
+import
org.apache.hadoop.yarn.server.federation.store.records.GetApplicationsHomeSubClusterRequest;
+import org.apache.hadoop.yarn.server.federation.store.records.SubClusterId;
+import
org.apache.hadoop.yarn.server.federation.utils.FederationStateStoreFacade;
+import org.apache.hadoop.yarn.server.globalpolicygenerator.GPGContext;
+import org.apache.hadoop.yarn.server.globalpolicygenerator.GPGContextImpl;
+import org.junit.After;
+import org.junit.Assert;
+import org.junit.Before;
+import org.junit.Test;
+
+/**
+ * Unit test for DefaultApplicationCleaner in GPG.
+ */
+public class TestDefaultApplicationCleaner {
+ private Configuration conf;
+ private MemoryFederationStateStore stateStore;
+ private FederationStateStoreFacade facade;
+ private ApplicationCleaner appCleaner;
+ private GPGContext gpgContext;
+
+ private List<ApplicationId> appIds;
+ // The list of applications returned by mocked router
+ private Set<ApplicationId> routerAppIds;
+
+ @Before
+ public void setup() throws Exception {
+ conf = new YarnConfiguration();
+
+ // No Router query retry
+ conf.set(YarnConfiguration.GPG_APPCLEANER_CONTACT_ROUTER_SPEC, "1,1,0");
+
+ stateStore = new MemoryFederationStateStore();
+ stateStore.init(conf);
+
+ facade = FederationStateStoreFacade.getInstance();
+ facade.reinitialize(stateStore, conf);
+
+ gpgContext = new GPGContextImpl();
+ gpgContext.setStateStoreFacade(facade);
+
+ appCleaner = new TestableDefaultApplicationCleaner();
+ appCleaner.init(conf, gpgContext);
+
+ routerAppIds = new HashSet<ApplicationId>();
+
+ appIds = new ArrayList<ApplicationId>();
+ for (int i = 0; i < 3; i++) {
+ ApplicationId appId = ApplicationId.newInstance(0, i);
+ appIds.add(appId);
+
+ SubClusterId subClusterId =
+ SubClusterId.newInstance("SUBCLUSTER-" + Integer.toString(i));
+
+ stateStore.addApplicationHomeSubCluster(
+ AddApplicationHomeSubClusterRequest.newInstance(
+ ApplicationHomeSubCluster.newInstance(appId, subClusterId)));
+ }
+ }
+
+ @After
+ public void breakDown() throws Exception {
+ if (stateStore != null) {
+ stateStore.close();
Review Comment:
Reset to null.
##########
hadoop-yarn-project/hadoop-yarn/hadoop-yarn-api/src/main/java/org/apache/hadoop/yarn/conf/YarnConfiguration.java:
##########
@@ -4390,6 +4390,31 @@ public static boolean isAclEnabled(Configuration conf) {
public static final String GPG_KERBEROS_PRINCIPAL_HOSTNAME_KEY =
FEDERATION_GPG_PREFIX +
"kerberos.principal.hostname";
+ // The application cleaner class to use
+ public static final String GPG_APPCLEANER_CLASS =
+ FEDERATION_GPG_PREFIX + "application.cleaner.class";
+ public static final String DEFAULT_GPG_APPCLEANER_CLASS =
+ "org.apache.hadoop.yarn.server.globalpolicygenerator"
Review Comment:
Can we use DefaultApplicationCleaner.getClass()?
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: common-issues-unsubscr...@hadoop.apache.org
For queries about this service, please contact Infrastructure at:
us...@infra.apache.org
---------------------------------------------------------------------
To unsubscribe, e-mail: common-issues-unsubscr...@hadoop.apache.org
For additional commands, e-mail: common-issues-h...@hadoop.apache.org
