ソースを参照

YARN-3015. yarn classpath command should support same options as hadoop classpath. Contributed by Varun Saxena.

cnauroth 10 年 前
コミット
2c4abe9208

+ 3 - 0
hadoop-yarn-project/CHANGES.txt

@@ -354,6 +354,9 @@ Release 2.7.0 - UNRELEASED
     YARN-3070. TestRMAdminCLI#testHelp fails for transitionToActive command. 
     (Contributed by Junping Du)
 
+    YARN-3015. yarn classpath command should support same options as hadoop
+    classpath. (Contributed by Varun Saxena)
+
 Release 2.6.0 - 2014-11-18
 
   INCOMPATIBLE CHANGES

+ 8 - 4
hadoop-yarn-project/hadoop-yarn/bin/yarn

@@ -208,11 +208,15 @@ unset IFS
 
 # figure out which class to run
 if [ "$COMMAND" = "classpath" ] ; then
-  if $cygwin; then
-    CLASSPATH=$(cygpath -p -w "$CLASSPATH" 2>/dev/null)
+  if [ "$#" -gt 0 ]; then
+    CLASS=org.apache.hadoop.util.Classpath
+  else
+    if $cygwin; then
+      CLASSPATH=$(cygpath -p -w "$CLASSPATH" 2>/dev/null)
+    fi
+    echo $CLASSPATH
+    exit 0
   fi
-  echo $CLASSPATH
-  exit
 elif [ "$COMMAND" = "rmadmin" ] ; then
   CLASS='org.apache.hadoop.yarn.client.cli.RMAdminCLI'
   YARN_OPTS="$YARN_OPTS $YARN_CLIENT_OPTS"

+ 7 - 4
hadoop-yarn-project/hadoop-yarn/bin/yarn.cmd

@@ -142,13 +142,16 @@ if "%1" == "--loglevel" (
   set CLASSPATH=%CLASSPATH%;%HADOOP_YARN_HOME%\%YARN_LIB_JARS_DIR%\*
 
   if %yarn-command% == classpath (
-    @echo %CLASSPATH%
-    goto :eof
+    if not defined yarn-command-arguments (
+      @rem No need to bother starting up a JVM for this simple case. 
+      @echo %CLASSPATH%
+      exit /b
+    )
   )
 
   set yarncommands=resourcemanager nodemanager proxyserver rmadmin version jar ^
      application applicationattempt container node logs daemonlog historyserver ^
-     timelineserver
+     timelineserver classpath
   for %%i in ( %yarncommands% ) do (
     if %yarn-command% == %%i set yarncommand=true
   )
@@ -169,7 +172,7 @@ if "%1" == "--loglevel" (
 goto :eof
 
 :classpath
-  @echo %CLASSPATH%
+  set CLASS=org.apache.hadoop.util.Classpath 
   goto :eof
 
 :rmadmin