Author: jeagles
Date: Wed Oct 23 04:10:09 2013
New Revision: 1534905
URL: http://svn.apache.org/r1534905
Log:
HADOOP-9598. Improve code coverage of RMAdminCLI (Aleksey Gorshkov and Andrey
Klochkov via jeagles)
Added:
hadoop/common/trunk/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-client/src/test/java/org/apache/hadoop/yarn/client/TestRMAdminCLI.java
Modified:
hadoop/common/trunk/hadoop-yarn-project/CHANGES.txt
hadoop/common/trunk/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-client/src/main/java/org/apache/hadoop/yarn/client/cli/RMAdminCLI.java
Modified: hadoop/common/trunk/hadoop-yarn-project/CHANGES.txt
URL:
http://svn.apache.org/viewvc/hadoop/common/trunk/hadoop-yarn-project/CHANGES.txt?rev=1534905&r1=1534904&r2=1534905&view=diff
==============================================================================
--- hadoop/common/trunk/hadoop-yarn-project/CHANGES.txt (original)
+++ hadoop/common/trunk/hadoop-yarn-project/CHANGES.txt Wed Oct 23 04:10:09 2013
@@ -64,6 +64,9 @@ Release 2.3.0 - UNRELEASED
YARN-1182. MiniYARNCluster creates and inits the RM/NM only on start()
(Karthik Kambatla via Sandy Ryza)
+ HADOOP-9598. Improve code coverage of RMAdminCLI (Aleksey Gorshkov and
+ Andrey Klochkov via jeagles)
+
OPTIMIZATIONS
BUG FIXES
Modified:
hadoop/common/trunk/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-client/src/main/java/org/apache/hadoop/yarn/client/cli/RMAdminCLI.java
URL:
http://svn.apache.org/viewvc/hadoop/common/trunk/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-client/src/main/java/org/apache/hadoop/yarn/client/cli/RMAdminCLI.java?rev=1534905&r1=1534904&r2=1534905&view=diff
==============================================================================
---
hadoop/common/trunk/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-client/src/main/java/org/apache/hadoop/yarn/client/cli/RMAdminCLI.java
(original)
+++
hadoop/common/trunk/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-client/src/main/java/org/apache/hadoop/yarn/client/cli/RMAdminCLI.java
Wed Oct 23 04:10:09 2013
@@ -162,7 +162,7 @@ public class RMAdminCLI extends Configur
}
}
- private ResourceManagerAdministrationProtocol createAdminProtocol() throws
IOException {
+ protected ResourceManagerAdministrationProtocol createAdminProtocol() throws
IOException {
// Get the current configuration
final YarnConfiguration conf = new YarnConfiguration(getConf());
return ClientRMProxy.createRMProxy(conf,
ResourceManagerAdministrationProtocol.class);
Added:
hadoop/common/trunk/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-client/src/test/java/org/apache/hadoop/yarn/client/TestRMAdminCLI.java
URL:
http://svn.apache.org/viewvc/hadoop/common/trunk/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-client/src/test/java/org/apache/hadoop/yarn/client/TestRMAdminCLI.java?rev=1534905&view=auto
==============================================================================
---
hadoop/common/trunk/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-client/src/test/java/org/apache/hadoop/yarn/client/TestRMAdminCLI.java
(added)
+++
hadoop/common/trunk/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-client/src/test/java/org/apache/hadoop/yarn/client/TestRMAdminCLI.java
Wed Oct 23 04:10:09 2013
@@ -0,0 +1,243 @@
+/**
+ * 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.client;
+
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertTrue;
+import static org.mockito.Matchers.any;
+import static org.mockito.Matchers.argThat;
+import static org.mockito.Matchers.eq;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.verify;
+import static org.mockito.Mockito.when;
+
+import java.io.ByteArrayOutputStream;
+import java.io.IOException;
+import java.io.PrintStream;
+
+import org.apache.hadoop.yarn.client.cli.RMAdminCLI;
+import org.apache.hadoop.yarn.server.api.ResourceManagerAdministrationProtocol;
+import
org.apache.hadoop.yarn.server.api.protocolrecords.RefreshAdminAclsRequest;
+import org.apache.hadoop.yarn.server.api.protocolrecords.RefreshNodesRequest;
+import org.apache.hadoop.yarn.server.api.protocolrecords.RefreshQueuesRequest;
+import
org.apache.hadoop.yarn.server.api.protocolrecords.RefreshServiceAclsRequest;
+import
org.apache.hadoop.yarn.server.api.protocolrecords.RefreshSuperUserGroupsConfigurationRequest;
+import
org.apache.hadoop.yarn.server.api.protocolrecords.RefreshUserToGroupsMappingsRequest;
+import org.junit.Before;
+import org.junit.Test;
+import org.mockito.ArgumentMatcher;
+
+public class TestRMAdminCLI {
+
+ private ResourceManagerAdministrationProtocol admin;
+ private RMAdminCLI rmAdminCLI;
+
+ @Before
+ public void configure() {
+ admin = mock(ResourceManagerAdministrationProtocol.class);
+ rmAdminCLI = new RMAdminCLI() {
+
+ @Override
+ protected ResourceManagerAdministrationProtocol createAdminProtocol()
+ throws IOException {
+ return admin;
+ }
+
+ };
+ }
+
+ @Test(timeout=500)
+ public void testRefreshQueues() throws Exception {
+ String[] args = { "-refreshQueues" };
+ assertEquals(0, rmAdminCLI.run(args));
+ verify(admin).refreshQueues(any(RefreshQueuesRequest.class));
+ }
+
+ @Test(timeout=500)
+ public void testRefreshUserToGroupsMappings() throws Exception {
+ String[] args = { "-refreshUserToGroupsMappings" };
+ assertEquals(0, rmAdminCLI.run(args));
+ verify(admin).refreshUserToGroupsMappings(
+ any(RefreshUserToGroupsMappingsRequest.class));
+ }
+
+ @Test(timeout=500)
+ public void testRefreshSuperUserGroupsConfiguration() throws Exception {
+ String[] args = { "-refreshSuperUserGroupsConfiguration" };
+ assertEquals(0, rmAdminCLI.run(args));
+ verify(admin).refreshSuperUserGroupsConfiguration(
+ any(RefreshSuperUserGroupsConfigurationRequest.class));
+ }
+
+ @Test(timeout=500)
+ public void testRefreshAdminAcls() throws Exception {
+ String[] args = { "-refreshAdminAcls" };
+ assertEquals(0, rmAdminCLI.run(args));
+ verify(admin).refreshAdminAcls(any(RefreshAdminAclsRequest.class));
+ }
+
+ @Test(timeout=500)
+ public void testRefreshServiceAcl() throws Exception {
+ String[] args = { "-refreshServiceAcl" };
+ assertEquals(0, rmAdminCLI.run(args));
+ verify(admin).refreshServiceAcls(any(RefreshServiceAclsRequest.class));
+ }
+
+ @Test(timeout=500)
+ public void testRefreshNodes() throws Exception {
+ String[] args = { "-refreshNodes" };
+ assertEquals(0, rmAdminCLI.run(args));
+ verify(admin).refreshNodes(any(RefreshNodesRequest.class));
+ }
+
+ @Test(timeout=500)
+ public void testGetGroups() throws Exception {
+ when(admin.getGroupsForUser(eq("admin"))).thenReturn(
+ new String[] {"group1", "group2"});
+ PrintStream origOut = System.out;
+ PrintStream out = mock(PrintStream.class);
+ System.setOut(out);
+ try {
+ String[] args = { "-getGroups", "admin" };
+ assertEquals(0, rmAdminCLI.run(args));
+ verify(admin).getGroupsForUser(eq("admin"));
+ verify(out).println(argThat(new ArgumentMatcher<StringBuilder>() {
+ @Override
+ public boolean matches(Object argument) {
+ return ("" + argument).equals("admin : group1 group2");
+ }
+ }));
+ } finally {
+ System.setOut(origOut);
+ }
+ }
+
+ /**
+ * Test printing of help messages
+ */
+ @Test(timeout=500)
+ public void testHelp() throws Exception {
+ PrintStream oldOutPrintStream = System.out;
+ PrintStream oldErrPrintStream = System.err;
+ ByteArrayOutputStream dataOut = new ByteArrayOutputStream();
+ ByteArrayOutputStream dataErr = new ByteArrayOutputStream();
+ System.setOut(new PrintStream(dataOut));
+ System.setErr(new PrintStream(dataErr));
+ try {
+ String[] args = { "-help" };
+ assertEquals(0, rmAdminCLI.run(args));
+ assertTrue(dataOut
+ .toString()
+ .contains(
+ "rmadmin is the command to execute Map-Reduce" +
+ " administrative commands."));
+ assertTrue(dataOut
+ .toString()
+ .contains(
+ "hadoop rmadmin [-refreshQueues] [-refreshNodes] [-refreshSuper"
+
+ "UserGroupsConfiguration] [-refreshUserToGroupsMappings] " +
+ "[-refreshAdminAcls] [-refreshServiceAcl] [-getGroup" +
+ " [username]] [-help [cmd]]"));
+ assertTrue(dataOut
+ .toString()
+ .contains(
+ "-refreshQueues: Reload the queues' acls, states and scheduler "
+
+ "specific properties."));
+ assertTrue(dataOut
+ .toString()
+ .contains(
+ "-refreshNodes: Refresh the hosts information at the " +
+ "ResourceManager."));
+ assertTrue(dataOut.toString().contains(
+ "-refreshUserToGroupsMappings: Refresh user-to-groups mappings"));
+ assertTrue(dataOut
+ .toString()
+ .contains(
+ "-refreshSuperUserGroupsConfiguration: Refresh superuser proxy" +
+ " groups mappings"));
+ assertTrue(dataOut
+ .toString()
+ .contains(
+ "-refreshAdminAcls: Refresh acls for administration of " +
+ "ResourceManager"));
+ assertTrue(dataOut
+ .toString()
+ .contains(
+ "-refreshServiceAcl: Reload the service-level authorization" +
+ " policy file"));
+ assertTrue(dataOut
+ .toString()
+ .contains(
+ "-help [cmd]: \tDisplays help for the given command or all " +
+ "commands if none"));
+
+ testError(new String[] { "-help", "-refreshQueues" },
+ "Usage: java RMAdmin [-refreshQueues]", dataErr, 0);
+ testError(new String[] { "-help", "-refreshNodes" },
+ "Usage: java RMAdmin [-refreshNodes]", dataErr, 0);
+ testError(new String[] { "-help", "-refreshUserToGroupsMappings" },
+ "Usage: java RMAdmin [-refreshUserToGroupsMappings]", dataErr, 0);
+ testError(
+ new String[] { "-help", "-refreshSuperUserGroupsConfiguration" },
+ "Usage: java RMAdmin [-refreshSuperUserGroupsConfiguration]",
+ dataErr, 0);
+ testError(new String[] { "-help", "-refreshAdminAcls" },
+ "Usage: java RMAdmin [-refreshAdminAcls]", dataErr, 0);
+ testError(new String[] { "-help", "-refreshService" },
+ "Usage: java RMAdmin [-refreshServiceAcl]", dataErr, 0);
+ testError(new String[] { "-help", "-getGroups" },
+ "Usage: java RMAdmin [-getGroups [username]]", dataErr, 0);
+
+
+ testError(new String[] { "-help", "-badParameter" },
+ "Usage: java RMAdmin", dataErr, 0);
+ testError(new String[] { "-badParameter" },
+ "badParameter: Unknown command", dataErr, -1);
+ } finally {
+ System.setOut(oldOutPrintStream);
+ System.setErr(oldErrPrintStream);
+ }
+ }
+
+ @Test(timeout=500)
+ public void testException() throws Exception {
+ PrintStream oldErrPrintStream = System.err;
+ ByteArrayOutputStream dataErr = new ByteArrayOutputStream();
+ System.setErr(new PrintStream(dataErr));
+ try {
+ when(admin.refreshQueues(any(RefreshQueuesRequest.class)))
+ .thenThrow(new IOException("test exception"));
+ String[] args = { "-refreshQueues" };
+
+ assertEquals(-1, rmAdminCLI.run(args));
+ verify(admin).refreshQueues(any(RefreshQueuesRequest.class));
+ assertTrue(dataErr.toString().contains("refreshQueues: test exception"));
+ } finally {
+ System.setErr(oldErrPrintStream);
+ }
+ }
+
+ private void testError(String[] args, String template,
+ ByteArrayOutputStream data, int resultCode) throws Exception {
+ assertEquals(resultCode, rmAdminCLI.run(args));
+ assertTrue(data.toString().contains(template));
+ data.reset();
+ }
+
+}
