Apache
/
hadoop
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

YARN-11203. Fix typo in hadoop-yarn-server-router module. (#4510). Contributed by fanshilun. 

Reviewed-by: Fei Hui <feihui.ustc@gmail.com>
Signed-off-by: Ayush Saxena <ayushsaxena@apache.org>
This commit is contained in:
slfan1989 2022-07-23 22:58:45 +08:00 committed by GitHub
parent 2c96357051
commit 63db1a85e3
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
25 changed files with 98 additions and 98 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-router/src/main/java/org/apache/hadoop/yarn/server/router/clientrm/AbstractClientRequestInterceptor.java
View File

@ -29,7 +29,7 @@ import org.slf4j.LoggerFactory;
/** /**
* Implements the {@link ClientRequestInterceptor} interface and provides common * Implements the {@link ClientRequestInterceptor} interface and provides common
* functionality which can can be used and/or extended by other concrete * functionality which can can be used and/or extended by other concrete
* intercepter classes. * interceptor classes.
* *
*/ */
public abstract class AbstractClientRequestInterceptor public abstract class AbstractClientRequestInterceptor

18
hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-router/src/main/java/org/apache/hadoop/yarn/server/router/clientrm/ClientRequestInterceptor.java
View File

@ -22,14 +22,14 @@ import org.apache.hadoop.conf.Configurable;
import org.apache.hadoop.yarn.api.ApplicationClientProtocol; import org.apache.hadoop.yarn.api.ApplicationClientProtocol;
/** /**
* Defines the contract to be implemented by the request intercepter classes, * Defines the contract to be implemented by the request interceptor classes,
* that can be used to intercept and inspect messages sent from the client to * that can be used to intercept and inspect messages sent from the client to
* the resource manager. * the resource manager.
*/ */
public interface ClientRequestInterceptor public interface ClientRequestInterceptor
extends ApplicationClientProtocol, Configurable { extends ApplicationClientProtocol, Configurable {
/** /**
* This method is called for initializing the intercepter. This is guaranteed * This method is called for initializing the interceptor. This is guaranteed
* to be called only once in the lifetime of this instance. * to be called only once in the lifetime of this instance.
* *
* @param user the name of the client * @param user the name of the client
@ -37,28 +37,28 @@ public interface ClientRequestInterceptor
void init(String user); void init(String user);
/** /**
* This method is called to release the resources held by the intercepter. * This method is called to release the resources held by the interceptor.
* This will be called when the application pipeline is being destroyed. The * This will be called when the application pipeline is being destroyed. The
* concrete implementations should dispose the resources and forward the * concrete implementations should dispose the resources and forward the
* request to the next intercepter, if any. * request to the next interceptor, if any.
*/ */
void shutdown(); void shutdown();
/** /**
* Sets the next intercepter in the pipeline. The concrete implementation of * Sets the next interceptor in the pipeline. The concrete implementation of
* this interface should always pass the request to the nextInterceptor after * this interface should always pass the request to the nextInterceptor after
* inspecting the message. The last intercepter in the chain is responsible to * inspecting the message. The last interceptor in the chain is responsible to
* send the messages to the resource manager service and so the last * send the messages to the resource manager service and so the last
* intercepter will not receive this method call. * interceptor will not receive this method call.
* *
* @param nextInterceptor the ClientRequestInterceptor to set in the pipeline * @param nextInterceptor the ClientRequestInterceptor to set in the pipeline
*/ */
void setNextInterceptor(ClientRequestInterceptor nextInterceptor); void setNextInterceptor(ClientRequestInterceptor nextInterceptor);
/** /**
* Returns the next intercepter in the chain. * Returns the next interceptor in the chain.
* *
* @return the next intercepter in the chain * @return the next interceptor in the chain
*/ */
ClientRequestInterceptor getNextInterceptor(); ClientRequestInterceptor getNextInterceptor();

4
hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-router/src/main/java/org/apache/hadoop/yarn/server/router/clientrm/FederationClientInterceptor.java
View File

@ -141,7 +141,7 @@ import org.apache.hadoop.classification.VisibleForTesting;
* Extends the {@code AbstractRequestInterceptorClient} class and provides an * Extends the {@code AbstractRequestInterceptorClient} class and provides an
* implementation for federation of YARN RM and scaling an application across * implementation for federation of YARN RM and scaling an application across
* multiple YARN SubClusters. All the federation specific implementation is * multiple YARN SubClusters. All the federation specific implementation is
* encapsulated in this class. This is always the last intercepter in the chain. * encapsulated in this class. This is always the last interceptor in the chain.
*/ */
public class FederationClientInterceptor public class FederationClientInterceptor
extends AbstractClientRequestInterceptor { extends AbstractClientRequestInterceptor {
@ -662,7 +662,7 @@ public class FederationClientInterceptor
* Router: the Client will timeout and resubmit the request. * Router: the Client will timeout and resubmit the request.
* *
* ResourceManager: the Router calls each Yarn RM in parallel. In case a * ResourceManager: the Router calls each Yarn RM in parallel. In case a
* Yarn RM fails, a single call will timeout. However the Router will * Yarn RM fails, a single call will timeout. However, the Router will
* merge the ApplicationReports it got, and provides a partial list to * merge the ApplicationReports it got, and provides a partial list to
* the client. * the client.
* *

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

@ -202,10 +202,10 @@ public class RouterClientRMService extends AbstractService
} }
/** /**
* Returns the comma separated intercepter class names from the configuration. * Returns the comma separated interceptor class names from the configuration.
* *
* @param conf * @param conf
* @return the intercepter class names as an instance of ArrayList * @return the interceptor class names as an instance of ArrayList
*/ */
private List<String> getInterceptorClassNames(Configuration conf) { private List<String> getInterceptorClassNames(Configuration conf) {
String configuredInterceptorClassNames = String configuredInterceptorClassNames =
@ -489,9 +489,9 @@ public class RouterClientRMService extends AbstractService
} }
/** /**
* Gets the Request intercepter chains for all the users. * Gets the Request interceptor chains for all the users.
* *
* @return the request intercepter chains. * @return the request interceptor chains.
*/ */
@VisibleForTesting @VisibleForTesting
protected Map<String, RequestInterceptorChainWrapper> getPipelines() { protected Map<String, RequestInterceptorChainWrapper> getPipelines() {
@ -499,10 +499,10 @@ public class RouterClientRMService extends AbstractService
} }
/** /**
* This method creates and returns reference of the first intercepter in the * This method creates and returns reference of the first interceptor in the
* chain of request intercepter instances. * chain of request interceptor instances.
* *
* @return the reference of the first intercepter in the chain * @return the reference of the first interceptor in the chain
*/ */
@VisibleForTesting @VisibleForTesting
protected ClientRequestInterceptor createRequestInterceptorChain() { protected ClientRequestInterceptor createRequestInterceptorChain() {
@ -548,7 +548,7 @@ public class RouterClientRMService extends AbstractService
} }
/** /**
* Initializes the request intercepter pipeline for the specified application. * Initializes the request interceptor pipeline for the specified application.
* *
* @param user * @param user
*/ */
@ -600,9 +600,9 @@ public class RouterClientRMService extends AbstractService
} }
/** /**
* Gets the root request intercepter. * Gets the root request interceptor.
* *
* @return the root request intercepter * @return the root request interceptor
*/ */
public synchronized ClientRequestInterceptor getRootInterceptor() { public synchronized ClientRequestInterceptor getRootInterceptor() {
return rootInterceptor; return rootInterceptor;

2
hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-router/src/main/java/org/apache/hadoop/yarn/server/router/rmadmin/AbstractRMAdminRequestInterceptor.java
View File

@ -23,7 +23,7 @@ import org.apache.hadoop.conf.Configuration;
/** /**
* Implements the {@link RMAdminRequestInterceptor} interface and provides * Implements the {@link RMAdminRequestInterceptor} interface and provides
* common functionality which can can be used and/or extended by other concrete * common functionality which can can be used and/or extended by other concrete
* intercepter classes. * interceptor classes.
* *
*/ */
public abstract class AbstractRMAdminRequestInterceptor public abstract class AbstractRMAdminRequestInterceptor

18
hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-router/src/main/java/org/apache/hadoop/yarn/server/router/rmadmin/RMAdminRequestInterceptor.java
View File

@ -22,14 +22,14 @@ import org.apache.hadoop.conf.Configurable;
import org.apache.hadoop.yarn.server.api.ResourceManagerAdministrationProtocol; import org.apache.hadoop.yarn.server.api.ResourceManagerAdministrationProtocol;
/** /**
* Defines the contract to be implemented by the request intercepter classes, * Defines the contract to be implemented by the request interceptor classes,
* that can be used to intercept and inspect messages sent from the client to * that can be used to intercept and inspect messages sent from the client to
* the resource manager. * the resource manager.
*/ */
public interface RMAdminRequestInterceptor public interface RMAdminRequestInterceptor
extends ResourceManagerAdministrationProtocol, Configurable { extends ResourceManagerAdministrationProtocol, Configurable {
/** /**
* This method is called for initializing the intercepter. This is guaranteed * This method is called for initializing the interceptor. This is guaranteed
* to be called only once in the lifetime of this instance. * to be called only once in the lifetime of this instance.
* *
* @param user the name of the client * @param user the name of the client
@ -37,28 +37,28 @@ public interface RMAdminRequestInterceptor
void init(String user); void init(String user);
/** /**
* This method is called to release the resources held by the intercepter. * This method is called to release the resources held by the interceptor.
* This will be called when the application pipeline is being destroyed. The * This will be called when the application pipeline is being destroyed. The
* concrete implementations should dispose the resources and forward the * concrete implementations should dispose the resources and forward the
* request to the next intercepter, if any. * request to the next interceptor, if any.
*/ */
void shutdown(); void shutdown();
/** /**
* Sets the next intercepter in the pipeline. The concrete implementation of * Sets the next interceptor in the pipeline. The concrete implementation of
* this interface should always pass the request to the nextInterceptor after * this interface should always pass the request to the nextInterceptor after
* inspecting the message. The last intercepter in the chain is responsible to * inspecting the message. The last interceptor in the chain is responsible to
* send the messages to the resource manager service and so the last * send the messages to the resource manager service and so the last
* intercepter will not receive this method call. * interceptor will not receive this method call.
* *
* @param nextInterceptor the RMAdminRequestInterceptor to set in the pipeline * @param nextInterceptor the RMAdminRequestInterceptor to set in the pipeline
*/ */
void setNextInterceptor(RMAdminRequestInterceptor nextInterceptor); void setNextInterceptor(RMAdminRequestInterceptor nextInterceptor);
/** /**
* Returns the next intercepter in the chain. * Returns the next interceptor in the chain.
* *
* @return the next intercepter in the chain * @return the next interceptor in the chain
*/ */
RMAdminRequestInterceptor getNextInterceptor(); RMAdminRequestInterceptor getNextInterceptor();

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

@ -82,7 +82,7 @@ import org.apache.hadoop.classification.VisibleForTesting;
* messages from client to the cluster resource manager. It listens * messages from client to the cluster resource manager. It listens
* {@code ResourceManagerAdministrationProtocol} messages from the client and * {@code ResourceManagerAdministrationProtocol} messages from the client and
* creates a request intercepting pipeline instance for each client. The * creates a request intercepting pipeline instance for each client. The
* pipeline is a chain of intercepter instances that can inspect and modify the * pipeline is a chain of interceptor instances that can inspect and modify the
* request/response as needed. The main difference with AMRMProxyService is the * request/response as needed. The main difference with AMRMProxyService is the
* protocol they implement. * protocol they implement.
*/ */
@ -165,10 +165,10 @@ public class RouterRMAdminService extends AbstractService
} }
/** /**
* Returns the comma separated intercepter class names from the configuration. * Returns the comma separated interceptor class names from the configuration.
* *
* @param conf * @param conf
* @return the intercepter class names as an instance of ArrayList * @return the interceptor class names as an instance of ArrayList
*/ */
private List<String> getInterceptorClassNames(Configuration conf) { private List<String> getInterceptorClassNames(Configuration conf) {
String configuredInterceptorClassNames = String configuredInterceptorClassNames =
@ -197,9 +197,9 @@ public class RouterRMAdminService extends AbstractService
} }
/** /**
* Gets the Request intercepter chains for all the users. * Gets the Request interceptor chains for all the users.
* *
* @return the request intercepter chains. * @return the request interceptor chains.
*/ */
@VisibleForTesting @VisibleForTesting
protected Map<String, RequestInterceptorChainWrapper> getPipelines() { protected Map<String, RequestInterceptorChainWrapper> getPipelines() {
@ -207,10 +207,10 @@ public class RouterRMAdminService extends AbstractService
} }
/** /**
* This method creates and returns reference of the first intercepter in the * This method creates and returns reference of the first interceptor in the
* chain of request intercepter instances. * chain of request interceptor instances.
* *
* @return the reference of the first intercepter in the chain * @return the reference of the first interceptor in the chain
*/ */
@VisibleForTesting @VisibleForTesting
protected RMAdminRequestInterceptor createRequestInterceptorChain() { protected RMAdminRequestInterceptor createRequestInterceptorChain() {
@ -257,7 +257,7 @@ public class RouterRMAdminService extends AbstractService
} }
/** /**
* Initializes the request intercepter pipeline for the specified user. * Initializes the request interceptor pipeline for the specified user.
* *
* @param user * @param user
*/ */
@ -308,9 +308,9 @@ public class RouterRMAdminService extends AbstractService
} }
/** /**
* Gets the root request intercepter. * Gets the root request interceptor.
* *
* @return the root request intercepter * @return the root request interceptor
*/ */
public synchronized RMAdminRequestInterceptor getRootInterceptor() { public synchronized RMAdminRequestInterceptor getRootInterceptor() {
return rootInterceptor; return rootInterceptor;

2
hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-router/src/main/java/org/apache/hadoop/yarn/server/router/webapp/AbstractRESTRequestInterceptor.java
View File

@ -22,7 +22,7 @@ import org.apache.hadoop.conf.Configuration;
/** /**
* Extends the RequestInterceptor class and provides common functionality which * Extends the RequestInterceptor class and provides common functionality which
* can be used and/or extended by other concrete intercepter classes. * can be used and/or extended by other concrete interceptor classes.
*/ */
public abstract class AbstractRESTRequestInterceptor public abstract class AbstractRESTRequestInterceptor
implements RESTRequestInterceptor { implements RESTRequestInterceptor {

8
hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-router/src/main/java/org/apache/hadoop/yarn/server/router/webapp/FederationInterceptorREST.java
View File

@ -111,7 +111,7 @@ import org.apache.hadoop.thirdparty.com.google.common.util.concurrent.ThreadFact
* Extends the {@code AbstractRESTRequestInterceptor} class and provides an * Extends the {@code AbstractRESTRequestInterceptor} class and provides an
* implementation for federation of YARN RM and scaling an application across * implementation for federation of YARN RM and scaling an application across
* multiple YARN SubClusters. All the federation specific implementation is * multiple YARN SubClusters. All the federation specific implementation is
* encapsulated in this class. This is always the last intercepter in the chain. * encapsulated in this class. This is always the last interceptor in the chain.
*/ */
public class FederationInterceptorREST extends AbstractRESTRequestInterceptor { public class FederationInterceptorREST extends AbstractRESTRequestInterceptor {
@ -406,7 +406,7 @@ public class FederationInterceptorREST extends AbstractRESTRequestInterceptor {
if (newApp == null || newApp.getApplicationId() == null) { if (newApp == null || newApp.getApplicationId() == null) {
routerMetrics.incrAppsFailedSubmitted(); routerMetrics.incrAppsFailedSubmitted();
String errMsg = "Missing ApplicationSubmissionContextInfo or " String errMsg = "Missing ApplicationSubmissionContextInfo or "
+ "applicationSubmissionContex information."; + "applicationSubmissionContext information.";
return Response return Response
.status(Status.BAD_REQUEST) .status(Status.BAD_REQUEST)
.entity(errMsg) .entity(errMsg)
@ -667,7 +667,7 @@ public class FederationInterceptorREST extends AbstractRESTRequestInterceptor {
* <p> * <p>
* ResourceManager: the Router calls each YARN RM in parallel by using one * ResourceManager: the Router calls each YARN RM in parallel by using one
* thread for each YARN RM. In case a YARN RM fails, a single call will * thread for each YARN RM. In case a YARN RM fails, a single call will
* timeout. However the Router will merge the ApplicationReports it got, and * timeout. However, the Router will merge the ApplicationReports it got, and
* provides a partial list to the client. * provides a partial list to the client.
* <p> * <p>
* State Store: the Router will timeout and it will retry depending on the * State Store: the Router will timeout and it will retry depending on the
@ -942,7 +942,7 @@ public class FederationInterceptorREST extends AbstractRESTRequestInterceptor {
* <p> * <p>
* ResourceManager: the Router calls each YARN RM in parallel by using one * ResourceManager: the Router calls each YARN RM in parallel by using one
* thread for each YARN RM. In case a YARN RM fails, a single call will * thread for each YARN RM. In case a YARN RM fails, a single call will
* timeout. However the Router will use the NodesInfo it got, and provides a * timeout. However, the Router will use the NodesInfo it got, and provides a
* partial list to the client. * partial list to the client.
* <p> * <p>
* State Store: the Router will timeout and it will retry depending on the * State Store: the Router will timeout and it will retry depending on the

18
hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-router/src/main/java/org/apache/hadoop/yarn/server/router/webapp/RESTRequestInterceptor.java
View File

@ -29,7 +29,7 @@ import org.apache.hadoop.yarn.server.webapp.dao.ContainerInfo;
import org.apache.hadoop.yarn.server.webapp.dao.ContainersInfo; import org.apache.hadoop.yarn.server.webapp.dao.ContainersInfo;
/** /**
* Defines the contract to be implemented by the request intercepter classes, * Defines the contract to be implemented by the request interceptor classes,
* that can be used to intercept and inspect messages sent from the client to * that can be used to intercept and inspect messages sent from the client to
* the resource manager server. * the resource manager server.
* *
@ -42,7 +42,7 @@ public interface RESTRequestInterceptor
extends RMWebServiceProtocol, Configurable { extends RMWebServiceProtocol, Configurable {
/** /**
* This method is called for initializing the intercepter. This is guaranteed * This method is called for initializing the interceptor. This is guaranteed
* to be called only once in the lifetime of this instance. * to be called only once in the lifetime of this instance.
* *
* @param user the name of the client * @param user the name of the client
@ -50,28 +50,28 @@ public interface RESTRequestInterceptor
void init(String user); void init(String user);
/** /**
* This method is called to release the resources held by the intercepter. * This method is called to release the resources held by the interceptor.
* This will be called when the application pipeline is being destroyed. The * This will be called when the application pipeline is being destroyed. The
* concrete implementations should dispose the resources and forward the * concrete implementations should dispose the resources and forward the
* request to the next intercepter, if any. * request to the next interceptor, if any.
*/ */
void shutdown(); void shutdown();
/** /**
* Sets the next intercepter in the pipeline. The concrete implementation of * Sets the next interceptor in the pipeline. The concrete implementation of
* this interface should always pass the request to the nextInterceptor after * this interface should always pass the request to the nextInterceptor after
* inspecting the message. The last intercepter in the chain is responsible to * inspecting the message. The last interceptor in the chain is responsible to
* send the messages to the resource manager service and so the last * send the messages to the resource manager service and so the last
* intercepter will not receive this method call. * interceptor will not receive this method call.
* *
* @param nextInterceptor the RESTRequestInterceptor to set in the pipeline * @param nextInterceptor the RESTRequestInterceptor to set in the pipeline
*/ */
void setNextInterceptor(RESTRequestInterceptor nextInterceptor); void setNextInterceptor(RESTRequestInterceptor nextInterceptor);
/** /**
* Returns the next intercepter in the chain. * Returns the next interceptor in the chain.
* *
* @return the next intercepter in the chain * @return the next interceptor in the chain
*/ */
RESTRequestInterceptor getNextInterceptor(); RESTRequestInterceptor getNextInterceptor();

10
hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-router/src/main/java/org/apache/hadoop/yarn/server/router/webapp/RouterWebServiceUtil.java
View File

@ -83,7 +83,7 @@ public final class RouterWebServiceUtil {
/** /**
* Creates and performs a REST call to a specific WebService. * Creates and performs a REST call to a specific WebService.
* *
* @param webApp the address of the remote webap * @param webApp the address of the remote webapp
* @param hsr the servlet request * @param hsr the servlet request
* @param returnType the return type of the REST call * @param returnType the return type of the REST call
* @param <T> Type of return object. * @param <T> Type of return object.
@ -170,7 +170,7 @@ public final class RouterWebServiceUtil {
/** /**
* Performs an invocation of a REST call on a remote RMWebService. * Performs an invocation of a REST call on a remote RMWebService.
* @param webApp the address of the remote webap * @param webApp the address of the remote webapp
* @param path to add to the webapp address * @param path to add to the webapp address
* @param method the HTTP method of the REST call * @param method the HTTP method of the REST call
* @param additionalPath the servlet request path * @param additionalPath the servlet request path
@ -280,7 +280,7 @@ public final class RouterWebServiceUtil {
/** /**
* Merges a list of AppInfo grouping by ApplicationId. Our current policy is * Merges a list of AppInfo grouping by ApplicationId. Our current policy is
* to merge the application reports from the reacheable SubClusters. Via * to merge the application reports from the reachable SubClusters. Via
* configuration parameter, we decide whether to return applications for which * configuration parameter, we decide whether to return applications for which
* the primary AM is missing or to omit them. * the primary AM is missing or to omit them.
* *
@ -494,7 +494,7 @@ public final class RouterWebServiceUtil {
protected static <T> String getMediaTypeFromHttpServletRequest( protected static <T> String getMediaTypeFromHttpServletRequest(
HttpServletRequest request, final Class<T> returnType) { HttpServletRequest request, final Class<T> returnType) {
if (request == null) { if (request == null) {
// By default we return XML for REST call without HttpServletRequest // By default, we return XML for REST call without HttpServletRequest
return MediaType.APPLICATION_XML; return MediaType.APPLICATION_XML;
} }
// TODO // TODO
@ -503,7 +503,7 @@ public final class RouterWebServiceUtil {
} }
String header = request.getHeader(HttpHeaders.ACCEPT); String header = request.getHeader(HttpHeaders.ACCEPT);
if (header == null || header.equals("*")) { if (header == null || header.equals("*")) {
// By default we return JSON // By default, we return JSON
return MediaType.APPLICATION_JSON; return MediaType.APPLICATION_JSON;
} }
return header; return header;

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

@ -141,10 +141,10 @@ public class RouterWebServices implements RMWebServiceProtocol {
} }
/** /**
* Returns the comma separated intercepter class names from the configuration. * Returns the comma separated interceptor class names from the configuration.
* *
* @param conf * @param conf
* @return the intercepter class names as an instance of ArrayList * @return the interceptor class names as an instance of ArrayList
*/ */
private List<String> getInterceptorClassNames(Configuration config) { private List<String> getInterceptorClassNames(Configuration config) {
String configuredInterceptorClassNames = String configuredInterceptorClassNames =
@ -189,9 +189,9 @@ public class RouterWebServices implements RMWebServiceProtocol {
} }
/** /**
* Gets the Request intercepter chains for all the users. * Gets the Request interceptor chains for all the users.
* *
* @return the request intercepter chains. * @return the request interceptor chains.
*/ */
@VisibleForTesting @VisibleForTesting
protected Map<String, RequestInterceptorChainWrapper> getPipelines() { protected Map<String, RequestInterceptorChainWrapper> getPipelines() {
@ -199,10 +199,10 @@ public class RouterWebServices implements RMWebServiceProtocol {
} }
/** /**
* This method creates and returns reference of the first intercepter in the * This method creates and returns reference of the first interceptor in the
* chain of request intercepter instances. * chain of request interceptor instances.
* *
* @return the reference of the first intercepter in the chain * @return the reference of the first interceptor in the chain
*/ */
@VisibleForTesting @VisibleForTesting
protected RESTRequestInterceptor createRequestInterceptorChain() { protected RESTRequestInterceptor createRequestInterceptorChain() {
@ -247,7 +247,7 @@ public class RouterWebServices implements RMWebServiceProtocol {
} }
/** /**
* Initializes the request intercepter pipeline for the specified user. * Initializes the request interceptor pipeline for the specified user.
* *
* @param user * @param user
*/ */
@ -298,9 +298,9 @@ public class RouterWebServices implements RMWebServiceProtocol {
} }
/** /**
* Gets the root request intercepter. * Gets the root request interceptor.
* *
* @return the root request intercepter * @return the root request interceptor
*/ */
public synchronized RESTRequestInterceptor getRootInterceptor() { public synchronized RESTRequestInterceptor getRootInterceptor() {
return rootInterceptor; return rootInterceptor;

2
hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-router/src/test/java/org/apache/hadoop/yarn/server/router/clientrm/BaseRouterClientRMTest.java
View File

@ -134,7 +134,7 @@ public abstract class BaseRouterClientRMTest {
String mockPassThroughInterceptorClass = String mockPassThroughInterceptorClass =
PassThroughClientRequestInterceptor.class.getName(); PassThroughClientRequestInterceptor.class.getName();
// Create a request intercepter pipeline for testing. The last one in the // Create a request interceptor pipeline for testing. The last one in the
// chain will call the mock resource manager. The others in the chain will // chain will call the mock resource manager. The others in the chain will
// simply forward it to the next one in the chain // simply forward it to the next one in the chain
config.set(YarnConfiguration.ROUTER_CLIENTRM_INTERCEPTOR_CLASS_PIPELINE, config.set(YarnConfiguration.ROUTER_CLIENTRM_INTERCEPTOR_CLASS_PIPELINE,

4
hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-router/src/test/java/org/apache/hadoop/yarn/server/router/clientrm/PassThroughClientRequestInterceptor.java
View File

@ -93,8 +93,8 @@ import org.apache.hadoop.yarn.api.protocolrecords.UpdateApplicationTimeoutsRespo
import org.apache.hadoop.yarn.exceptions.YarnException; import org.apache.hadoop.yarn.exceptions.YarnException;
/** /**
* Mock intercepter that does not do anything other than forwarding it to the * Mock interceptor that does not do anything other than forwarding it to the
* next intercepter in the chain. * next interceptor in the chain.
*/ */
public class PassThroughClientRequestInterceptor public class PassThroughClientRequestInterceptor
extends AbstractClientRequestInterceptor { extends AbstractClientRequestInterceptor {

6
hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-router/src/test/java/org/apache/hadoop/yarn/server/router/clientrm/TestFederationClientInterceptor.java
View File

@ -121,7 +121,7 @@ import org.slf4j.LoggerFactory;
* use the {@code RouterClientRMService} pipeline test cases for testing the * use the {@code RouterClientRMService} pipeline test cases for testing the
* {@code FederationInterceptor} class. The tests for * {@code FederationInterceptor} class. The tests for
* {@code RouterClientRMService} has been written cleverly so that it can be * {@code RouterClientRMService} has been written cleverly so that it can be
* reused to validate different request intercepter chains. * reused to validate different request interceptor chains.
*/ */
public class TestFederationClientInterceptor extends BaseRouterClientRMTest { public class TestFederationClientInterceptor extends BaseRouterClientRMTest {
private static final Logger LOG = private static final Logger LOG =
@ -180,8 +180,8 @@ public class TestFederationClientInterceptor extends BaseRouterClientRMTest {
String mockPassThroughInterceptorClass = String mockPassThroughInterceptorClass =
PassThroughClientRequestInterceptor.class.getName(); PassThroughClientRequestInterceptor.class.getName();
// Create a request intercepter pipeline for testing. The last one in the // Create a request interceptor pipeline for testing. The last one in the
// chain is the federation intercepter that calls the mock resource manager. // chain is the federation interceptor that calls the mock resource manager.
// The others in the chain will simply forward it to the next one in the // The others in the chain will simply forward it to the next one in the
// chain // chain
conf.set(YarnConfiguration.ROUTER_CLIENTRM_INTERCEPTOR_CLASS_PIPELINE, conf.set(YarnConfiguration.ROUTER_CLIENTRM_INTERCEPTOR_CLASS_PIPELINE,

6
hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-router/src/test/java/org/apache/hadoop/yarn/server/router/clientrm/TestFederationClientInterceptorRetry.java
View File

@ -54,7 +54,7 @@ import org.slf4j.LoggerFactory;
* use the {@code RouterClientRMService} pipeline test cases for testing the * use the {@code RouterClientRMService} pipeline test cases for testing the
* {@code FederationInterceptor} class. The tests for * {@code FederationInterceptor} class. The tests for
* {@code RouterClientRMService} has been written cleverly so that it can be * {@code RouterClientRMService} has been written cleverly so that it can be
* reused to validate different request intercepter chains. * reused to validate different request interceptor chains.
* *
* It tests the case with SubClusters down and the Router logic of retries. We * It tests the case with SubClusters down and the Router logic of retries. We
* have 1 good SubCluster and 2 bad ones for all the tests. * have 1 good SubCluster and 2 bad ones for all the tests.
@ -137,8 +137,8 @@ public class TestFederationClientInterceptorRetry
String mockPassThroughInterceptorClass = String mockPassThroughInterceptorClass =
PassThroughClientRequestInterceptor.class.getName(); PassThroughClientRequestInterceptor.class.getName();
// Create a request intercepter pipeline for testing. The last one in the // Create a request interceptor pipeline for testing. The last one in the
// chain is the federation intercepter that calls the mock resource manager. // chain is the federation interceptor that calls the mock resource manager.
// The others in the chain will simply forward it to the next one in the // The others in the chain will simply forward it to the next one in the
// chain // chain
conf.set(YarnConfiguration.ROUTER_CLIENTRM_INTERCEPTOR_CLASS_PIPELINE, conf.set(YarnConfiguration.ROUTER_CLIENTRM_INTERCEPTOR_CLASS_PIPELINE,

2
hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-router/src/test/java/org/apache/hadoop/yarn/server/router/clientrm/TestRouterYarnClientUtils.java
View File

@ -424,7 +424,7 @@ public class TestRouterYarnClientUtils {
GetQueueUserAclsInfoResponse response3 = Records.newRecord( GetQueueUserAclsInfoResponse response3 = Records.newRecord(
GetQueueUserAclsInfoResponse.class); GetQueueUserAclsInfoResponse.class);
// null responce // null response
GetQueueUserAclsInfoResponse response4 = null; GetQueueUserAclsInfoResponse response4 = null;
List<GetQueueUserAclsInfoResponse> responses = new ArrayList<>(); List<GetQueueUserAclsInfoResponse> responses = new ArrayList<>();

2
hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-router/src/test/java/org/apache/hadoop/yarn/server/router/rmadmin/BaseRouterRMAdminTest.java
View File

@ -91,7 +91,7 @@ public abstract class BaseRouterRMAdminTest {
String mockPassThroughInterceptorClass = String mockPassThroughInterceptorClass =
PassThroughRMAdminRequestInterceptor.class.getName(); PassThroughRMAdminRequestInterceptor.class.getName();
// Create a request intercepter pipeline for testing. The last one in the // Create a request interceptor pipeline for testing. The last one in the
// chain will call the mock resource manager. The others in the chain will // chain will call the mock resource manager. The others in the chain will
// simply forward it to the next one in the chain // simply forward it to the next one in the chain
this.conf.set(YarnConfiguration.ROUTER_RMADMIN_INTERCEPTOR_CLASS_PIPELINE, this.conf.set(YarnConfiguration.ROUTER_RMADMIN_INTERCEPTOR_CLASS_PIPELINE,

2
hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-router/src/test/java/org/apache/hadoop/yarn/server/router/rmadmin/MockRMAdminRequestInterceptor.java
View File

@ -27,7 +27,7 @@ import org.apache.hadoop.yarn.server.resourcemanager.AdminService;
import org.apache.hadoop.yarn.server.resourcemanager.MockRM; import org.apache.hadoop.yarn.server.resourcemanager.MockRM;
/** /**
* This class mocks the RMAmdinRequestInterceptor. * This class mocks the RMAdminRequestInterceptor.
*/ */
public class MockRMAdminRequestInterceptor public class MockRMAdminRequestInterceptor
extends DefaultRMAdminRequestInterceptor { extends DefaultRMAdminRequestInterceptor {

4
hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-router/src/test/java/org/apache/hadoop/yarn/server/router/rmadmin/PassThroughRMAdminRequestInterceptor.java
View File

@ -52,8 +52,8 @@ import org.apache.hadoop.yarn.server.api.protocolrecords.UpdateNodeResourceReque
import org.apache.hadoop.yarn.server.api.protocolrecords.UpdateNodeResourceResponse; import org.apache.hadoop.yarn.server.api.protocolrecords.UpdateNodeResourceResponse;
/** /**
* Mock intercepter that does not do anything other than forwarding it to the * Mock interceptor that does not do anything other than forwarding it to the
* next intercepter in the chain. * next interceptor in the chain.
*/ */
public class PassThroughRMAdminRequestInterceptor public class PassThroughRMAdminRequestInterceptor
extends AbstractRMAdminRequestInterceptor { extends AbstractRMAdminRequestInterceptor {

2
hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-router/src/test/java/org/apache/hadoop/yarn/server/router/webapp/BaseRouterWebServicesTest.java
View File

@ -94,7 +94,7 @@ public abstract class BaseRouterWebServicesTest {
String mockPassThroughInterceptorClass = String mockPassThroughInterceptorClass =
PassThroughRESTRequestInterceptor.class.getName(); PassThroughRESTRequestInterceptor.class.getName();
// Create a request intercepter pipeline for testing. The last one in the // Create a request interceptor pipeline for testing. The last one in the
// chain will call the mock resource manager. The others in the chain will // chain will call the mock resource manager. The others in the chain will
// simply forward it to the next one in the chain // simply forward it to the next one in the chain
config.set(YarnConfiguration.ROUTER_WEBAPP_INTERCEPTOR_CLASS_PIPELINE, config.set(YarnConfiguration.ROUTER_WEBAPP_INTERCEPTOR_CLASS_PIPELINE,

6
hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-router/src/test/java/org/apache/hadoop/yarn/server/router/webapp/JavaProcess.java
View File

@ -34,15 +34,15 @@ public class JavaProcess {
this(clazz, null, output); this(clazz, null, output);
} }
public JavaProcess(Class<?> clazz, List<String> addClasspaths, File output) public JavaProcess(Class<?> clazz, List<String> addClassPaths, File output)
throws IOException, InterruptedException { throws IOException, InterruptedException {
String javaHome = System.getProperty("java.home"); String javaHome = System.getProperty("java.home");
String javaBin = String javaBin =
javaHome + File.separator + "bin" + File.separator + "java"; javaHome + File.separator + "bin" + File.separator + "java";
String classpath = System.getProperty("java.class.path"); String classpath = System.getProperty("java.class.path");
classpath = classpath.concat("./src/test/resources"); classpath = classpath.concat("./src/test/resources");
if (addClasspaths != null) { if (addClassPaths != null) {
for (String addClasspath : addClasspaths) { for (String addClasspath : addClassPaths) {
classpath = classpath.concat(File.pathSeparatorChar + addClasspath); classpath = classpath.concat(File.pathSeparatorChar + addClasspath);
} }
} }

4
hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-router/src/test/java/org/apache/hadoop/yarn/server/router/webapp/PassThroughRESTRequestInterceptor.java
View File

@ -62,8 +62,8 @@ import org.apache.hadoop.yarn.server.webapp.dao.ContainerInfo;
import org.apache.hadoop.yarn.server.webapp.dao.ContainersInfo; import org.apache.hadoop.yarn.server.webapp.dao.ContainersInfo;
/** /**
* Mock intercepter that does not do anything other than forwarding it to the * Mock interceptor that does not do anything other than forwarding it to the
* next intercepter in the chain. * next interceptor in the chain.
*/ */
public class PassThroughRESTRequestInterceptor public class PassThroughRESTRequestInterceptor
extends AbstractRESTRequestInterceptor { extends AbstractRESTRequestInterceptor {

8
hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-router/src/test/java/org/apache/hadoop/yarn/server/router/webapp/TestFederationInterceptorREST.java
View File

@ -61,7 +61,7 @@ import org.slf4j.LoggerFactory;
* use the {@code RouterClientRMService} pipeline test cases for testing the * use the {@code RouterClientRMService} pipeline test cases for testing the
* {@code FederationInterceptor} class. The tests for * {@code FederationInterceptor} class. The tests for
* {@code RouterClientRMService} has been written cleverly so that it can be * {@code RouterClientRMService} has been written cleverly so that it can be
* reused to validate different request intercepter chains. * reused to validate different request interceptor chains.
*/ */
public class TestFederationInterceptorREST extends BaseRouterWebServicesTest { public class TestFederationInterceptorREST extends BaseRouterWebServicesTest {
private static final Logger LOG = private static final Logger LOG =
@ -119,8 +119,8 @@ public class TestFederationInterceptorREST extends BaseRouterWebServicesTest {
String mockPassThroughInterceptorClass = String mockPassThroughInterceptorClass =
PassThroughRESTRequestInterceptor.class.getName(); PassThroughRESTRequestInterceptor.class.getName();
// Create a request intercepter pipeline for testing. The last one in the // Create a request interceptor pipeline for testing. The last one in the
// chain is the federation intercepter that calls the mock resource manager. // chain is the federation interceptor that calls the mock resource manager.
// The others in the chain will simply forward it to the next one in the // The others in the chain will simply forward it to the next one in the
// chain // chain
conf.set(YarnConfiguration.ROUTER_CLIENTRM_INTERCEPTOR_CLASS_PIPELINE, conf.set(YarnConfiguration.ROUTER_CLIENTRM_INTERCEPTOR_CLASS_PIPELINE,
@ -239,7 +239,7 @@ public class TestFederationInterceptorREST extends BaseRouterWebServicesTest {
} }
/** /**
* This test validates the correctness of SubmitApplication in case of of * This test validates the correctness of SubmitApplication in case of
* application in wrong format. * application in wrong format.
*/ */
@Test @Test

4
hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-router/src/test/java/org/apache/hadoop/yarn/server/router/webapp/TestFederationInterceptorRESTRetry.java
View File

@ -139,8 +139,8 @@ public class TestFederationInterceptorRESTRetry
String mockPassThroughInterceptorClass = String mockPassThroughInterceptorClass =
PassThroughClientRequestInterceptor.class.getName(); PassThroughClientRequestInterceptor.class.getName();
// Create a request intercepter pipeline for testing. The last one in the // Create a request interceptor pipeline for testing. The last one in the
// chain is the federation intercepter that calls the mock resource manager. // chain is the federation interceptor that calls the mock resource manager.
// The others in the chain will simply forward it to the next one in the // The others in the chain will simply forward it to the next one in the
// chain // chain
conf.set(YarnConfiguration.ROUTER_CLIENTRM_INTERCEPTOR_CLASS_PIPELINE, conf.set(YarnConfiguration.ROUTER_CLIENTRM_INTERCEPTOR_CLASS_PIPELINE,