>From Michael Blow <[email protected]>:
Michael Blow has uploaded this change for review. (
https://asterix-gerrit.ics.uci.edu/c/asterixdb/+/19026 )
Change subject: [NO ISSUE] Misc fixes
......................................................................
[NO ISSUE] Misc fixes
- Synchronize ActiveNotificationHandler.handle(), as it accesses members
which require synchronization to be safe
- Avoid spinning on interrupt in SingleThreadEventProcessor
Ext-ref: MB-63390
Change-Id: I89efb0662885dc8013eaf44ecb43e866186964ae
---
M
asterixdb/asterix-app/src/main/java/org/apache/asterix/app/active/ActiveNotificationHandler.java
M
hyracks-fullstack/hyracks/hyracks-api/src/main/java/org/apache/hyracks/api/util/SingleThreadEventProcessor.java
2 files changed, 16 insertions(+), 2 deletions(-)
git pull ssh://asterix-gerrit.ics.uci.edu:29418/asterixdb
refs/changes/26/19026/1
diff --git
a/asterixdb/asterix-app/src/main/java/org/apache/asterix/app/active/ActiveNotificationHandler.java
b/asterixdb/asterix-app/src/main/java/org/apache/asterix/app/active/ActiveNotificationHandler.java
index 0f2780f..a6131f1 100644
---
a/asterixdb/asterix-app/src/main/java/org/apache/asterix/app/active/ActiveNotificationHandler.java
+++
b/asterixdb/asterix-app/src/main/java/org/apache/asterix/app/active/ActiveNotificationHandler.java
@@ -67,7 +67,7 @@
// *** SingleThreadEventProcessor<ActiveEvent>
@Override
- protected void handle(ActiveEvent event) {
+ protected synchronized void handle(ActiveEvent event) {
JobId jobId = event.getJobId();
Kind eventKind = event.getEventKind();
EntityId entityId = jobId2EntityId.get(jobId);
diff --git
a/hyracks-fullstack/hyracks/hyracks-api/src/main/java/org/apache/hyracks/api/util/SingleThreadEventProcessor.java
b/hyracks-fullstack/hyracks/hyracks-api/src/main/java/org/apache/hyracks/api/util/SingleThreadEventProcessor.java
index 85019c5..ba1478e 100644
---
a/hyracks-fullstack/hyracks/hyracks-api/src/main/java/org/apache/hyracks/api/util/SingleThreadEventProcessor.java
+++
b/hyracks-fullstack/hyracks/hyracks-api/src/main/java/org/apache/hyracks/api/util/SingleThreadEventProcessor.java
@@ -49,7 +49,7 @@
T event = eventInbox.take();
handle(event);
} catch (InterruptedException e) {
- Thread.currentThread().interrupt();
+ LOGGER.warn("Ignoring interrupt while waiting for an event");
} catch (Exception e) {
LOGGER.log(Level.ERROR, "Error handling an event", e);
}
--
To view, visit https://asterix-gerrit.ics.uci.edu/c/asterixdb/+/19026
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: I89efb0662885dc8013eaf44ecb43e866186964ae
Gerrit-Change-Number: 19026
Gerrit-PatchSet: 1
Gerrit-Owner: Michael Blow <[email protected]>
Gerrit-MessageType: newchange
