big-data/hadoop
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

YARN-8898. [Addendum] Improve NodeManager#TestFederationInterceptor Setup Code (#5732)

Browse Source
This commit is contained in:
slfan1989 2023-06-13 06:21:24 +08:00 committed by GitHub
parent a409d52ef8
commit 2794fe264b
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 18 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-common/src/main/java/org/apache/hadoop/yarn/server/federation/store/impl/MemoryFederationStateStore.java
View File

@ -40,6 +40,8 @@
import org.apache.hadoop.yarn.security.client.RMDelegationTokenIdentifier;
import org.apache.hadoop.yarn.api.records.ApplicationId;
import org.apache.hadoop.yarn.api.records.ReservationId;
import org.apache.hadoop.yarn.api.records.Priority;
import org.apache.hadoop.yarn.api.records.Resource;
import org.apache.hadoop.yarn.conf.YarnConfiguration;
import org.apache.hadoop.yarn.exceptions.YarnException;
import org.apache.hadoop.yarn.server.federation.store.FederationStateStore;
@ -668,4 +670,17 @@ public void setExpiredHeartbeat(SubClusterId subClusterId, long heartBearTime)
SubClusterInfo subClusterInfo = membership.get(subClusterId);
subClusterInfo.setLastHeartBeat(heartBearTime);
}
@VisibleForTesting
public void setApplicationContext(String subClusterId, ApplicationId applicationId,
long createTime) {
ApplicationSubmissionContext context =
ApplicationSubmissionContext.newInstance(applicationId, "test", "default",
Priority.newInstance(0), null, true, true,
2, Resource.newInstance(10, 2), "test");
SubClusterId homeSubClusterId = SubClusterId.newInstance(subClusterId);
ApplicationHomeSubCluster applicationHomeSubCluster =
ApplicationHomeSubCluster.newInstance(applicationId, createTime, homeSubClusterId, context);
this.applications.put(applicationId, applicationHomeSubCluster);
}
}

3
hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/test/java/org/apache/hadoop/yarn/server/nodemanager/amrmproxy/TestFederationInterceptor.java
View File

@ -39,6 +39,7 @@
import org.apache.hadoop.registry.client.impl.FSRegistryOperationsService;
import org.apache.hadoop.security.UserGroupInformation;
import org.apache.hadoop.test.LambdaTestUtils;
import org.apache.hadoop.util.Time;
import org.apache.hadoop.yarn.api.protocolrecords.AllocateRequest;
import org.apache.hadoop.yarn.api.protocolrecords.AllocateResponse;
import org.apache.hadoop.yarn.api.protocolrecords.FinishApplicationMasterRequest;
@ -130,6 +131,8 @@ public void setUp() throws IOException {
testAppId = 1;
attemptId = getApplicationAttemptId(testAppId);
stateStore.setApplicationContext(HOME_SC_ID, attemptId.getApplicationId(), Time.now());
nmContext =
new NMContext(null, null, null, null, nmStateStore, false, getConf());
interceptor.init(new AMRMProxyApplicationContextImpl(nmContext, getConf(),