Change in asterixdb[master]: [NO ISSUE][HYR] Prevent duplicate heartbeat threads on resto...

[Michael Blow (Code Review)]

Michael Blow has uploaded a new change for review.

  https://asterix-gerrit.ics.uci.edu/2067

Change subject: [NO ISSUE][HYR] Prevent duplicate heartbeat threads on restored 
IPC connection
......................................................................

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

Regression in 860fcde

Change-Id: I13833f5c3afc5e17591e112ce0e127a19d7385c9
---
M 
hyracks-fullstack/hyracks/hyracks-control/hyracks-control-nc/src/main/java/org/apache/hyracks/control/nc/NodeControllerService.java
1 file changed, 6 insertions(+), 6 deletions(-)


  git pull ssh://asterix-gerrit.ics.uci.edu:29418/asterixdb 
refs/changes/67/2067/1

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..534e195 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 @@
             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 @@
                     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");

-- 
To view, visit https://asterix-gerrit.ics.uci.edu/2067
To unsubscribe, visit https://asterix-gerrit.ics.uci.edu/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I13833f5c3afc5e17591e112ce0e127a19d7385c9
Gerrit-PatchSet: 1
Gerrit-Project: asterixdb
Gerrit-Branch: master
Gerrit-Owner: Michael Blow <mb...@apache.org>