YARN-11531. [Federation] Code cleanup for NodeManager#amrmproxy. (#5841)

apache · Jul 19, 2023 · 84dd624 · 84dd624
1 parent b6b2590
commit 84dd624
Show file tree

Hide file tree

Showing 15 changed files with 707 additions and 857 deletions.
diff --git a/...src/main/java/org/apache/hadoop/yarn/server/federation/utils/FederationMethodWrapper.java b/...src/main/java/org/apache/hadoop/yarn/server/federation/utils/FederationMethodWrapper.java
@@ -28,7 +28,7 @@
 public abstract class FederationMethodWrapper {
 
   /**
-   * List of parameters: static and dynamic values, matchings types.
+   * List of parameters: static and dynamic values, matching types.
    */
   private Object[] params;
 

diff --git a/...java/org/apache/hadoop/yarn/server/nodemanager/amrmproxy/AMRMProxyApplicationContext.java b/...java/org/apache/hadoop/yarn/server/nodemanager/amrmproxy/AMRMProxyApplicationContext.java
@@ -67,7 +67,7 @@ public interface AMRMProxyApplicationContext {
    * Gets the NMContext object.
    * @return the NMContext.
    */
-  Context getNMCotext();
+  Context getNMContext();
 
   /**
    * Gets the credentials of this application.

diff --git a/.../org/apache/hadoop/yarn/server/nodemanager/amrmproxy/AMRMProxyApplicationContextImpl.java b/.../org/apache/hadoop/yarn/server/nodemanager/amrmproxy/AMRMProxyApplicationContextImpl.java
@@ -144,7 +144,7 @@ public synchronized int getLocalAMRMTokenKeyId() {
   }
 
   @Override
-  public Context getNMCotext() {
+  public Context getNMContext() {
     return nmContext;
   }
 

diff --git a/...r/src/main/java/org/apache/hadoop/yarn/server/nodemanager/amrmproxy/AMRMProxyService.java b/...r/src/main/java/org/apache/hadoop/yarn/server/nodemanager/amrmproxy/AMRMProxyService.java
@@ -741,7 +741,7 @@ private List<String> getInterceptorClassNames(Configuration conf) {
             YarnConfiguration.AMRM_PROXY_INTERCEPTOR_CLASS_PIPELINE,
             YarnConfiguration.DEFAULT_AMRM_PROXY_INTERCEPTOR_CLASS_PIPELINE);
 
-    List<String> interceptorClassNames = new ArrayList<String>();
+    List<String> interceptorClassNames = new ArrayList<>();
     Collection<String> tempList =
         StringUtils.getStringCollection(configuredInterceptorClassNames);
     for (String item : tempList) {

diff --git a/...java/org/apache/hadoop/yarn/server/nodemanager/amrmproxy/AMRMProxyTokenSecretManager.java b/...java/org/apache/hadoop/yarn/server/nodemanager/amrmproxy/AMRMProxyTokenSecretManager.java
@@ -72,8 +72,7 @@ public class AMRMProxyTokenSecretManager extends
 
   private NMStateStoreService nmStateStore;
 
-  private final Set<ApplicationAttemptId> appAttemptSet =
-      new HashSet<ApplicationAttemptId>();
+  private final Set<ApplicationAttemptId> appAttemptSet = new HashSet<>();
 
   /**
    * Create an {@link AMRMProxyTokenSecretManager}.
@@ -226,8 +225,7 @@ public Token<AMRMTokenIdentifier> createAndGetAMRMToken(
               .getMasterKey().getKeyId());
       byte[] password = this.createPassword(identifier);
       appAttemptSet.add(appAttemptId);
-      return new Token<AMRMTokenIdentifier>(identifier.getBytes(),
-          password, identifier.getKind(), new Text());
+      return new Token<>(identifier.getBytes(), password, identifier.getKind(), new Text());
     } finally {
       this.writeLock.unlock();
     }

diff --git a/.../java/org/apache/hadoop/yarn/server/nodemanager/amrmproxy/AbstractRequestInterceptor.java b/.../java/org/apache/hadoop/yarn/server/nodemanager/amrmproxy/AbstractRequestInterceptor.java
@@ -159,9 +159,9 @@ public DistributedSchedulingAllocateResponse allocateForDistributedScheduling(
    * @return the NMSS instance
    */
   public NMStateStoreService getNMStateStore() {
-    if (this.appContext == null || this.appContext.getNMCotext() == null) {
+    if (this.appContext == null || this.appContext.getNMContext() == null) {
       return null;
     }
-    return this.appContext.getNMCotext().getNMStateStore();
+    return this.appContext.getNMContext().getNMStateStore();
   }
 }
diff --git a/...n/java/org/apache/hadoop/yarn/server/nodemanager/amrmproxy/DefaultRequestInterceptor.java b/...n/java/org/apache/hadoop/yarn/server/nodemanager/amrmproxy/DefaultRequestInterceptor.java
@@ -95,25 +95,17 @@ public void init(AMRMProxyApplicationContext appContext) {
   private ApplicationMasterProtocol createRMClient(
       AMRMProxyApplicationContext appContext, final Configuration conf)
       throws IOException, InterruptedException {
-    if (appContext.getNMCotext().isDistributedSchedulingEnabled()) {
-      return user.doAs(
-          new PrivilegedExceptionAction<DistributedSchedulingAMProtocol>() {
-            @Override
-            public DistributedSchedulingAMProtocol run() throws Exception {
-              setAMRMTokenService(conf);
-              return ServerRMProxy.createRMProxy(conf,
-                  DistributedSchedulingAMProtocol.class);
-            }
-          });
+    if (appContext.getNMContext().isDistributedSchedulingEnabled()) {
+      return user.doAs((PrivilegedExceptionAction<DistributedSchedulingAMProtocol>) () -> {
+        setAMRMTokenService(conf);
+        return ServerRMProxy.createRMProxy(conf, DistributedSchedulingAMProtocol.class);
+      });
     } else {
       return user.doAs(
-          new PrivilegedExceptionAction<ApplicationMasterProtocol>() {
-            @Override
-            public ApplicationMasterProtocol run() throws Exception {
-              setAMRMTokenService(conf);
-              return ClientRMProxy.createRMProxy(conf,
-                  ApplicationMasterProtocol.class);
-            }
+          (PrivilegedExceptionAction<ApplicationMasterProtocol>) () -> {
+            setAMRMTokenService(conf);
+            return ClientRMProxy.createRMProxy(conf,
+                ApplicationMasterProtocol.class);
           });
     }
   }
@@ -144,7 +136,7 @@ public AllocateResponse allocate(final AllocateRequest request)
   registerApplicationMasterForDistributedScheduling
       (RegisterApplicationMasterRequest request) throws YarnException,
       IOException {
-    if (getApplicationContext().getNMCotext()
+    if (getApplicationContext().getNMContext()
         .isDistributedSchedulingEnabled()) {
       LOG.info("Forwarding registerApplicationMasterForDistributedScheduling" +
           "request to the real YARN RM");
@@ -161,7 +153,7 @@ public DistributedSchedulingAllocateResponse allocateForDistributedScheduling(
       throws YarnException, IOException {
     LOG.debug("Forwarding allocateForDistributedScheduling request" +
         "to the real YARN RM");
-    if (getApplicationContext().getNMCotext()
+    if (getApplicationContext().getNMContext()
         .isDistributedSchedulingEnabled()) {
       DistributedSchedulingAllocateResponse allocateResponse =
           ((DistributedSchedulingAMProtocol)rmClient)
@@ -197,7 +189,7 @@ public void setNextInterceptor(RequestInterceptor next) {
   @VisibleForTesting
   public void setRMClient(final ApplicationMasterProtocol rmClient) {
     if (rmClient instanceof DistributedSchedulingAMProtocol) {
-      this.rmClient = (DistributedSchedulingAMProtocol)rmClient;
+      this.rmClient = rmClient;
     } else {
       this.rmClient = new DistributedSchedulingAMProtocol() {
         @Override
@@ -254,7 +246,7 @@ public static Text getTokenService(Configuration conf, String address,
       String defaultAddr, int defaultPort) {
     if (HAUtil.isHAEnabled(conf)) {
       // Build a list of service addresses to form the service name
-      ArrayList<String> services = new ArrayList<String>();
+      ArrayList<String> services = new ArrayList<>();
       YarnConfiguration yarnConf = new YarnConfiguration(conf);
       for (String rmId : HAUtil.getRMHAIds(conf)) {
         // Set RM_ID to get the corresponding RM_ADDRESS