abdullah alamoudi has submitted this change and it was merged. Change subject: [NOISSUE][ING] Leave permanently failed actives during recovery ......................................................................
[NOISSUE][ING] Leave permanently failed actives during recovery Change-Id: I4cbeae666b1e5d5a9b29a33bac141d60244283ab Reviewed-on: https://asterix-gerrit.ics.uci.edu/2570 Sonar-Qube: Jenkins <[email protected]> Tested-by: Jenkins <[email protected]> Contrib: Jenkins <[email protected]> Integration-Tests: Jenkins <[email protected]> Reviewed-by: Murtadha Hubail <[email protected]> --- M asterixdb/asterix-app/src/main/java/org/apache/asterix/app/active/ActiveNotificationHandler.java 1 file changed, 1 insertion(+), 10 deletions(-) Approvals: Anon. E. Moose #1000171: Jenkins: Verified; No violations found; ; Verified Murtadha Hubail: Looks good to me, approved 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 e8bcb10..053e6cd 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 @@ -25,7 +25,6 @@ import org.apache.asterix.active.ActiveEvent; import org.apache.asterix.active.ActiveEvent.Kind; -import org.apache.asterix.active.ActivityState; import org.apache.asterix.active.EntityId; import org.apache.asterix.active.IActiveEntityEventsListener; import org.apache.asterix.active.IActiveNotificationHandler; @@ -33,7 +32,6 @@ import org.apache.asterix.common.api.IMetadataLockManager; import org.apache.asterix.common.exceptions.ErrorCode; import org.apache.asterix.common.exceptions.RuntimeDataException; -import org.apache.asterix.metadata.api.IActiveEntityController; import org.apache.asterix.metadata.declared.MetadataProvider; import org.apache.asterix.metadata.entities.Dataset; import org.apache.asterix.metadata.utils.DatasetUtil; @@ -214,14 +212,7 @@ for (IActiveEntityEventsListener listener : entityEventListeners.values()) { synchronized (listener) { LOGGER.log(level, "Entity " + listener.getEntityId() + " is " + listener.getStats()); - if (listener.getState() == ActivityState.PERMANENTLY_FAILED - && listener instanceof IActiveEntityController) { - LOGGER.log(level, "Recovering"); - ((IActiveEntityController) listener).recover(); - } else { - LOGGER.log(level, "Only notifying"); - listener.notifyAll(); - } + listener.notifyAll(); } } } -- To view, visit https://asterix-gerrit.ics.uci.edu/2570 To unsubscribe, visit https://asterix-gerrit.ics.uci.edu/settings Gerrit-MessageType: merged Gerrit-Change-Id: I4cbeae666b1e5d5a9b29a33bac141d60244283ab Gerrit-PatchSet: 2 Gerrit-Project: asterixdb Gerrit-Branch: master Gerrit-Owner: abdullah alamoudi <[email protected]> Gerrit-Reviewer: Anon. E. Moose #1000171 Gerrit-Reviewer: Jenkins <[email protected]> Gerrit-Reviewer: Michael Blow <[email protected]> Gerrit-Reviewer: Murtadha Hubail <[email protected]> Gerrit-Reviewer: Till Westmann <[email protected]> Gerrit-Reviewer: abdullah alamoudi <[email protected]>
