YARN-6572. Refactoring Router services to use common util classes for pipeline creations.

Author: slfan1989

hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-router/src/main/java/org/apache/hadoop/yarn/server/router/RouterServerUtil.java

@@ -26,7 +26,6 @@
 import org.apache.hadoop.util.StringUtils;
 import org.apache.hadoop.yarn.exceptions.YarnException;
 import org.apache.hadoop.yarn.exceptions.YarnRuntimeException;
-import org.apache.hadoop.yarn.server.router.clientrm.ClientMethod;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -72,8 +71,7 @@ public static void logAndThrowException(String errMsg, Throwable t)
   }
 
   public static <R> R createRequestInterceptorChain(Configuration conf, String pipeLineClassName,
-      String interceptorClassName, ClientMethod request, Class<R> clazz)
-      throws NoSuchMethodException, InvocationTargetException, IllegalAccessException {
+      String interceptorClassName, Class<R> clazz) {
 
     List<String> interceptorClassNames = getInterceptorClassNames(conf,
         pipeLineClassName, interceptorClassName);
@@ -91,7 +89,7 @@ public static <R> R createRequestInterceptorChain(Configuration conf, String pip
             current = clazz.cast(interceptorInstance);
             continue;
           } else {
-            Method method = clazz.getMethod(request.getMethodName(), request.getTypes());
+            Method method = clazz.getMethod("setNextInterceptor", clazz);
             method.invoke(current, interceptorInstance);
             current = clazz.cast(interceptorInstance);
           }
@@ -101,10 +99,30 @@ public static <R> R createRequestInterceptorChain(Configuration conf, String pip
               + clazz.getCanonicalName());
         }
       } catch (ClassNotFoundException e) {
+        LOG.error("Could not instantiate RequestInterceptor: {}", className, e);
         throw new YarnRuntimeException("Could not instantiate RequestInterceptor: " + className, e);
+      } catch (InvocationTargetException e) {
+        LOG.error("RequestInterceptor {} call setNextInterceptor error.", className, e);
+        throw new YarnRuntimeException("RequestInterceptor " + className
+            + " call setNextInterceptor error.", e);
+      } catch (NoSuchMethodException e) {
+        LOG.error("RequestInterceptor {} does not contain the method setNextInterceptor.",
+            className);
+        throw new YarnRuntimeException("RequestInterceptor " + className +
+            " does not contain the method setNextInterceptor.", e);
+      } catch (IllegalAccessException e) {
+        LOG.error("RequestInterceptor {} call the method setNextInterceptor " +
+            "does not have access.", className);
+        throw new YarnRuntimeException("RequestInterceptor "
+            + className + " call the method setNextInterceptor does not have access.", e);
       }
     }
 
+    if (pipeline == null) {
+      throw new YarnRuntimeException(
+          "RequestInterceptor pipeline is not configured in the system.");
+    }
+
     return pipeline;
   }
 

hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-router/src/main/java/org/apache/hadoop/yarn/server/router/clientrm/RouterClientRMService.java

