diff --git a/hadoop-yarn-project/hadoop-yarn/bin/yarn b/hadoop-yarn-project/hadoop-yarn/bin/yarn index 54daeaafbe9..c2d74970a0d 100755 --- a/hadoop-yarn-project/hadoop-yarn/bin/yarn +++ b/hadoop-yarn-project/hadoop-yarn/bin/yarn @@ -180,7 +180,7 @@ ${HADOOP_COMMON_HOME}/${HADOOP_COMMON_LIB_JARS_DIR}" HADOOP_CLASSNAME='org.apache.hadoop.yarn.client.cli.SchedConfCLI' ;; scmadmin) - HADOOP_CLASSNAME='org.apache.hadoop.yarn.client.SCMAdmin' + HADOOP_CLASSNAME='org.apache.hadoop.yarn.client.cli.SCMAdminCLI' ;; sharedcachemanager) HADOOP_SUBCMD_SUPPORTDAEMONIZATION="true" diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-client/src/main/java/org/apache/hadoop/yarn/client/SCMAdmin.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-client/src/main/java/org/apache/hadoop/yarn/client/cli/SCMAdminCLI.java similarity index 96% rename from hadoop-yarn-project/hadoop-yarn/hadoop-yarn-client/src/main/java/org/apache/hadoop/yarn/client/SCMAdmin.java rename to hadoop-yarn-project/hadoop-yarn/hadoop-yarn-client/src/main/java/org/apache/hadoop/yarn/client/cli/SCMAdminCLI.java index dc6bf481a0d..4567ade965f 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-client/src/main/java/org/apache/hadoop/yarn/client/SCMAdmin.java +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-client/src/main/java/org/apache/hadoop/yarn/client/cli/SCMAdminCLI.java @@ -16,7 +16,7 @@ * limitations under the License. */ -package org.apache.hadoop.yarn.client; +package org.apache.hadoop.yarn.client.cli; import java.io.IOException; import java.net.InetSocketAddress; @@ -35,16 +35,16 @@ import org.apache.hadoop.yarn.server.api.protocolrecords.RunSharedCacheCleanerTaskRequest; import org.apache.hadoop.yarn.server.api.protocolrecords.RunSharedCacheCleanerTaskResponse; -public class SCMAdmin extends Configured implements Tool { +public class SCMAdminCLI extends Configured implements Tool { private final RecordFactory recordFactory = RecordFactoryProvider.getRecordFactory(null); - public SCMAdmin() { + public SCMAdminCLI() { super(); } - public SCMAdmin(Configuration conf) { + public SCMAdminCLI(Configuration conf) { super(conf); } @@ -177,7 +177,7 @@ public int run(String[] args) throws Exception { } public static void main(String[] args) throws Exception { - int result = ToolRunner.run(new SCMAdmin(), args); + int result = ToolRunner.run(new SCMAdminCLI(), args); System.exit(result); } } diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-sharedcachemanager/src/test/java/org/apache/hadoop/yarn/server/sharedcachemanager/TestSCMAdminProtocolService.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-sharedcachemanager/src/test/java/org/apache/hadoop/yarn/server/sharedcachemanager/TestSCMAdminCLIProtocolService.java similarity index 96% rename from hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-sharedcachemanager/src/test/java/org/apache/hadoop/yarn/server/sharedcachemanager/TestSCMAdminProtocolService.java rename to hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-sharedcachemanager/src/test/java/org/apache/hadoop/yarn/server/sharedcachemanager/TestSCMAdminCLIProtocolService.java index e183ffa5cfb..c3b7e84fd42 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-sharedcachemanager/src/test/java/org/apache/hadoop/yarn/server/sharedcachemanager/TestSCMAdminProtocolService.java +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-sharedcachemanager/src/test/java/org/apache/hadoop/yarn/server/sharedcachemanager/TestSCMAdminCLIProtocolService.java @@ -33,11 +33,11 @@ import org.apache.hadoop.conf.Configuration; import org.apache.hadoop.ipc.RPC; +import org.apache.hadoop.yarn.client.cli.SCMAdminCLI; import org.apache.hadoop.yarn.server.api.SCMAdminProtocol; import org.apache.hadoop.yarn.server.api.protocolrecords.RunSharedCacheCleanerTaskRequest; import org.apache.hadoop.yarn.server.api.protocolrecords.RunSharedCacheCleanerTaskResponse; import org.apache.hadoop.yarn.server.api.protocolrecords.impl.pb.RunSharedCacheCleanerTaskResponsePBImpl; -import org.apache.hadoop.yarn.client.SCMAdmin; import org.apache.hadoop.yarn.conf.YarnConfiguration; import org.apache.hadoop.yarn.factories.RecordFactory; import org.apache.hadoop.yarn.factory.providers.RecordFactoryProvider; @@ -52,12 +52,12 @@ /** * Basic unit tests for the SCM Admin Protocol Service and SCMAdmin. */ -public class TestSCMAdminProtocolService { +public class TestSCMAdminCLIProtocolService { static SCMAdminProtocolService service; static SCMAdminProtocol SCMAdminProxy; static SCMAdminProtocol mockAdmin; - static SCMAdmin adminCLI; + static SCMAdminCLI adminCLI; static SCMStore store; static CleanerService cleaner; private final RecordFactory recordFactory = RecordFactoryProvider @@ -87,7 +87,7 @@ public void startUp() { conf); mockAdmin = mock(SCMAdminProtocol.class); - adminCLI = new SCMAdmin(new Configuration()) { + adminCLI = new SCMAdminCLI(new Configuration()) { @Override protected SCMAdminProtocol createSCMAdminProtocol() throws IOException { return mockAdmin;