diff --git hadoop-yarn-project/hadoop-yarn/bin/yarn hadoop-yarn-project/hadoop-yarn/bin/yarn index e0e3b09..8d369e8 100644 --- hadoop-yarn-project/hadoop-yarn/bin/yarn +++ hadoop-yarn-project/hadoop-yarn/bin/yarn @@ -175,7 +175,7 @@ if [ "$COMMAND" = "classpath" ] ; then echo $CLASSPATH exit elif [ "$COMMAND" = "rmadmin" ] ; then - CLASS='org.apache.hadoop.yarn.client.RMAdmin' + CLASS='org.apache.hadoop.yarn.client.cli.RMAdminCLI' YARN_OPTS="$YARN_OPTS $YARN_CLIENT_OPTS" elif [ "$COMMAND" = "application" ] ; then CLASS=org.apache.hadoop.yarn.client.cli.ApplicationCLI diff --git hadoop-yarn-project/hadoop-yarn/hadoop-yarn-client/src/main/java/org/apache/hadoop/yarn/client/cli/RMAdminCLI.java hadoop-yarn-project/hadoop-yarn/hadoop-yarn-client/src/main/java/org/apache/hadoop/yarn/client/cli/RMAdminCLI.java index 4ed9901..6a8c218 100644 --- hadoop-yarn-project/hadoop-yarn/hadoop-yarn-client/src/main/java/org/apache/hadoop/yarn/client/cli/RMAdminCLI.java +++ hadoop-yarn-project/hadoop-yarn/hadoop-yarn-client/src/main/java/org/apache/hadoop/yarn/client/cli/RMAdminCLI.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; @@ -42,16 +42,16 @@ import org.apache.hadoop.yarn.factory.providers.RecordFactoryProvider; import org.apache.hadoop.yarn.ipc.YarnRPC; -public class RMAdmin extends Configured implements Tool { +public class RMAdminCLI extends Configured implements Tool { private final RecordFactory recordFactory = RecordFactoryProvider.getRecordFactory(null); - public RMAdmin() { + public RMAdminCLI() { super(); } - public RMAdmin(Configuration conf) { + public RMAdminCLI(Configuration conf) { super(conf); } @@ -345,7 +345,7 @@ public int run(String[] args) throws Exception { } public static void main(String[] args) throws Exception { - int result = ToolRunner.run(new RMAdmin(), args); + int result = ToolRunner.run(new RMAdminCLI(), args); System.exit(result); } }