svn commit: r1490704 - in /hadoop/common/trunk/hadoop-yarn-project: CHANGES.txt hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/main/java/org/apache/hadoop/yarn/server/nodemanager/NodeStatusUpdaterImpl.java

[jlowe]

Author: jlowe
Date: Fri Jun  7 16:20:20 2013
New Revision: 1490704

URL: http://svn.apache.org/r1490704
Log:
YARN-760. NodeManager throws AvroRuntimeException on failed start. Contributed 
by Niranjan Singh

Modified:
    hadoop/common/trunk/hadoop-yarn-project/CHANGES.txt
    
hadoop/common/trunk/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/main/java/org/apache/hadoop/yarn/server/nodemanager/NodeStatusUpdaterImpl.java

Modified: hadoop/common/trunk/hadoop-yarn-project/CHANGES.txt
URL: 
http://svn.apache.org/viewvc/hadoop/common/trunk/hadoop-yarn-project/CHANGES.txt?rev=1490704&r1=1490703&r2=1490704&view=diff
==============================================================================
--- hadoop/common/trunk/hadoop-yarn-project/CHANGES.txt (original)
+++ hadoop/common/trunk/hadoop-yarn-project/CHANGES.txt Fri Jun  7 16:20:20 2013
@@ -10,7 +10,7 @@ Trunk - Unreleased 
 
     YARN-84. Use Builder to build RPC server. (Brandon Li via suresh)
 
-  OPTIMAZATIONS
+  OPTIMIZATIONS
 
   BUG FIXES
 
@@ -20,6 +20,30 @@ Trunk - Unreleased 
     YARN-597. TestFSDownload fails on Windows due to dependencies on
     tar/gzip/jar tools. (Ivan Mitic via acmurthy) 
 
+Release 2.3.0 - UNRELEASED
+
+  INCOMPATIBLE CHANGES
+
+  NEW FEATURES
+
+  IMPROVEMENTS
+
+  OPTIMIZATIONS
+
+  BUG FIXES
+
+Release 2.2.0 - UNRELEASED
+
+  INCOMPATIBLE CHANGES
+
+  NEW FEATURES
+
+  IMPROVEMENTS
+
+  OPTIMIZATIONS
+
+  BUG FIXES
+
 Release 2.1.0-beta - UNRELEASED
 
   INCOMPATIBLE CHANGES
@@ -450,6 +474,9 @@ Release 2.1.0-beta - UNRELEASED
 
     YARN-761. TestNMClientAsync fails sometimes (Zhijie Shen via bikas)
 
+    YARN-760. NodeManager throws AvroRuntimeException on failed start.
+    (Niranjan Singh via jlowe)
+
   BREAKDOWN OF HADOOP-8562 SUBTASKS AND RELATED JIRAS
 
     YARN-158. Yarn creating package-info.java must not depend on sh.

Modified: 
hadoop/common/trunk/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/main/java/org/apache/hadoop/yarn/server/nodemanager/NodeStatusUpdaterImpl.java
URL: 
http://svn.apache.org/viewvc/hadoop/common/trunk/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/main/java/org/apache/hadoop/yarn/server/nodemanager/NodeStatusUpdaterImpl.java?rev=1490704&r1=1490703&r2=1490704&view=diff
==============================================================================
--- 
hadoop/common/trunk/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/main/java/org/apache/hadoop/yarn/server/nodemanager/NodeStatusUpdaterImpl.java
 (original)
+++ 
hadoop/common/trunk/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/main/java/org/apache/hadoop/yarn/server/nodemanager/NodeStatusUpdaterImpl.java
 Fri Jun  7 16:20:20 2013
@@ -29,7 +29,6 @@ import java.util.Map;
 import java.util.Map.Entry;
 import java.util.Random;
 
-import org.apache.avro.AvroRuntimeException;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 import org.apache.hadoop.classification.InterfaceAudience.Private;
@@ -163,7 +162,9 @@ public class NodeStatusUpdaterImpl exten
       super.start();
       startStatusUpdater();
     } catch (Exception e) {
-      throw new AvroRuntimeException(e);
+      String errorMessage = "Unexpected error starting NodeStatusUpdater";
+      LOG.error(errorMessage, e);
+      throw new YarnRuntimeException(e);
     }
   }
 
@@ -186,7 +187,9 @@ public class NodeStatusUpdaterImpl exten
       statusUpdater.start();
       LOG.info("NodeStatusUpdater thread is reRegistered and restarted");
     } catch (Exception e) {
-      throw new AvroRuntimeException(e);
+      String errorMessage = "Unexpected error rebooting NodeStatusUpdater";
+      LOG.error(errorMessage, e);
+      throw new YarnRuntimeException(e);
     }
   }