svn merge -c 1490704 FIXES: YARN-760. NodeManager throws AvroRuntimeException on failed start. Conributed by Niranjan Singh
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1490706 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
parent
2910b06dfa
commit
4937b65732
|
@ -454,6 +454,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.
|
||||
|
|
|
@ -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 extends AbstractService implements
|
|||
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 extends AbstractService implements
|
|||
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);
|
||||
}
|
||||
}
|
||||
|
||||
|
|
Loading…
Reference in New Issue