>From Michael Blow <[email protected]>:
Michael Blow has uploaded this change for review. (
https://asterix-gerrit.ics.uci.edu/c/asterixdb/+/17565 )
Change subject: [ASTERIXDB-3186][HYR] Resolve NC address on CC for heartbeat
acks
......................................................................
[ASTERIXDB-3186][HYR] Resolve NC address on CC for heartbeat acks
- user model changes: no
- storage format changes: no
- interface changes: no
Details:
- Ensure that the nc address is resolved on the CC when
sending a negative heartbeat ack.
(cherry picked from commit d345cdcdee)
Change-Id: I4ed0f1dda6508ab502e1eb9a38d033da26de6465
---
M
hyracks-fullstack/hyracks/hyracks-control/hyracks-control-cc/src/main/java/org/apache/hyracks/control/cc/work/NodeHeartbeatWork.java
1 file changed, 25 insertions(+), 3 deletions(-)
git pull ssh://asterix-gerrit.ics.uci.edu:29418/asterixdb
refs/changes/65/17565/1
diff --git
a/hyracks-fullstack/hyracks/hyracks-control/hyracks-control-cc/src/main/java/org/apache/hyracks/control/cc/work/NodeHeartbeatWork.java
b/hyracks-fullstack/hyracks/hyracks-control/hyracks-control-cc/src/main/java/org/apache/hyracks/control/cc/work/NodeHeartbeatWork.java
index 6fa6224..481c2e0 100644
---
a/hyracks-fullstack/hyracks/hyracks-control/hyracks-control-cc/src/main/java/org/apache/hyracks/control/cc/work/NodeHeartbeatWork.java
+++
b/hyracks-fullstack/hyracks/hyracks-control/hyracks-control-cc/src/main/java/org/apache/hyracks/control/cc/work/NodeHeartbeatWork.java
@@ -27,6 +27,7 @@
import org.apache.hyracks.control.cc.cluster.INodeManager;
import org.apache.hyracks.control.common.heartbeat.HeartbeatData;
import org.apache.hyracks.control.common.ipc.NodeControllerRemoteProxy;
+import org.apache.hyracks.util.NetworkUtil;
import org.apache.logging.log4j.Level;
import org.apache.logging.log4j.LogManager;
import org.apache.logging.log4j.Logger;
@@ -50,10 +51,11 @@
ncState.getNodeController().heartbeatAck(ccs.getCcId(), null);
} else {
// unregistered nc- let him know
+ InetSocketAddress refreshedNcAddress =
NetworkUtil.refresh(ncAddress);
LOGGER.info("received a heartbeat from unregistered node {};
sending negative ack to node address {}",
- nodeId, ncAddress);
- NodeControllerRemoteProxy nc =
- new NodeControllerRemoteProxy(ccs.getCcId(),
ccs.getClusterIPC().getReconnectingHandle(ncAddress));
+ nodeId, refreshedNcAddress);
+ NodeControllerRemoteProxy nc = new
NodeControllerRemoteProxy(ccs.getCcId(),
+
ccs.getClusterIPC().getReconnectingHandle(refreshedNcAddress));
nc.heartbeatAck(ccs.getCcId(),
HyracksDataException.create(ErrorCode.NO_SUCH_NODE, nodeId));
}
}
--
To view, visit https://asterix-gerrit.ics.uci.edu/c/asterixdb/+/17565
To unsubscribe, or for help writing mail filters, visit
https://asterix-gerrit.ics.uci.edu/settings
Gerrit-Project: asterixdb
Gerrit-Branch: stabilization-b057463c08
Gerrit-Change-Id: I4ed0f1dda6508ab502e1eb9a38d033da26de6465
Gerrit-Change-Number: 17565
Gerrit-PatchSet: 1
Gerrit-Owner: Michael Blow <[email protected]>
Gerrit-CC: Murtadha Al Hubail <[email protected]>
Gerrit-MessageType: newchange