@@ -480,27 +480,15 @@ protected Map<String, RequestInterceptorChainWrapper> getPipelines() {
   @VisibleForTesting
   protected ClientRequestInterceptor createRequestInterceptorChain() {
     Configuration conf = getConfig();
-    ClientRequestInterceptor pipeline = null;
-    ClientMethod remoteMethod = null;
     try {
-      remoteMethod = new ClientMethod("setNextInterceptor",
-           new Class[]{ClientRequestInterceptor.class}, new Object[]{null});
-
-      pipeline = RouterServerUtil.createRequestInterceptorChain(conf,
+      return RouterServerUtil.createRequestInterceptorChain(conf,
               YarnConfiguration.ROUTER_CLIENTRM_INTERCEPTOR_CLASS_PIPELINE,
               YarnConfiguration.DEFAULT_ROUTER_CLIENTRM_INTERCEPTOR_CLASS,
-              remoteMethod, ClientRequestInterceptor.class);
-
-      if (pipeline == null) {
-        throw new YarnRuntimeException(
-            "RequestInterceptor pipeline is not configured in the system.");
-      }
-    } catch (IOException | InvocationTargetException | NoSuchMethodException | RuntimeException
-         | IllegalAccessException ex) {
+              ClientRequestInterceptor.class);
+    } catch (YarnRuntimeException ex) {
       throw new YarnRuntimeException("RequestInterceptor pipeline is not configured in the system.",
           ex);
     }
-    return pipeline;
   }
 
   /**

hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-router/src/main/java/org/apache/hadoop/yarn/server/router/rmadmin/RouterRMAdminService.java

@@ -19,7 +19,6 @@
 package org.apache.hadoop.yarn.server.router.rmadmin;
 
 import java.io.IOException;
-import java.lang.reflect.InvocationTargetException;
 import java.net.InetSocketAddress;
 import java.util.Collections;
 import java.util.Map;
@@ -66,7 +65,6 @@
 import org.apache.hadoop.yarn.server.api.protocolrecords.UpdateNodeResourceRequest;
 import org.apache.hadoop.yarn.server.api.protocolrecords.UpdateNodeResourceResponse;
 import org.apache.hadoop.yarn.server.router.RouterServerUtil;
-import org.apache.hadoop.yarn.server.router.clientrm.ClientMethod;
 import org.apache.hadoop.yarn.server.router.security.authorize.RouterPolicyProvider;
 import org.apache.hadoop.yarn.util.LRUCacheHashMap;
 import org.slf4j.Logger;
@@ -190,26 +188,14 @@ protected Map<String, RequestInterceptorChainWrapper> getPipelines() {
   @VisibleForTesting
   protected RMAdminRequestInterceptor createRequestInterceptorChain() {
     Configuration conf = getConfig();
-    RMAdminRequestInterceptor pipeline = null;
-    ClientMethod remoteMethod = null;
     try {
-      remoteMethod = new ClientMethod("setNextInterceptor",
-              new Class[]{RMAdminRequestInterceptor.class}, new Object[]{null});
-
-      pipeline = RouterServerUtil.createRequestInterceptorChain(conf,
+      return RouterServerUtil.createRequestInterceptorChain(conf,
           YarnConfiguration.ROUTER_RMADMIN_INTERCEPTOR_CLASS_PIPELINE,
           YarnConfiguration.DEFAULT_ROUTER_RMADMIN_INTERCEPTOR_CLASS,
-          remoteMethod, RMAdminRequestInterceptor.class);
-
-      if (pipeline == null) {
-        throw new YarnRuntimeException(
-            "RequestInterceptor pipeline is not configured in the system.");
-      }
-    } catch (IOException | InvocationTargetException | NoSuchMethodException | RuntimeException
-             | IllegalAccessException ex) {
+          RMAdminRequestInterceptor.class);
+    } catch (YarnRuntimeException ex) {
       throw new YarnRuntimeException("Create RequestInterceptor Chain error.", ex);
     }
-    return pipeline;
   }
 
   /**

hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-router/src/main/java/org/apache/hadoop/yarn/server/router/webapp/RouterWebServices.java

@@ -19,7 +19,6 @@
 package org.apache.hadoop.yarn.server.router.webapp;
 
 import java.io.IOException;
-import java.lang.reflect.InvocationTargetException;
 import java.util.Collections;
 import java.util.Map;
 import java.util.Set;
@@ -83,7 +82,6 @@
 import org.apache.hadoop.yarn.server.resourcemanager.webapp.dao.SchedulerTypeInfo;
 import org.apache.hadoop.yarn.server.router.Router;
 import org.apache.hadoop.yarn.server.router.RouterServerUtil;
-import org.apache.hadoop.yarn.server.router.clientrm.ClientMethod;
 import org.apache.hadoop.yarn.server.webapp.dao.ContainerInfo;
 import org.apache.hadoop.yarn.server.webapp.dao.ContainersInfo;
 import org.apache.hadoop.yarn.util.LRUCacheHashMap;
@@ -181,27 +179,14 @@ protected Map<String, RequestInterceptorChainWrapper> getPipelines() {
    */
   @VisibleForTesting
   protected RESTRequestInterceptor createRequestInterceptorChain() {
-    RESTRequestInterceptor pipeline = null;
-    ClientMethod remoteMethod = null;
     try {
-      remoteMethod = new ClientMethod("setNextInterceptor",
-          new Class[]{RESTRequestInterceptor.class}, new Object[]{null});
-
-      pipeline = RouterServerUtil.createRequestInterceptorChain(conf,
+      return RouterServerUtil.createRequestInterceptorChain(conf,
           YarnConfiguration.ROUTER_WEBAPP_INTERCEPTOR_CLASS_PIPELINE,
           YarnConfiguration.DEFAULT_ROUTER_WEBAPP_INTERCEPTOR_CLASS,
-          remoteMethod, RESTRequestInterceptor.class);
-
-      if (pipeline == null) {
-        throw new YarnRuntimeException(
-            "RequestInterceptor pipeline is not configured in the system.");
-      }
-    } catch (IOException | InvocationTargetException | NoSuchMethodException | RuntimeException
-         | IllegalAccessException ex) {
+          RESTRequestInterceptor.class);
+    } catch (YarnRuntimeException ex) {
       throw new YarnRuntimeException("Create RequestInterceptor Chain error.", ex);
     }
-
-    return pipeline;
   }
 
   /**