asterixdb-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From mb...@apache.org
Subject asterixdb git commit: [NO ISSUE][HYR] Prevent duplicate heartbeat threads on restored IPC connection
Date Wed, 11 Oct 2017 17:19:22 GMT
Repository: asterixdb
Updated Branches:
  refs/heads/master 1dc8228b7 -> 086cb05bb


[NO ISSUE][HYR] Prevent duplicate heartbeat threads on restored IPC connection

Regression in 860fcde

Change-Id: I13833f5c3afc5e17591e112ce0e127a19d7385c9
Reviewed-on: https://asterix-gerrit.ics.uci.edu/2067
Reviewed-by: Michael Blow <mblow@apache.org>
Tested-by: Michael Blow <mblow@apache.org>


Project: http://git-wip-us.apache.org/repos/asf/asterixdb/repo
Commit: http://git-wip-us.apache.org/repos/asf/asterixdb/commit/086cb05b
Tree: http://git-wip-us.apache.org/repos/asf/asterixdb/tree/086cb05b
Diff: http://git-wip-us.apache.org/repos/asf/asterixdb/diff/086cb05b

Branch: refs/heads/master
Commit: 086cb05bbdf38abade6c570e74a8df314b080b1f
Parents: 1dc8228
Author: Michael Blow <michael.blow@couchbase.com>
Authored: Wed Oct 11 12:28:17 2017 -0400
Committer: Michael Blow <mblow@apache.org>
Committed: Wed Oct 11 10:18:27 2017 -0700

----------------------------------------------------------------------
 .../hyracks/control/nc/NodeControllerService.java       | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/asterixdb/blob/086cb05b/hyracks-fullstack/hyracks/hyracks-control/hyracks-control-nc/src/main/java/org/apache/hyracks/control/nc/NodeControllerService.java
----------------------------------------------------------------------
diff --git a/hyracks-fullstack/hyracks/hyracks-control/hyracks-control-nc/src/main/java/org/apache/hyracks/control/nc/NodeControllerService.java
b/hyracks-fullstack/hyracks/hyracks-control/hyracks-control-nc/src/main/java/org/apache/hyracks/control/nc/NodeControllerService.java
index 69137e5..4a2c2e9 100644
--- a/hyracks-fullstack/hyracks/hyracks-control/hyracks-control-nc/src/main/java/org/apache/hyracks/control/nc/NodeControllerService.java
+++ b/hyracks-fullstack/hyracks/hyracks-control/hyracks-control-nc/src/main/java/org/apache/hyracks/control/nc/NodeControllerService.java
@@ -317,6 +317,12 @@ public class NodeControllerService implements IControllerService {
             timer.schedule(new ProfileDumpTask(ccs), 0, nodeParameters.getProfileDumpPeriod());
         }
 
+        // Start heartbeat generator.
+        heartbeatThread = new Thread(new HeartbeatTask(ccs, nodeParameters.getHeartbeatPeriod()),
id + "-Heartbeat");
+        heartbeatThread.setPriority(Thread.MAX_PRIORITY);
+        heartbeatThread.setDaemon(true);
+        heartbeatThread.start();
+
         LOGGER.log(Level.INFO, "Started NodeControllerService");
         application.startupCompleted();
     }
@@ -354,12 +360,6 @@ public class NodeControllerService implements IControllerService {
                     registrationException);
             throw registrationException;
         }
-        // Start heartbeat generator.
-        heartbeatThread = new Thread(new HeartbeatTask(ccs, nodeParameters.getHeartbeatPeriod()),
id + "-Heartbeat");
-        heartbeatThread.setPriority(Thread.MAX_PRIORITY);
-        heartbeatThread.setDaemon(true);
-        heartbeatThread.start();
-
         serviceCtx.setDistributedState(nodeParameters.getDistributedState());
         application.onRegisterNode();
         LOGGER.info("Registering with Cluster Controller complete");


Mime
View raw message