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 bi...@apache.org on 2013/09/14 01:51:50 UTC
svn commit: r1523146 -
/hadoop/common/trunk/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-app/src/main/java/org/apache/hadoop/mapreduce/v2/app/rm/RMCommunicator.java
Author: bikas
Date: Fri Sep 13 23:51:50 2013
New Revision: 1523146
URL: http://svn.apache.org/r1523146
Log:
YARN-1116. Populate AMRMTokens back to AMRMTokenSecretManager after RM restarts (Jian He via bikas)
Modified:
hadoop/common/trunk/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-app/src/main/java/org/apache/hadoop/mapreduce/v2/app/rm/RMCommunicator.java
Modified: hadoop/common/trunk/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-app/src/main/java/org/apache/hadoop/mapreduce/v2/app/rm/RMCommunicator.java
URL: http://svn.apache.org/viewvc/hadoop/common/trunk/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-app/src/main/java/org/apache/hadoop/mapreduce/v2/app/rm/RMCommunicator.java?rev=1523146&r1=1523145&r2=1523146&view=diff
==============================================================================
--- hadoop/common/trunk/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-app/src/main/java/org/apache/hadoop/mapreduce/v2/app/rm/RMCommunicator.java (original)
+++ hadoop/common/trunk/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-app/src/main/java/org/apache/hadoop/mapreduce/v2/app/rm/RMCommunicator.java Fri Sep 13 23:51:50 2013
@@ -237,15 +237,6 @@ public abstract class RMCommunicator ext
} catch (YarnRuntimeException e) {
LOG.error("Error communicating with RM: " + e.getMessage() , e);
return;
- } catch (InvalidToken e) {
- // This can happen if the RM has been restarted, since currently
- // when RM restarts AMRMToken is not populated back to
- // AMRMTokenSecretManager yet. Once this is fixed, no need
- // to send JOB_AM_REBOOT event in this method any more.
- eventHandler.handle(new JobEvent(job.getID(),
- JobEventType.JOB_AM_REBOOT));
- LOG.error("Error in authencating with RM: " ,e);
- return;
} catch (Exception e) {
LOG.error("ERROR IN CONTACTING RM. ", e);
continue;