Repository: asterixdb Updated Branches: refs/heads/master 98de3eb14 -> 05a5a376b
[ASTERIXDB-2042][CLUS] Shutdown NC on Startup Completion Failure - user model changes: no - storage format changes: no - interface changes: no Details: - Report runtime exceptions of NC startup completion to CC. - Shutdown NC after reporting startup completion failure. Change-Id: I6c2ff0130e5e3e35ccf42a66d6855e568dce1fbe Reviewed-on: https://asterix-gerrit.ics.uci.edu/1943 Sonar-Qube: Jenkins <[email protected]> Tested-by: Jenkins <[email protected]> Integration-Tests: Michael Blow <[email protected]> Integration-Tests: Jenkins <[email protected]> Reviewed-by: abdullah alamoudi <[email protected]> Project: http://git-wip-us.apache.org/repos/asf/asterixdb/repo Commit: http://git-wip-us.apache.org/repos/asf/asterixdb/commit/05a5a376 Tree: http://git-wip-us.apache.org/repos/asf/asterixdb/tree/05a5a376 Diff: http://git-wip-us.apache.org/repos/asf/asterixdb/diff/05a5a376 Branch: refs/heads/master Commit: 05a5a376be7d97066c61f97ffb27e05db70c40f8 Parents: 98de3eb Author: Murtadha Hubail <[email protected]> Authored: Tue Aug 15 20:44:17 2017 +0300 Committer: Murtadha Hubail <[email protected]> Committed: Wed Aug 16 00:29:41 2017 -0700 ---------------------------------------------------------------------- .../message/NCLifecycleTaskReportMessage.java | 6 ++-- .../message/StartupTaskResponseMessage.java | 35 ++++++++++++-------- .../hyracks/control/nc/NCShutdownHook.java | 2 ++ 3 files changed, 26 insertions(+), 17 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/asterixdb/blob/05a5a376/asterixdb/asterix-app/src/main/java/org/apache/asterix/app/replication/message/NCLifecycleTaskReportMessage.java ---------------------------------------------------------------------- diff --git a/asterixdb/asterix-app/src/main/java/org/apache/asterix/app/replication/message/NCLifecycleTaskReportMessage.java b/asterixdb/asterix-app/src/main/java/org/apache/asterix/app/replication/message/NCLifecycleTaskReportMessage.java index a01d70a..2b32e1f 100644 --- a/asterixdb/asterix-app/src/main/java/org/apache/asterix/app/replication/message/NCLifecycleTaskReportMessage.java +++ b/asterixdb/asterix-app/src/main/java/org/apache/asterix/app/replication/message/NCLifecycleTaskReportMessage.java @@ -28,7 +28,7 @@ public class NCLifecycleTaskReportMessage implements INCLifecycleMessage, ICcAdd private static final long serialVersionUID = 1L; private final String nodeId; private final boolean success; - private Exception exception; + private Throwable exception; public NCLifecycleTaskReportMessage(String nodeId, boolean success) { this.nodeId = nodeId; @@ -48,11 +48,11 @@ public class NCLifecycleTaskReportMessage implements INCLifecycleMessage, ICcAdd return success; } - public Exception getException() { + public Throwable getException() { return exception; } - public void setException(Exception exception) { + public void setException(Throwable exception) { this.exception = exception; } http://git-wip-us.apache.org/repos/asf/asterixdb/blob/05a5a376/asterixdb/asterix-app/src/main/java/org/apache/asterix/app/replication/message/StartupTaskResponseMessage.java ---------------------------------------------------------------------- diff --git a/asterixdb/asterix-app/src/main/java/org/apache/asterix/app/replication/message/StartupTaskResponseMessage.java b/asterixdb/asterix-app/src/main/java/org/apache/asterix/app/replication/message/StartupTaskResponseMessage.java index aaf3eb8..1611507 100644 --- a/asterixdb/asterix-app/src/main/java/org/apache/asterix/app/replication/message/StartupTaskResponseMessage.java +++ b/asterixdb/asterix-app/src/main/java/org/apache/asterix/app/replication/message/StartupTaskResponseMessage.java @@ -29,6 +29,7 @@ import org.apache.asterix.common.messaging.api.INcAddressedMessage; import org.apache.asterix.common.replication.INCLifecycleMessage; import org.apache.hyracks.api.exceptions.HyracksDataException; import org.apache.hyracks.api.service.IControllerService; +import org.apache.hyracks.control.nc.NCShutdownHook; public class StartupTaskResponseMessage implements INCLifecycleMessage, INcAddressedMessage { @@ -47,22 +48,28 @@ public class StartupTaskResponseMessage implements INCLifecycleMessage, INcAddre INCMessageBroker broker = (INCMessageBroker) appCtx.getServiceContext().getMessageBroker(); IControllerService cs = appCtx.getServiceContext().getControllerService(); boolean success = true; - HyracksDataException exception = null; try { - for (INCLifecycleTask task : tasks) { - task.perform(cs); + Throwable exception = null; + try { + for (INCLifecycleTask task : tasks) { + task.perform(cs); + } + } catch (Throwable e) { //NOSONAR all startup failures should be reported to CC + success = false; + exception = e; + } + NCLifecycleTaskReportMessage result = new NCLifecycleTaskReportMessage(nodeId, success); + result.setException(exception); + try { + broker.sendMessageToCC(result); + } catch (Exception e) { + LOGGER.log(Level.SEVERE, "Failed sending message to cc", e); + } + } finally { + if (!success) { + // stop NC so that it can be started again + Runtime.getRuntime().exit(NCShutdownHook.FAILED_TO_STARTUP_EXIT_CODE); //NOSONAR startup failed } - } catch (HyracksDataException e) { - success = false; - exception = e; - } - NCLifecycleTaskReportMessage result = new NCLifecycleTaskReportMessage(nodeId, success); - result.setException(exception); - try { - broker.sendMessageToCC(result); - } catch (Exception e) { - LOGGER.log(Level.SEVERE, "Failed sending message to cc", e); - throw HyracksDataException.create(e); } } http://git-wip-us.apache.org/repos/asf/asterixdb/blob/05a5a376/hyracks-fullstack/hyracks/hyracks-control/hyracks-control-nc/src/main/java/org/apache/hyracks/control/nc/NCShutdownHook.java ---------------------------------------------------------------------- diff --git a/hyracks-fullstack/hyracks/hyracks-control/hyracks-control-nc/src/main/java/org/apache/hyracks/control/nc/NCShutdownHook.java b/hyracks-fullstack/hyracks/hyracks-control/hyracks-control-nc/src/main/java/org/apache/hyracks/control/nc/NCShutdownHook.java index 4d0c159..162d912 100644 --- a/hyracks-fullstack/hyracks/hyracks-control/hyracks-control-nc/src/main/java/org/apache/hyracks/control/nc/NCShutdownHook.java +++ b/hyracks-fullstack/hyracks/hyracks-control/hyracks-control-nc/src/main/java/org/apache/hyracks/control/nc/NCShutdownHook.java @@ -27,6 +27,8 @@ import java.util.logging.Logger; * operation is hanging for any reason */ public class NCShutdownHook extends Thread { + + public static final int FAILED_TO_STARTUP_EXIT_CODE = 2; private static final Logger LOGGER = Logger.getLogger(NCShutdownHook.class.getName()); private static final long SHUTDOWN_WAIT_TIME = 10 * 60 * 1000L; private final Thread watchDog;
