[27/50] [abbrv] hadoop git commit: YARN-5413. Create a proxy chain for ResourceManager Admin API in the Router. (Giovanni Matteo Fumarola via Subru).
http://git-wip-us.apache.org/repos/asf/hadoop/blob/7f00f938/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-router/src/test/java/org/apache/hadoop/yarn/server/router/rmadmin/TestRouterRMAdminService.java
--
diff --git
a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-router/src/test/java/org/apache/hadoop/yarn/server/router/rmadmin/TestRouterRMAdminService.java
b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-router/src/test/java/org/apache/hadoop/yarn/server/router/rmadmin/TestRouterRMAdminService.java
new file mode 100644
index 000..11786e6
--- /dev/null
+++
b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-router/src/test/java/org/apache/hadoop/yarn/server/router/rmadmin/TestRouterRMAdminService.java
@@ -0,0 +1,219 @@
+/**
+* Licensed to the Apache Software Foundation (ASF) under one
+* or more contributor license agreements. See the NOTICE file
+* distributed with this work for additional information
+* regarding copyright ownership. The ASF licenses this file
+* to you under the Apache License, Version 2.0 (the
+* "License"); you may not use this file except in compliance
+* with the License. You may obtain a copy of the License at
+*
+* http://www.apache.org/licenses/LICENSE-2.0
+*
+* Unless required by applicable law or agreed to in writing, software
+* distributed under the License is distributed on an "AS IS" BASIS,
+* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+* See the License for the specific language governing permissions and
+* limitations under the License.
+*/
+
+package org.apache.hadoop.yarn.server.router.rmadmin;
+
+import java.io.IOException;
+import java.util.Map;
+
+import org.apache.hadoop.yarn.exceptions.YarnException;
+import
org.apache.hadoop.yarn.server.api.protocolrecords.AddToClusterNodeLabelsResponse;
+import
org.apache.hadoop.yarn.server.api.protocolrecords.CheckForDecommissioningNodesResponse;
+import
org.apache.hadoop.yarn.server.api.protocolrecords.RefreshAdminAclsResponse;
+import
org.apache.hadoop.yarn.server.api.protocolrecords.RefreshClusterMaxPriorityResponse;
+import
org.apache.hadoop.yarn.server.api.protocolrecords.RefreshNodesResourcesResponse;
+import org.apache.hadoop.yarn.server.api.protocolrecords.RefreshNodesResponse;
+import org.apache.hadoop.yarn.server.api.protocolrecords.RefreshQueuesResponse;
+import
org.apache.hadoop.yarn.server.api.protocolrecords.RefreshServiceAclsResponse;
+import
org.apache.hadoop.yarn.server.api.protocolrecords.RefreshSuperUserGroupsConfigurationResponse;
+import
org.apache.hadoop.yarn.server.api.protocolrecords.RefreshUserToGroupsMappingsResponse;
+import
org.apache.hadoop.yarn.server.api.protocolrecords.RemoveFromClusterNodeLabelsResponse;
+import
org.apache.hadoop.yarn.server.api.protocolrecords.ReplaceLabelsOnNodeResponse;
+import
org.apache.hadoop.yarn.server.api.protocolrecords.UpdateNodeResourceResponse;
+import
org.apache.hadoop.yarn.server.router.rmadmin.RouterRMAdminService.RequestInterceptorChainWrapper;
+import org.junit.Assert;
+import org.junit.Test;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+/**
+ * Test class to validate the RMAdmin Service inside the Router.
+ */
+public class TestRouterRMAdminService extends BaseRouterRMAdminTest {
+
+ private static final Logger LOG =
+ LoggerFactory.getLogger(TestRouterRMAdminService.class);
+
+ /**
+ * Tests if the pipeline is created properly.
+ */
+ @Test
+ public void testRequestInterceptorChainCreation() throws Exception {
+RMAdminRequestInterceptor root =
+super.getRouterRMAdminService().createRequestInterceptorChain();
+int index = 0;
+while (root != null) {
+ // The current pipeline is:
+ // PassThroughRMAdminRequestInterceptor - index = 0
+ // PassThroughRMAdminRequestInterceptor - index = 1
+ // PassThroughRMAdminRequestInterceptor - index = 2
+ // MockClientRequestInterceptor - index = 3
+ switch (index) {
+ case 0: // Fall to the next case
+ case 1: // Fall to the next case
+ case 2:
+// If index is equal to 0,1 or 2 we fall in this check
+Assert.assertEquals(
+PassThroughRMAdminRequestInterceptor.class.getName(),
+root.getClass().getName());
+break;
+ case 3:
+Assert.assertEquals(MockRMAdminRequestInterceptor.class.getName(),
+root.getClass().getName());
+break;
+ default:
+Assert.fail();
+ }
+ root = root.getNextInterceptor();
+ index++;
+}
+Assert.assertEquals("The number of interceptors in chain does not match",
4,
+index);
+ }
+
+ /**
+ * Test if the RouterRMAdmin forwards all the requests to the MockRM and get
+ * back the responses.
+ */
+ @Test
+ public void testRouterRMAdminServiceE2E() throws Exception {
+
+String
[27/50] [abbrv] hadoop git commit: YARN-5413. Create a proxy chain for ResourceManager Admin API in the Router. (Giovanni Matteo Fumarola via Subru).
YARN-5413. Create a proxy chain for ResourceManager Admin API in the Router.
(Giovanni Matteo Fumarola via Subru).
Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo
Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/3b93a5aa
Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/3b93a5aa
Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/3b93a5aa
Branch: refs/heads/YARN-2915
Commit: 3b93a5aa683ced8707b6fa7eafb90d61fb8307b6
Parents: 2bdbfa6
Author: Subru Krishnan
Authored: Tue May 9 19:19:27 2017 -0700
Committer: Subru Krishnan
Committed: Tue Jun 20 16:07:34 2017 -0700
--
.../hadoop/yarn/conf/YarnConfiguration.java | 22 +-
.../src/main/resources/yarn-default.xml | 25 +-
.../hadoop/yarn/util/TestLRUCacheHashMap.java | 2 +-
.../yarn/server/MockResourceManagerFacade.java | 120 +-
.../hadoop/yarn/server/router/Router.java | 10 +
.../AbstractClientRequestInterceptor.java | 11 +-
.../DefaultClientRequestInterceptor.java| 2 +-
.../router/clientrm/RouterClientRMService.java | 16 +-
.../AbstractRMAdminRequestInterceptor.java | 90
.../DefaultRMAdminRequestInterceptor.java | 215 ++
.../rmadmin/RMAdminRequestInterceptor.java | 65 +++
.../router/rmadmin/RouterRMAdminService.java| 423 +++
.../server/router/rmadmin/package-info.java | 20 +
.../router/clientrm/BaseRouterClientRMTest.java | 2 +-
.../router/rmadmin/BaseRouterRMAdminTest.java | 346 +++
.../rmadmin/MockRMAdminRequestInterceptor.java | 36 ++
.../PassThroughRMAdminRequestInterceptor.java | 148 +++
.../rmadmin/TestRouterRMAdminService.java | 219 ++
18 files changed, 1750 insertions(+), 22 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/hadoop/blob/3b93a5aa/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-api/src/main/java/org/apache/hadoop/yarn/conf/YarnConfiguration.java
--
diff --git
a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-api/src/main/java/org/apache/hadoop/yarn/conf/YarnConfiguration.java
b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-api/src/main/java/org/apache/hadoop/yarn/conf/YarnConfiguration.java
index 7f2655f..4d1463b 100644
---
a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-api/src/main/java/org/apache/hadoop/yarn/conf/YarnConfiguration.java
+++
b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-api/src/main/java/org/apache/hadoop/yarn/conf/YarnConfiguration.java
@@ -2621,6 +2621,8 @@ public class YarnConfiguration extends Configuration {
public static final String ROUTER_PREFIX = YARN_PREFIX + "router.";
+ public static final String ROUTER_BIND_HOST = ROUTER_PREFIX + "bind-host";
+
public static final String ROUTER_CLIENTRM_PREFIX =
ROUTER_PREFIX + "clientrm.";
@@ -2636,9 +2638,23 @@ public class YarnConfiguration extends Configuration {
"org.apache.hadoop.yarn.server.router.clientrm."
+ "DefaultClientRequestInterceptor";
- public static final String ROUTER_CLIENTRM_PIPELINE_CACHE_MAX_SIZE =
- ROUTER_CLIENTRM_PREFIX + "cache-max-size";
- public static final int DEFAULT_ROUTER_CLIENTRM_PIPELINE_CACHE_MAX_SIZE = 25;
+ public static final String ROUTER_PIPELINE_CACHE_MAX_SIZE =
+ ROUTER_PREFIX + "pipeline.cache-max-size";
+ public static final int DEFAULT_ROUTER_PIPELINE_CACHE_MAX_SIZE = 25;
+
+ public static final String ROUTER_RMADMIN_PREFIX = ROUTER_PREFIX +
"rmadmin.";
+
+ public static final String ROUTER_RMADMIN_ADDRESS =
+ ROUTER_RMADMIN_PREFIX + ".address";
+ public static final int DEFAULT_ROUTER_RMADMIN_PORT = 8052;
+ public static final String DEFAULT_ROUTER_RMADMIN_ADDRESS =
+ "0.0.0.0:" + DEFAULT_ROUTER_RMADMIN_PORT;
+
+ public static final String ROUTER_RMADMIN_INTERCEPTOR_CLASS_PIPELINE =
+ ROUTER_RMADMIN_PREFIX + "interceptor-class.pipeline";
+ public static final String DEFAULT_ROUTER_RMADMIN_INTERCEPTOR_CLASS =
+ "org.apache.hadoop.yarn.server.router.rmadmin."
+ + "DefaultRMAdminRequestInterceptor";
// Other Configs
http://git-wip-us.apache.org/repos/asf/hadoop/blob/3b93a5aa/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/resources/yarn-default.xml
--
diff --git
a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/resources/yarn-default.xml
b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/resources/yarn-default.xml
index 03559dc..ad936ff 100644
---
a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/resources/yarn-default.xml
+++
b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/resources/yarn-default.xml
@@ -3159,10 +3159,31 @@
- Size of LRU cache for Router Cl
