| commit | f4e9d0ae7168483f7b2ef6128e8cc4c201096c10 | [log] [tgz] |
|---|---|---|
| author | Michael Blow <mblow@apache.org> | Mon Nov 20 10:29:47 2023 -0500 |
| committer | Michael Blow <mblow@apache.org> | Wed Nov 22 04:52:27 2023 +0000 |
| tree | d0146d56d6c3e7bed855a2d57b15d71b48e7bcb1 | |
| parent | 2c4f9cca5126969abfc61b8b6cac0177f81d22e1 [diff] |
[NO ISSUE][*DB] Unusable cluster state / unregistered node should return 503 Change-Id: I37ae8697681b9541bab673da6ceed395bc3b2702 Reviewed-on: https://asterix-gerrit.ics.uci.edu/c/asterixdb/+/17971 Integration-Tests: Jenkins <jenkins@fulliautomatix.ics.uci.edu> Reviewed-by: Michael Blow <mblow@apache.org> Reviewed-by: Hussain Towaileb <hussainht@gmail.com> Tested-by: Michael Blow <mblow@apache.org>
diff --git a/asterixdb/asterix-app/src/main/java/org/apache/asterix/api/http/server/QueryServiceServlet.java b/asterixdb/asterix-app/src/main/java/org/apache/asterix/api/http/server/QueryServiceServlet.java index 9f83aa8..1966a88 100644 --- a/asterixdb/asterix-app/src/main/java/org/apache/asterix/api/http/server/QueryServiceServlet.java +++ b/asterixdb/asterix-app/src/main/java/org/apache/asterix/api/http/server/QueryServiceServlet.java
@@ -438,6 +438,7 @@ LOGGER.warn(() -> "handleException: " + ex.getMessage() + ": " + LogRedactionUtil.userData(param.toString())); executionState.setStatus(ResultStatus.FATAL, HttpResponseStatus.SERVICE_UNAVAILABLE); + return true; default: // fall-through }
diff --git a/asterixdb/asterix-app/src/main/java/org/apache/asterix/app/active/ActiveEntityEventsListener.java b/asterixdb/asterix-app/src/main/java/org/apache/asterix/app/active/ActiveEntityEventsListener.java index 3fd339e..626b938 100644 --- a/asterixdb/asterix-app/src/main/java/org/apache/asterix/app/active/ActiveEntityEventsListener.java +++ b/asterixdb/asterix-app/src/main/java/org/apache/asterix/app/active/ActiveEntityEventsListener.java
@@ -691,7 +691,7 @@ @Override public synchronized void replace(Dataset dataset) { - if (getDatasets().contains(dataset)) { + if (getDatasets().remove(dataset)) { getDatasets().remove(dataset); getDatasets().add(dataset); }