>From Michael Blow <[email protected]>: Michael Blow has submitted this change. ( https://asterix-gerrit.ics.uci.edu/c/asterixdb/+/17971 )
Change subject: [NO ISSUE][*DB] Unusable cluster state / unregistered node should return 503 ...................................................................... [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]> --- M asterixdb/asterix-app/src/main/java/org/apache/asterix/app/active/ActiveEntityEventsListener.java M asterixdb/asterix-app/src/main/java/org/apache/asterix/api/http/server/QueryServiceServlet.java 2 files changed, 16 insertions(+), 1 deletion(-) Approvals: Michael Blow: Looks good to me, but someone else must approve; Verified Hussain Towaileb: Looks good to me, approved Jenkins: Verified 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); } -- To view, visit https://asterix-gerrit.ics.uci.edu/c/asterixdb/+/17971 To unsubscribe, or for help writing mail filters, visit https://asterix-gerrit.ics.uci.edu/settings Gerrit-Project: asterixdb Gerrit-Branch: neo Gerrit-Change-Id: I37ae8697681b9541bab673da6ceed395bc3b2702 Gerrit-Change-Number: 17971 Gerrit-PatchSet: 2 Gerrit-Owner: Michael Blow <[email protected]> Gerrit-Reviewer: Anon. E. Moose #1000171 Gerrit-Reviewer: Hussain Towaileb <[email protected]> Gerrit-Reviewer: Jenkins <[email protected]> Gerrit-Reviewer: Michael Blow <[email protected]> Gerrit-Reviewer: Murtadha Hubail Gerrit-MessageType: merged
