This is an automated email from the ASF dual-hosted git repository. mblow pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/asterixdb.git
commit f4e9d0ae7168483f7b2ef6128e8cc4c201096c10 Author: Michael Blow <[email protected]> AuthorDate: Mon Nov 20 10:29:47 2023 -0500 [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 <[email protected]> Reviewed-by: Michael Blow <[email protected]> Reviewed-by: Hussain Towaileb <[email protected]> Tested-by: Michael Blow <[email protected]> --- .../java/org/apache/asterix/api/http/server/QueryServiceServlet.java | 1 + .../java/org/apache/asterix/app/active/ActiveEntityEventsListener.java | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) 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 9f83aa81a3..1966a88ba6 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 @@ public class QueryServiceServlet extends AbstractQueryApiServlet { 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 3fd339e8df..626b93828e 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 @@ public abstract class ActiveEntityEventsListener implements IActiveEntityControl @Override public synchronized void replace(Dataset dataset) { - if (getDatasets().contains(dataset)) { + if (getDatasets().remove(dataset)) { getDatasets().remove(dataset); getDatasets().add(dataset); }
