Repository: hadoop Updated Branches: refs/heads/trunk 3420ddd0f -> abd6d48c4
YARN-8860. Federation client intercepter class contains unwanted character. Contributed by Abhishek Modi. Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/abd6d48c Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/abd6d48c Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/abd6d48c Branch: refs/heads/trunk Commit: abd6d48c46342d2694a1cb56c40f208de797794c Parents: 3420ddd Author: Giovanni Matteo Fumarola <[email protected]> Authored: Fri Nov 16 10:23:06 2018 -0800 Committer: Giovanni Matteo Fumarola <[email protected]> Committed: Fri Nov 16 10:23:06 2018 -0800 ---------------------------------------------------------------------- .../clientrm/FederationClientInterceptor.java | 60 ++++++++++---------- .../webapp/FederationInterceptorREST.java | 60 ++++++++++---------- 2 files changed, 60 insertions(+), 60 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/hadoop/blob/abd6d48c/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-router/src/main/java/org/apache/hadoop/yarn/server/router/clientrm/FederationClientInterceptor.java ---------------------------------------------------------------------- diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-router/src/main/java/org/apache/hadoop/yarn/server/router/clientrm/FederationClientInterceptor.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-router/src/main/java/org/apache/hadoop/yarn/server/router/clientrm/FederationClientInterceptor.java index 797b1aa..59cd266 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-router/src/main/java/org/apache/hadoop/yarn/server/router/clientrm/FederationClientInterceptor.java +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-router/src/main/java/org/apache/hadoop/yarn/server/router/clientrm/FederationClientInterceptor.java @@ -304,19 +304,19 @@ public class FederationClientInterceptor * * Base scenarios: * - * The Client submits an application to the Router. ⢠The Router selects one - * SubCluster to forward the request. ⢠The Router inserts a tuple into - * StateStore with the selected SubCluster (e.g. SC1) and the appId. ⢠The - * State Store replies with the selected SubCluster (e.g. SC1). ⢠The Router + * The Client submits an application to the Router. The Router selects one + * SubCluster to forward the request. The Router inserts a tuple into + * StateStore with the selected SubCluster (e.g. SC1) and the appId. The + * State Store replies with the selected SubCluster (e.g. SC1). The Router * submits the request to the selected SubCluster. * * In case of State Store failure: * - * The client submits an application to the Router. ⢠The Router selects one - * SubCluster to forward the request. ⢠The Router inserts a tuple into State - * Store with the selected SubCluster (e.g. SC1) and the appId. ⢠Due to the + * The client submits an application to the Router. The Router selects one + * SubCluster to forward the request. The Router inserts a tuple into State + * Store with the selected SubCluster (e.g. SC1) and the appId. Due to the * State Store down the Router times out and it will retry depending on the - * FederationFacade settings. ⢠The Router replies to the client with an error + * FederationFacade settings. The Router replies to the client with an error * message. * * If State Store fails after inserting the tuple: identical behavior as @@ -326,26 +326,26 @@ public class FederationClientInterceptor * * Scenario 1 â Crash before submission to the ResourceManager * - * The Client submits an application to the Router. ⢠The Router selects one - * SubCluster to forward the request. ⢠The Router inserts a tuple into State - * Store with the selected SubCluster (e.g. SC1) and the appId. ⢠The Router - * crashes. ⢠The Client timeouts and resubmits the application. ⢠The Router - * selects one SubCluster to forward the request. ⢠The Router inserts a tuple - * into State Store with the selected SubCluster (e.g. SC2) and the appId. ⢠+ * The Client submits an application to the Router. The Router selects one + * SubCluster to forward the request. The Router inserts a tuple into State + * Store with the selected SubCluster (e.g. SC1) and the appId. The Router + * crashes. The Client timeouts and resubmits the application. The Router + * selects one SubCluster to forward the request. The Router inserts a tuple + * into State Store with the selected SubCluster (e.g. SC2) and the appId. * Because the tuple is already inserted in the State Store, it returns the - * previous selected SubCluster (e.g. SC1). ⢠The Router submits the request + * previous selected SubCluster (e.g. SC1). The Router submits the request * to the selected SubCluster (e.g. SC1). * * Scenario 2 â Crash after submission to the ResourceManager * - * ⢠The Client submits an application to the Router. ⢠The Router selects one - * SubCluster to forward the request. ⢠The Router inserts a tuple into State - * Store with the selected SubCluster (e.g. SC1) and the appId. ⢠The Router - * submits the request to the selected SubCluster. ⢠The Router crashes. ⢠The - * Client timeouts and resubmit the application. ⢠The Router selects one - * SubCluster to forward the request. ⢠The Router inserts a tuple into State - * Store with the selected SubCluster (e.g. SC2) and the appId. ⢠The State - * Store replies with the selected SubCluster (e.g. SC1). ⢠The Router submits + * The Client submits an application to the Router. The Router selects one + * SubCluster to forward the request. The Router inserts a tuple into State + * Store with the selected SubCluster (e.g. SC1) and the appId. The Router + * submits the request to the selected SubCluster. The Router crashes. The + * Client timeouts and resubmit the application. The Router selects one + * SubCluster to forward the request. The Router inserts a tuple into State + * Store with the selected SubCluster (e.g. SC2) and the appId. The State + * Store replies with the selected SubCluster (e.g. SC1). The Router submits * the request to the selected SubCluster (e.g. SC1). When a client re-submits * the same application to the same RM, it does not raise an exception and * replies with operation successful message. @@ -354,14 +354,14 @@ public class FederationClientInterceptor * * In case of ResourceManager failure: * - * The Client submits an application to the Router. ⢠The Router selects one - * SubCluster to forward the request. ⢠The Router inserts a tuple into State - * Store with the selected SubCluster (e.g. SC1) and the appId. ⢠The Router - * submits the request to the selected SubCluster. ⢠The entire SubCluster is - * down â all the RMs in HA or the master RM is not reachable. ⢠The Router - * times out. ⢠The Router selects a new SubCluster to forward the request. ⢠+ * The Client submits an application to the Router. The Router selects one + * SubCluster to forward the request. The Router inserts a tuple into State + * Store with the selected SubCluster (e.g. SC1) and the appId. The Router + * submits the request to the selected SubCluster. The entire SubCluster is + * down â all the RMs in HA or the master RM is not reachable. The Router + * times out. The Router selects a new SubCluster to forward the request. * The Router update a tuple into State Store with the selected SubCluster - * (e.g. SC2) and the appId. ⢠The State Store replies with OK answer. ⢠The + * (e.g. SC2) and the appId. The State Store replies with OK answer. The * Router submits the request to the selected SubCluster (e.g. SC2). */ @Override http://git-wip-us.apache.org/repos/asf/hadoop/blob/abd6d48c/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-router/src/main/java/org/apache/hadoop/yarn/server/router/webapp/FederationInterceptorREST.java ---------------------------------------------------------------------- diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-router/src/main/java/org/apache/hadoop/yarn/server/router/webapp/FederationInterceptorREST.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-router/src/main/java/org/apache/hadoop/yarn/server/router/webapp/FederationInterceptorREST.java index 40addc9..8e6b1c1 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-router/src/main/java/org/apache/hadoop/yarn/server/router/webapp/FederationInterceptorREST.java +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-router/src/main/java/org/apache/hadoop/yarn/server/router/webapp/FederationInterceptorREST.java @@ -325,19 +325,19 @@ public class FederationInterceptorREST extends AbstractRESTRequestInterceptor { * <p> * Base scenarios: * <p> - * The Client submits an application to the Router. ⢠The Router selects one - * SubCluster to forward the request. ⢠The Router inserts a tuple into - * StateStore with the selected SubCluster (e.g. SC1) and the appId. ⢠The - * State Store replies with the selected SubCluster (e.g. SC1). ⢠The Router + * The Client submits an application to the Router. The Router selects one + * SubCluster to forward the request. The Router inserts a tuple into + * StateStore with the selected SubCluster (e.g. SC1) and the appId. The + * State Store replies with the selected SubCluster (e.g. SC1). The Router * submits the request to the selected SubCluster. * <p> * In case of State Store failure: * <p> - * The client submits an application to the Router. ⢠The Router selects one - * SubCluster to forward the request. ⢠The Router inserts a tuple into State - * Store with the selected SubCluster (e.g. SC1) and the appId. ⢠Due to the + * The client submits an application to the Router. The Router selects one + * SubCluster to forward the request. The Router inserts a tuple into State + * Store with the selected SubCluster (e.g. SC1) and the appId. Due to the * State Store down the Router times out and it will retry depending on the - * FederationFacade settings. ⢠The Router replies to the client with an error + * FederationFacade settings. The Router replies to the client with an error * message. * <p> * If State Store fails after inserting the tuple: identical behavior as @@ -347,26 +347,26 @@ public class FederationInterceptorREST extends AbstractRESTRequestInterceptor { * <p> * Scenario 1 â Crash before submission to the ResourceManager * <p> - * The Client submits an application to the Router. ⢠The Router selects one - * SubCluster to forward the request. ⢠The Router inserts a tuple into State - * Store with the selected SubCluster (e.g. SC1) and the appId. ⢠The Router - * crashes. ⢠The Client timeouts and resubmits the application. ⢠The Router - * selects one SubCluster to forward the request. ⢠The Router inserts a tuple - * into State Store with the selected SubCluster (e.g. SC2) and the appId. ⢠+ * The Client submits an application to the Router. The Router selects one + * SubCluster to forward the request. The Router inserts a tuple into State + * Store with the selected SubCluster (e.g. SC1) and the appId. The Router + * crashes. The Client timeouts and resubmits the application. The Router + * selects one SubCluster to forward the request. The Router inserts a tuple + * into State Store with the selected SubCluster (e.g. SC2) and the appId. * Because the tuple is already inserted in the State Store, it returns the - * previous selected SubCluster (e.g. SC1). ⢠The Router submits the request + * previous selected SubCluster (e.g. SC1). The Router submits the request * to the selected SubCluster (e.g. SC1). * <p> * Scenario 2 â Crash after submission to the ResourceManager * <p> - * ⢠The Client submits an application to the Router. ⢠The Router selects one - * SubCluster to forward the request. ⢠The Router inserts a tuple into State - * Store with the selected SubCluster (e.g. SC1) and the appId. ⢠The Router - * submits the request to the selected SubCluster. ⢠The Router crashes. ⢠The - * Client timeouts and resubmit the application. ⢠The Router selects one - * SubCluster to forward the request. ⢠The Router inserts a tuple into State - * Store with the selected SubCluster (e.g. SC2) and the appId. ⢠The State - * Store replies with the selected SubCluster (e.g. SC1). ⢠The Router submits + * The Client submits an application to the Router. The Router selects one + * SubCluster to forward the request. The Router inserts a tuple into State + * Store with the selected SubCluster (e.g. SC1) and the appId. The Router + * submits the request to the selected SubCluster. The Router crashes. The + * Client timeouts and resubmit the application. The Router selects one + * SubCluster to forward the request. The Router inserts a tuple into State + * Store with the selected SubCluster (e.g. SC2) and the appId. The State + * Store replies with the selected SubCluster (e.g. SC1). The Router submits * the request to the selected SubCluster (e.g. SC1). When a client re-submits * the same application to the same RM, it does not raise an exception and * replies with operation successful message. @@ -375,14 +375,14 @@ public class FederationInterceptorREST extends AbstractRESTRequestInterceptor { * <p> * In case of ResourceManager failure: * <p> - * The Client submits an application to the Router. ⢠The Router selects one - * SubCluster to forward the request. ⢠The Router inserts a tuple into State - * Store with the selected SubCluster (e.g. SC1) and the appId. ⢠The Router - * submits the request to the selected SubCluster. ⢠The entire SubCluster is - * down â all the RMs in HA or the master RM is not reachable. ⢠The Router - * times out. ⢠The Router selects a new SubCluster to forward the request. ⢠+ * The Client submits an application to the Router. The Router selects one + * SubCluster to forward the request. The Router inserts a tuple into State + * Store with the selected SubCluster (e.g. SC1) and the appId. The Router + * submits the request to the selected SubCluster. The entire SubCluster is + * down â all the RMs in HA or the master RM is not reachable. The Router + * times out. The Router selects a new SubCluster to forward the request. * The Router update a tuple into State Store with the selected SubCluster - * (e.g. SC2) and the appId. ⢠The State Store replies with OK answer. ⢠The + * (e.g. SC2) and the appId. The State Store replies with OK answer. The * Router submits the request to the selected SubCluster (e.g. SC2). */ @Override --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
