>From Michael Blow <[email protected]>:
Attention is currently required from: Ali Alsuliman.
Hello Ali Alsuliman, Jenkins,
I'd like you to do a code review.
Please visit
https://asterix-gerrit.ics.uci.edu/c/asterixdb/+/20389?usp=email
to review the following change.
Change subject: Revert "[NO ISSUE][HTTP][MISC] +=
ClusterStateManager.isPendingRemoval, HTTP stop bind at shutdown"
......................................................................
Revert "[NO ISSUE][HTTP][MISC] += ClusterStateManager.isPendingRemoval, HTTP
stop bind at shutdown"
This reverts commit de6041e1742f404aefd83dd622e796f0f8edaa7f.
Reason for revert: toy build
Change-Id: I90dd09438b8ddeb9c2fbffb82353d367d8dd6dab
---
M
asterixdb/asterix-app/src/main/java/org/apache/asterix/hyracks/bootstrap/CCApplication.java
M
asterixdb/asterix-app/src/main/java/org/apache/asterix/hyracks/bootstrap/NCApplication.java
M
asterixdb/asterix-common/src/main/java/org/apache/asterix/common/cluster/IClusterStateManager.java
M
asterixdb/asterix-runtime/src/main/java/org/apache/asterix/runtime/utils/ClusterStateManager.java
M
hyracks-fullstack/hyracks/hyracks-http/src/main/java/org/apache/hyracks/http/server/HttpServer.java
M
hyracks-fullstack/hyracks/hyracks-http/src/main/java/org/apache/hyracks/http/server/WebManager.java
6 files changed, 3 insertions(+), 38 deletions(-)
git pull ssh://asterix-gerrit.ics.uci.edu:29418/asterixdb
refs/changes/89/20389/1
diff --git
a/asterixdb/asterix-app/src/main/java/org/apache/asterix/hyracks/bootstrap/CCApplication.java
b/asterixdb/asterix-app/src/main/java/org/apache/asterix/hyracks/bootstrap/CCApplication.java
index 4e35ade..6928b64 100644
---
a/asterixdb/asterix-app/src/main/java/org/apache/asterix/hyracks/bootstrap/CCApplication.java
+++
b/asterixdb/asterix-app/src/main/java/org/apache/asterix/hyracks/bootstrap/CCApplication.java
@@ -300,7 +300,6 @@
public void stop() throws Exception {
LOGGER.info("Stopping Asterix cluster controller");
super.stop();
- webManager.closeChannels(); // stop accepting new requests
appCtx.getClusterStateManager().setState(SHUTTING_DOWN);
((ActiveNotificationHandler)
appCtx.getActiveNotificationHandler()).stop();
AsterixStateProxy.unregisterRemoteObject();
diff --git
a/asterixdb/asterix-app/src/main/java/org/apache/asterix/hyracks/bootstrap/NCApplication.java
b/asterixdb/asterix-app/src/main/java/org/apache/asterix/hyracks/bootstrap/NCApplication.java
index 0e6a04b..0da4e0d 100644
---
a/asterixdb/asterix-app/src/main/java/org/apache/asterix/hyracks/bootstrap/NCApplication.java
+++
b/asterixdb/asterix-app/src/main/java/org/apache/asterix/hyracks/bootstrap/NCApplication.java
@@ -299,7 +299,6 @@
@Override
public void preStop() throws Exception {
- webManager.closeChannels();
runtimeContext.preStop();
}
diff --git
a/asterixdb/asterix-common/src/main/java/org/apache/asterix/common/cluster/IClusterStateManager.java
b/asterixdb/asterix-common/src/main/java/org/apache/asterix/common/cluster/IClusterStateManager.java
index 6c0982a..a5d503b 100644
---
a/asterixdb/asterix-common/src/main/java/org/apache/asterix/common/cluster/IClusterStateManager.java
+++
b/asterixdb/asterix-common/src/main/java/org/apache/asterix/common/cluster/IClusterStateManager.java
@@ -248,10 +248,6 @@
Map<String, Map<IOption, Object>> getActiveNcConfiguration();
- Set<String> getNodesPendingRemoval();
-
- boolean isPendingRemoval(String nodeId);
-
/**
* Sets the cluster partition in which metadata datasets stored
*
diff --git
a/asterixdb/asterix-runtime/src/main/java/org/apache/asterix/runtime/utils/ClusterStateManager.java
b/asterixdb/asterix-runtime/src/main/java/org/apache/asterix/runtime/utils/ClusterStateManager.java
index 668decf..444d91b 100644
---
a/asterixdb/asterix-runtime/src/main/java/org/apache/asterix/runtime/utils/ClusterStateManager.java
+++
b/asterixdb/asterix-runtime/src/main/java/org/apache/asterix/runtime/utils/ClusterStateManager.java
@@ -474,17 +474,11 @@
return ncConfigMap;
}
- @Override
public synchronized Set<String> getNodesPendingRemoval() {
return new HashSet<>(pendingRemoval);
}
@Override
- public synchronized boolean isPendingRemoval(String nodeId) {
- return pendingRemoval.contains(nodeId);
- }
-
- @Override
public synchronized void setMetadataPartitionId(ClusterPartition
partition) {
metadataPartition = partition;
}
diff --git
a/hyracks-fullstack/hyracks/hyracks-http/src/main/java/org/apache/hyracks/http/server/HttpServer.java
b/hyracks-fullstack/hyracks/hyracks-http/src/main/java/org/apache/hyracks/http/server/HttpServer.java
index 1198945..271de53 100644
---
a/hyracks-fullstack/hyracks/hyracks-http/src/main/java/org/apache/hyracks/http/server/HttpServer.java
+++
b/hyracks-fullstack/hyracks/hyracks-http/src/main/java/org/apache/hyracks/http/server/HttpServer.java
@@ -433,12 +433,12 @@
return addresses.iterator().next();
}
- void closeChannels() throws InterruptedException {
+ private void closeChannels() throws InterruptedException {
synchronized (lock) {
for (Channel channel : channels) {
channel.closeFuture().removeListener(channelCloseListener);
- channel.close().sync();
- LOGGER.info("channel {} closed", channel);
+ channel.close();
+ channel.closeFuture().sync();
}
channels.clear();
}
diff --git
a/hyracks-fullstack/hyracks/hyracks-http/src/main/java/org/apache/hyracks/http/server/WebManager.java
b/hyracks-fullstack/hyracks/hyracks-http/src/main/java/org/apache/hyracks/http/server/WebManager.java
index 9a0aa75..3b17c06 100644
---
a/hyracks-fullstack/hyracks/hyracks-http/src/main/java/org/apache/hyracks/http/server/WebManager.java
+++
b/hyracks-fullstack/hyracks/hyracks-http/src/main/java/org/apache/hyracks/http/server/WebManager.java
@@ -113,27 +113,4 @@
public void add(HttpServer server) {
servers.add(server);
}
-
- /**
- * Closes all channels associated with the servers in this WebManager.
- * This prevents any additional connections from being established.
- */
- public void closeChannels() throws Exception {
- List<Exception> closeExceptions = Collections.synchronizedList(new
ArrayList<>());
- servers.parallelStream().forEach(server -> {
- try {
- server.closeChannels();
- } catch (Exception e) {
- closeExceptions.add(e);
- }
- });
- if (!closeExceptions.isEmpty()) {
- Exception ex = null;
- for (Exception closeException : closeExceptions) {
- ex = ExceptionUtils.suppress(ex, closeException);
- }
- throw ex;
- }
-
- }
}
--
To view, visit https://asterix-gerrit.ics.uci.edu/c/asterixdb/+/20389?usp=email
To unsubscribe, or for help writing mail filters, visit
https://asterix-gerrit.ics.uci.edu/settings?usp=email
Gerrit-MessageType: newchange
Gerrit-Project: asterixdb
Gerrit-Branch: ionic
Gerrit-Change-Id: I90dd09438b8ddeb9c2fbffb82353d367d8dd6dab
Gerrit-Change-Number: 20389
Gerrit-PatchSet: 1
Gerrit-Owner: Michael Blow <[email protected]>
Gerrit-Reviewer: Ali Alsuliman <[email protected]>
Gerrit-Reviewer: Jenkins <[email protected]>
Gerrit-CC: Anon. E. Moose #1000171
Gerrit-Attention: Ali Alsuliman <[email protected]>
