Yingyi Bu has uploaded a new change for review.
https://asterix-gerrit.ics.uci.edu/1415
Change subject: Remove numCores from NC heartbeats since it is unchanged
overtime.
......................................................................
Remove numCores from NC heartbeats since it is unchanged overtime.
- The information has already been in NodeControllerState when a node
is registered.
Change-Id: I0926be6a7d51257bff89eef31b57e78e4c3bb674
---
M
asterixdb/asterix-app/src/main/java/org/apache/asterix/api/common/APIFramework.java
M
asterixdb/asterix-app/src/test/java/org/apache/asterix/api/common/APIFrameworkTest.java
M
hyracks-fullstack/hyracks/hyracks-api/src/main/java/org/apache/hyracks/api/client/NodeControllerInfo.java
M
hyracks-fullstack/hyracks/hyracks-control/hyracks-control-cc/src/main/java/org/apache/hyracks/control/cc/NodeControllerState.java
M
hyracks-fullstack/hyracks/hyracks-control/hyracks-control-cc/src/main/java/org/apache/hyracks/control/cc/work/GetNodeControllersInfoWork.java
M
hyracks-fullstack/hyracks/hyracks-control/hyracks-control-common/src/main/java/org/apache/hyracks/control/common/heartbeat/HeartbeatData.java
M
hyracks-fullstack/hyracks/hyracks-control/hyracks-control-nc/src/main/java/org/apache/hyracks/control/nc/NodeControllerService.java
7 files changed, 11 insertions(+), 19 deletions(-)
git pull ssh://asterix-gerrit.ics.uci.edu:29418/asterixdb
refs/changes/15/1415/1
diff --git
a/asterixdb/asterix-app/src/main/java/org/apache/asterix/api/common/APIFramework.java
b/asterixdb/asterix-app/src/main/java/org/apache/asterix/api/common/APIFramework.java
index f9794e4..9e584fd 100644
---
a/asterixdb/asterix-app/src/main/java/org/apache/asterix/api/common/APIFramework.java
+++
b/asterixdb/asterix-app/src/main/java/org/apache/asterix/api/common/APIFramework.java
@@ -389,7 +389,7 @@
List<String> locations = new ArrayList<>();
for (Map.Entry<String, NodeControllerInfo> entry :
ncMap.entrySet()) {
String nodeId = entry.getKey();
- int numCores = entry.getValue().getNumCores();
+ int numCores = entry.getValue().getNumProcessors();
int availableCores = numCores > 1 ? numCores - 1 : numCores;
// Reserves one core for heartbeat.
int nodeParallelism =
selectedNodesWithOneMorePartition.contains(nodeId) ? perNodeParallelismMax
: perNodeParallelismMin;
diff --git
a/asterixdb/asterix-app/src/test/java/org/apache/asterix/api/common/APIFrameworkTest.java
b/asterixdb/asterix-app/src/test/java/org/apache/asterix/api/common/APIFrameworkTest.java
index 6256857..9c314ed 100644
---
a/asterixdb/asterix-app/src/test/java/org/apache/asterix/api/common/APIFrameworkTest.java
+++
b/asterixdb/asterix-app/src/test/java/org/apache/asterix/api/common/APIFrameworkTest.java
@@ -47,9 +47,9 @@
// Constructs mocked cluster nodes.
Map<String, NodeControllerInfo> map = new HashMap<>();
NodeControllerInfo nc1Info = mock(NodeControllerInfo.class);
- when(nc1Info.getNumCores()).thenReturn(4);
+ when(nc1Info.getNumProcessors()).thenReturn(4);
NodeControllerInfo nc2Info = mock(NodeControllerInfo.class);
- when(nc2Info.getNumCores()).thenReturn(4);
+ when(nc2Info.getNumProcessors()).thenReturn(4);
String nc1 = "nc1";
String nc2 = "nc2";
map.put(nc1, nc1Info);
diff --git
a/hyracks-fullstack/hyracks/hyracks-api/src/main/java/org/apache/hyracks/api/client/NodeControllerInfo.java
b/hyracks-fullstack/hyracks/hyracks-api/src/main/java/org/apache/hyracks/api/client/NodeControllerInfo.java
index c90644f..57d11d5 100644
---
a/hyracks-fullstack/hyracks/hyracks-api/src/main/java/org/apache/hyracks/api/client/NodeControllerInfo.java
+++
b/hyracks-fullstack/hyracks/hyracks-api/src/main/java/org/apache/hyracks/api/client/NodeControllerInfo.java
@@ -35,16 +35,16 @@
private final NetworkAddress messagingNetworkAddress;
- private final int numCores;
+ private final int numProcessors;
public NodeControllerInfo(String nodeId, NodeStatus status, NetworkAddress
netAddress,
- NetworkAddress datasetNetworkAddress, NetworkAddress
messagingNetworkAddress, int numCores) {
+ NetworkAddress datasetNetworkAddress, NetworkAddress
messagingNetworkAddress, int numProcessors) {
this.nodeId = nodeId;
this.status = status;
this.netAddress = netAddress;
this.datasetNetworkAddress = datasetNetworkAddress;
this.messagingNetworkAddress = messagingNetworkAddress;
- this.numCores = numCores;
+ this.numProcessors = numProcessors;
}
public String getNodeId() {
@@ -67,7 +67,7 @@
return messagingNetworkAddress;
}
- public int getNumCores() {
- return numCores;
+ public int getNumProcessors() {
+ return numProcessors;
}
}
diff --git
a/hyracks-fullstack/hyracks/hyracks-control/hyracks-control-cc/src/main/java/org/apache/hyracks/control/cc/NodeControllerState.java
b/hyracks-fullstack/hyracks/hyracks-control/hyracks-control-cc/src/main/java/org/apache/hyracks/control/cc/NodeControllerState.java
index ca980b9..7cfdbfd 100644
---
a/hyracks-fullstack/hyracks/hyracks-control/hyracks-control-cc/src/main/java/org/apache/hyracks/control/cc/NodeControllerState.java
+++
b/hyracks-fullstack/hyracks/hyracks-control/hyracks-control-cc/src/main/java/org/apache/hyracks/control/cc/NodeControllerState.java
@@ -141,8 +141,6 @@
private int lastHeartbeatDuration;
- private int numCores;
-
public NodeControllerState(INodeController nodeController,
NodeRegistration reg) {
this.nodeController = nodeController;
ncConfig = reg.getNCConfig();
@@ -204,7 +202,6 @@
diskWrites = new long[RRD_SIZE];
rrdPtr = 0;
- numCores = 0;
}
public synchronized void notifyHeartbeat(HeartbeatData hbData) {
@@ -242,7 +239,6 @@
diskReads[rrdPtr] = hbData.diskReads;
diskWrites[rrdPtr] = hbData.diskWrites;
rrdPtr = (rrdPtr + 1) % RRD_SIZE;
- numCores = hbData.numCores;
}
}
@@ -278,8 +274,8 @@
return messagingPort;
}
- public int getNumCores() {
- return numCores;
+ public int getNumProcessors() {
+ return nProcessors;
}
public synchronized JSONObject toSummaryJSON() throws JSONException {
diff --git
a/hyracks-fullstack/hyracks/hyracks-control/hyracks-control-cc/src/main/java/org/apache/hyracks/control/cc/work/GetNodeControllersInfoWork.java
b/hyracks-fullstack/hyracks/hyracks-control/hyracks-control-cc/src/main/java/org/apache/hyracks/control/cc/work/GetNodeControllersInfoWork.java
index a0150f2..401f6ce 100644
---
a/hyracks-fullstack/hyracks/hyracks-control/hyracks-control-cc/src/main/java/org/apache/hyracks/control/cc/work/GetNodeControllersInfoWork.java
+++
b/hyracks-fullstack/hyracks/hyracks-control/hyracks-control-cc/src/main/java/org/apache/hyracks/control/cc/work/GetNodeControllersInfoWork.java
@@ -45,7 +45,7 @@
for (Map.Entry<String, NodeControllerState> e : nodeMap.entrySet()) {
NodeControllerState ncState = e.getValue();
result.put(e.getKey(), new NodeControllerInfo(e.getKey(),
NodeStatus.ALIVE, ncState.getDataPort(),
- ncState.getDatasetPort(), ncState.getMessagingPort(),
ncState.getNumCores()));
+ ncState.getDatasetPort(), ncState.getMessagingPort(),
ncState.getNumProcessors()));
}
callback.setValue(result);
}
diff --git
a/hyracks-fullstack/hyracks/hyracks-control/hyracks-control-common/src/main/java/org/apache/hyracks/control/common/heartbeat/HeartbeatData.java
b/hyracks-fullstack/hyracks/hyracks-control/hyracks-control-common/src/main/java/org/apache/hyracks/control/common/heartbeat/HeartbeatData.java
index 1dbb5b6..cfb9a86 100644
---
a/hyracks-fullstack/hyracks/hyracks-control/hyracks-control-common/src/main/java/org/apache/hyracks/control/common/heartbeat/HeartbeatData.java
+++
b/hyracks-fullstack/hyracks/hyracks-control/hyracks-control-common/src/main/java/org/apache/hyracks/control/common/heartbeat/HeartbeatData.java
@@ -52,7 +52,6 @@
public long ipcMessageBytesReceived;
public long diskReads;
public long diskWrites;
- public int numCores;
public void readFields(DataInput dis) throws IOException {
heapInitSize = dis.readLong();
@@ -81,7 +80,6 @@
ipcMessageBytesReceived = dis.readLong();
diskReads = dis.readLong();
diskWrites = dis.readLong();
- numCores = dis.readInt();
int gcCounts = dis.readInt();
gcCollectionCounts = new long[gcCounts];
@@ -122,7 +120,6 @@
dos.writeLong(ipcMessageBytesReceived);
dos.writeLong(diskReads);
dos.writeLong(diskWrites);
- dos.writeInt(numCores);
dos.writeInt(gcCollectionCounts.length);
for (int i = 0; i < gcCollectionCounts.length; i++) {
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 d44a4e5..bdb13e4 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
@@ -455,7 +455,6 @@
hbData.diskReads = ioCounter.getReads();
hbData.diskWrites = ioCounter.getWrites();
- hbData.numCores = Runtime.getRuntime().availableProcessors();
try {
cc.nodeHeartbeat(id, hbData);
--
To view, visit https://asterix-gerrit.ics.uci.edu/1415
To unsubscribe, visit https://asterix-gerrit.ics.uci.edu/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I0926be6a7d51257bff89eef31b57e78e4c3bb674
Gerrit-PatchSet: 1
Gerrit-Project: asterixdb
Gerrit-Branch: master
Gerrit-Owner: Yingyi Bu <[email protected]>
