Added ability to get the network address of an NC at a client
git-svn-id: https://hyracks.googlecode.com/svn/branches/hyracks_dev_next@1229 123451ca-8445-de46-9d55-352943316053
diff --git a/hyracks-api/src/main/java/edu/uci/ics/hyracks/api/client/NodeControllerInfo.java b/hyracks-api/src/main/java/edu/uci/ics/hyracks/api/client/NodeControllerInfo.java
index 703f74b..fd9218a 100644
--- a/hyracks-api/src/main/java/edu/uci/ics/hyracks/api/client/NodeControllerInfo.java
+++ b/hyracks-api/src/main/java/edu/uci/ics/hyracks/api/client/NodeControllerInfo.java
@@ -16,6 +16,8 @@
import java.io.Serializable;
+import edu.uci.ics.hyracks.api.comm.NetworkAddress;
+
public class NodeControllerInfo implements Serializable {
private static final long serialVersionUID = 1L;
@@ -23,9 +25,12 @@
private final NodeStatus status;
- public NodeControllerInfo(String nodeId, NodeStatus status) {
+ private final NetworkAddress netAddress;
+
+ public NodeControllerInfo(String nodeId, NodeStatus status, NetworkAddress netAddress) {
this.nodeId = nodeId;
this.status = status;
+ this.netAddress = netAddress;
}
public String getNodeId() {
@@ -35,4 +40,8 @@
public NodeStatus getStatus() {
return status;
}
+
+ public NetworkAddress getNetworkAddress() {
+ return netAddress;
+ }
}
\ No newline at end of file
diff --git a/hyracks-control-cc/src/main/java/edu/uci/ics/hyracks/control/cc/work/GetNodeControllersInfoWork.java b/hyracks-control-cc/src/main/java/edu/uci/ics/hyracks/control/cc/work/GetNodeControllersInfoWork.java
index 9e8d130..2f23a2c 100644
--- a/hyracks-control-cc/src/main/java/edu/uci/ics/hyracks/control/cc/work/GetNodeControllersInfoWork.java
+++ b/hyracks-control-cc/src/main/java/edu/uci/ics/hyracks/control/cc/work/GetNodeControllersInfoWork.java
@@ -39,7 +39,7 @@
Map<String, NodeControllerInfo> result = new LinkedHashMap<String, NodeControllerInfo>();
Map<String, NodeControllerState> nodeMap = ccs.getNodeMap();
for (Map.Entry<String, NodeControllerState> e : nodeMap.entrySet()) {
- result.put(e.getKey(), new NodeControllerInfo(e.getKey(), NodeStatus.ALIVE));
+ result.put(e.getKey(), new NodeControllerInfo(e.getKey(), NodeStatus.ALIVE, e.getValue().getDataPort()));
}
callback.setValue(result);
}