You are viewing a plain text version of this content. The canonical link for it is here.
Posted to mapreduce-commits@hadoop.apache.org by sh...@apache.org on 2011/05/10 09:48:48 UTC

svn commit: r1101353 - in /hadoop/mapreduce/branches/MR-279: CHANGES.txt mr-client/hadoop-mapreduce-client-jobclient/src/main/java/org/apache/hadoop/mapred/ClientServiceDelegate.java

Author: sharad
Date: Tue May 10 07:48:47 2011
New Revision: 1101353

URL: http://svn.apache.org/viewvc?rev=1101353&view=rev
Log:
Fix refreshProxy in ClientServiceDelegate.

Modified:
    hadoop/mapreduce/branches/MR-279/CHANGES.txt
    hadoop/mapreduce/branches/MR-279/mr-client/hadoop-mapreduce-client-jobclient/src/main/java/org/apache/hadoop/mapred/ClientServiceDelegate.java

Modified: hadoop/mapreduce/branches/MR-279/CHANGES.txt
URL: http://svn.apache.org/viewvc/hadoop/mapreduce/branches/MR-279/CHANGES.txt?rev=1101353&r1=1101352&r2=1101353&view=diff
==============================================================================
--- hadoop/mapreduce/branches/MR-279/CHANGES.txt (original)
+++ hadoop/mapreduce/branches/MR-279/CHANGES.txt Tue May 10 07:48:47 2011
@@ -3,6 +3,8 @@ Hadoop MapReduce Change Log
 Trunk (unreleased changes)
 
   MAPREDUCE-279
+    Fix refreshProxy in ClientServiceDelegate. (sharad)
+
     Client reconnect to restarted AM. (sharad)
 
     Replacing FileContext usage with FileSystem to work around security authentication

Modified: hadoop/mapreduce/branches/MR-279/mr-client/hadoop-mapreduce-client-jobclient/src/main/java/org/apache/hadoop/mapred/ClientServiceDelegate.java
URL: http://svn.apache.org/viewvc/hadoop/mapreduce/branches/MR-279/mr-client/hadoop-mapreduce-client-jobclient/src/main/java/org/apache/hadoop/mapred/ClientServiceDelegate.java?rev=1101353&r1=1101352&r2=1101353&view=diff
==============================================================================
--- hadoop/mapreduce/branches/MR-279/mr-client/hadoop-mapreduce-client-jobclient/src/main/java/org/apache/hadoop/mapred/ClientServiceDelegate.java (original)
+++ hadoop/mapreduce/branches/MR-279/mr-client/hadoop-mapreduce-client-jobclient/src/main/java/org/apache/hadoop/mapred/ClientServiceDelegate.java Tue May 10 07:48:47 2011
@@ -94,8 +94,8 @@ public class ClientServiceDelegate {
 
   private void refreshProxy() throws YarnRemoteException {
     ApplicationMaster appMaster = rm.getApplicationMaster(currentAppId);
-    while (!ApplicationState.COMPLETED.equals(appMaster.getState()) ||
-           !ApplicationState.FAILED.equals(appMaster.getState()) || 
+    while (!ApplicationState.COMPLETED.equals(appMaster.getState()) &&
+           !ApplicationState.FAILED.equals(appMaster.getState()) && 
            !ApplicationState.KILLED.equals(appMaster.getState())) {
       try {
         if (appMaster.getHost() == null || "".equals(appMaster.getHost())) {