>From Michael Blow <[email protected]>:
Michael Blow has uploaded this change for review. (
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
---
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, 11 insertions(+), 1 deletion(-)
git pull ssh://asterix-gerrit.ics.uci.edu:29418/asterixdb
refs/changes/71/17971/1
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: 1
Gerrit-Owner: Michael Blow <[email protected]>
Gerrit-MessageType: newchange
