You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@asterixdb.apache.org by mb...@apache.org on 2021/06/03 21:57:41 UTC
[asterixdb] 03/08: [NO ISSUE][EXT] enable override of active
recovery
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 08fbf268dc976bec847dfc2b2461817cb7f67c8c
Author: Michael Blow <mb...@apache.org>
AuthorDate: Sat May 22 11:27:29 2021 -0400
[NO ISSUE][EXT] enable override of active recovery
Change-Id: I50639d8b61af5d9d0068433ab132d76e363f7bef
Reviewed-on: https://asterix-gerrit.ics.uci.edu/c/asterixdb/+/11583
Integration-Tests: Jenkins <je...@fulliautomatix.ics.uci.edu>
Tested-by: Jenkins <je...@fulliautomatix.ics.uci.edu>
Reviewed-by: Michael Blow <mb...@apache.org>
---
.../org/apache/asterix/app/active/ActiveEntityEventsListener.java | 4 ++++
.../src/main/java/org/apache/asterix/app/active/RecoveryTask.java | 4 ++--
2 files changed, 6 insertions(+), 2 deletions(-)
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 e18e50c..0242ecd 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
@@ -434,6 +434,10 @@ public abstract class ActiveEntityEventsListener implements IActiveEntityControl
}
}
+ protected synchronized void doRecover(MetadataProvider metadataProvider) throws HyracksDataException {
+ doStart(metadataProvider);
+ }
+
private void cancelJob(Throwable th) {
cancelJobSafely(metadataProvider, th);
final WaitForStateSubscriber cancelSubscriber =
diff --git a/asterixdb/asterix-app/src/main/java/org/apache/asterix/app/active/RecoveryTask.java b/asterixdb/asterix-app/src/main/java/org/apache/asterix/app/active/RecoveryTask.java
index 968876d..3bc1c28 100644
--- a/asterixdb/asterix-app/src/main/java/org/apache/asterix/app/active/RecoveryTask.java
+++ b/asterixdb/asterix-app/src/main/java/org/apache/asterix/app/active/RecoveryTask.java
@@ -125,7 +125,7 @@ public class RecoveryTask {
try {
if (!cancelRecovery && listener.getState() == ActivityState.TEMPORARILY_FAILED) {
listener.setState(ActivityState.RECOVERING);
- listener.doStart(metadataProvider);
+ listener.doRecover(metadataProvider);
}
LOGGER.log(level, "Recovery completed successfully");
return null;
@@ -141,7 +141,7 @@ public class RecoveryTask {
releaseRecoveryLocks(metadataProvider);
}
} while (policy.retry(failure));
- // Recovery task is essntially over now either through failure or through cancellation(stop)
+ // Recovery task is essentially over now either through failure or through cancellation(stop)
synchronized (listener) {
listener.notifyAll();
if (listener.getState() != ActivityState.TEMPORARILY_FAILED