svn commit: r1536801 - in /hadoop/common/branches/HDFS-2832/hadoop-yarn-project: CHANGES.txt hadoop-yarn/bin/yarn.cmd hadoop-yarn/hadoop-yarn-client/src/main/java/org/apache/hadoop/yarn/client/api/async/impl/AMRMClientAsyncImpl.java

[arp]

Author: arp
Date: Tue Oct 29 16:44:53 2013
New Revision: 1536801

URL: http://svn.apache.org/r1536801
Log:
Merging r1536182 through r1536558 from trunk to branch HDFS-2832

Modified:
    hadoop/common/branches/HDFS-2832/hadoop-yarn-project/CHANGES.txt
    
hadoop/common/branches/HDFS-2832/hadoop-yarn-project/hadoop-yarn/bin/yarn.cmd
    
hadoop/common/branches/HDFS-2832/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-client/src/main/java/org/apache/hadoop/yarn/client/api/async/impl/AMRMClientAsyncImpl.java

Modified: hadoop/common/branches/HDFS-2832/hadoop-yarn-project/CHANGES.txt
URL: 
http://svn.apache.org/viewvc/hadoop/common/branches/HDFS-2832/hadoop-yarn-project/CHANGES.txt?rev=1536801&r1=1536800&r2=1536801&view=diff
==============================================================================
--- hadoop/common/branches/HDFS-2832/hadoop-yarn-project/CHANGES.txt (original)
+++ hadoop/common/branches/HDFS-2832/hadoop-yarn-project/CHANGES.txt Tue Oct 29 
16:44:53 2013
@@ -147,6 +147,11 @@ Release 2.2.1 - UNRELEASED
 
     YARN-1330. Fair Scheduler: defaultQueueSchedulingPolicy does not take 
effect
     (Sandy Ryza)
+    
+    YARN-1022. Unnecessary INFO logs in AMRMClientAsync (haosdent via bikas)
+    
+    YARN-1349. yarn.cmd does not support passthrough to any arbitrary class.
+    (cnauroth)
 
 Release 2.2.0 - 2013-10-13
 

Modified: 
hadoop/common/branches/HDFS-2832/hadoop-yarn-project/hadoop-yarn/bin/yarn.cmd
URL: 
http://svn.apache.org/viewvc/hadoop/common/branches/HDFS-2832/hadoop-yarn-project/hadoop-yarn/bin/yarn.cmd?rev=1536801&r1=1536800&r2=1536801&view=diff
==============================================================================
--- 
hadoop/common/branches/HDFS-2832/hadoop-yarn-project/hadoop-yarn/bin/yarn.cmd 
(original)
+++ 
hadoop/common/branches/HDFS-2832/hadoop-yarn-project/hadoop-yarn/bin/yarn.cmd 
Tue Oct 29 16:44:53 2013
@@ -133,7 +133,21 @@ if "%1" == "--config" (
   set CLASSPATH=%CLASSPATH%;%HADOOP_YARN_HOME%\%YARN_DIR%\*
   set CLASSPATH=%CLASSPATH%;%HADOOP_YARN_HOME%\%YARN_LIB_JARS_DIR%\*
 
-  call :%yarn-command% %yarn-command-arguments%
+  if %yarn-command% == classpath (
+    @echo %CLASSPATH%
+    goto :eof
+  )
+
+  set yarncommands=resourcemanager nodemanager proxyserver rmadmin version jar 
application node logs daemonlog
+  for %%i in ( %yarncommands% ) do (
+    if %yarn-command% == %%i set yarncommand=true
+  )
+  if defined yarncommand (
+    call :%yarn-command%
+  ) else (
+    set CLASSPATH=%CLASSPATH%;%CD%
+    set CLASS=%yarn-command%
+  )
 
   if defined JAVA_LIBRARY_PATH (
     set YARN_OPTS=%YARN_OPTS% -Djava.library.path=%JAVA_LIBRARY_PATH%

Modified: 
hadoop/common/branches/HDFS-2832/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-client/src/main/java/org/apache/hadoop/yarn/client/api/async/impl/AMRMClientAsyncImpl.java
URL: 
http://svn.apache.org/viewvc/hadoop/common/branches/HDFS-2832/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-client/src/main/java/org/apache/hadoop/yarn/client/api/async/impl/AMRMClientAsyncImpl.java?rev=1536801&r1=1536800&r2=1536801&view=diff
==============================================================================
--- 
hadoop/common/branches/HDFS-2832/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-client/src/main/java/org/apache/hadoop/yarn/client/api/async/impl/AMRMClientAsyncImpl.java
 (original)
+++ 
hadoop/common/branches/HDFS-2832/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-client/src/main/java/org/apache/hadoop/yarn/client/api/async/impl/AMRMClientAsyncImpl.java
 Tue Oct 29 16:44:53 2013
@@ -240,7 +240,7 @@ extends AMRMClientAsync<T> {
               }
               break;
             } catch (InterruptedException ex) {
-              LOG.info("Interrupted while waiting to put on response queue", 
ex);
+              LOG.debug("Interrupted while waiting to put on response queue", 
ex);
             }
           }
         }
@@ -248,7 +248,7 @@ extends AMRMClientAsync<T> {
         try {
           Thread.sleep(heartbeatIntervalMs.get());
         } catch (InterruptedException ex) {
-          LOG.info("Heartbeater interrupted", ex);
+          LOG.debug("Heartbeater interrupted", ex);
         }
       }
     }