You are viewing a plain text version of this content. The canonical link for it is here.
Posted to notifications@asterixdb.apache.org by AsterixDB Code Review <do...@asterix-gerrit.ics.uci.edu> on 2021/05/22 15:32:29 UTC
Change in asterixdb[stabilization-3b6982ce7f]: [NO ISSUE][EXT] enable override of active recovery
From Michael Blow <mb...@apache.org>:
Michael Blow has uploaded this change for review. ( https://asterix-gerrit.ics.uci.edu/c/asterixdb/+/11583 )
Change subject: [NO ISSUE][EXT] enable override of active recovery
......................................................................
[NO ISSUE][EXT] enable override of active recovery
Change-Id: I50639d8b61af5d9d0068433ab132d76e363f7bef
---
M asterixdb/asterix-app/src/main/java/org/apache/asterix/app/active/ActiveEntityEventsListener.java
M asterixdb/asterix-app/src/main/java/org/apache/asterix/app/active/RecoveryTask.java
2 files changed, 6 insertions(+), 2 deletions(-)
git pull ssh://asterix-gerrit.ics.uci.edu:29418/asterixdb refs/changes/83/11583/1
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 @@
}
}
+ 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 @@
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 @@
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
--
To view, visit https://asterix-gerrit.ics.uci.edu/c/asterixdb/+/11583
To unsubscribe, or for help writing mail filters, visit https://asterix-gerrit.ics.uci.edu/settings
Gerrit-Project: asterixdb
Gerrit-Branch: stabilization-3b6982ce7f
Gerrit-Change-Id: I50639d8b61af5d9d0068433ab132d76e363f7bef
Gerrit-Change-Number: 11583
Gerrit-PatchSet: 1
Gerrit-Owner: Michael Blow <mb...@apache.org>
Gerrit-MessageType: newchange
Change in asterixdb[stabilization-3b6982ce7f]: [NO ISSUE][EXT] enable override of active recovery
Posted by AsterixDB Code Review <do...@asterix-gerrit.ics.uci.edu>.
From Michael Blow <mb...@apache.org>:
Michael Blow has submitted this change. ( https://asterix-gerrit.ics.uci.edu/c/asterixdb/+/11583 )
Change subject: [NO ISSUE][EXT] enable override of active recovery
......................................................................
[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>
---
M asterixdb/asterix-app/src/main/java/org/apache/asterix/app/active/ActiveEntityEventsListener.java
M asterixdb/asterix-app/src/main/java/org/apache/asterix/app/active/RecoveryTask.java
2 files changed, 6 insertions(+), 2 deletions(-)
Approvals:
Michael Blow: Looks good to me, approved
Jenkins: Verified; Verified
Objections:
Anon. E. Moose #1000171: Violations found
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 @@
}
}
+ 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 @@
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 @@
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
--
To view, visit https://asterix-gerrit.ics.uci.edu/c/asterixdb/+/11583
To unsubscribe, or for help writing mail filters, visit https://asterix-gerrit.ics.uci.edu/settings
Gerrit-Project: asterixdb
Gerrit-Branch: stabilization-3b6982ce7f
Gerrit-Change-Id: I50639d8b61af5d9d0068433ab132d76e363f7bef
Gerrit-Change-Number: 11583
Gerrit-PatchSet: 2
Gerrit-Owner: Michael Blow <mb...@apache.org>
Gerrit-Reviewer: Anon. E. Moose #1000171
Gerrit-Reviewer: Jenkins <je...@fulliautomatix.ics.uci.edu>
Gerrit-Reviewer: Michael Blow <mb...@apache.org>
Gerrit-MessageType: merged
Change in asterixdb[stabilization-3b6982ce7f]: [NO ISSUE][EXT] enable override of active recovery
Posted by AsterixDB Code Review <do...@asterix-gerrit.ics.uci.edu>.
From Michael Blow <mb...@apache.org>:
Michael Blow has uploaded this change for review. ( https://asterix-gerrit.ics.uci.edu/c/asterixdb/+/11583 )
Change subject: [NO ISSUE][EXT] enable override of active recovery
......................................................................
[NO ISSUE][EXT] enable override of active recovery
Change-Id: I50639d8b61af5d9d0068433ab132d76e363f7bef
---
M asterixdb/asterix-app/src/main/java/org/apache/asterix/app/active/ActiveEntityEventsListener.java
M asterixdb/asterix-app/src/main/java/org/apache/asterix/app/active/RecoveryTask.java
2 files changed, 6 insertions(+), 2 deletions(-)
git pull ssh://asterix-gerrit.ics.uci.edu:29418/asterixdb refs/changes/83/11583/1
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 @@
}
}
+ 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 @@
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 @@
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
--
To view, visit https://asterix-gerrit.ics.uci.edu/c/asterixdb/+/11583
To unsubscribe, or for help writing mail filters, visit https://asterix-gerrit.ics.uci.edu/settings
Gerrit-Project: asterixdb
Gerrit-Branch: stabilization-3b6982ce7f
Gerrit-Change-Id: I50639d8b61af5d9d0068433ab132d76e363f7bef
Gerrit-Change-Number: 11583
Gerrit-PatchSet: 1
Gerrit-Owner: Michael Blow <mb...@apache.org>
Gerrit-MessageType: newchange
Change in asterixdb[stabilization-3b6982ce7f]: [NO ISSUE][EXT] enable override of active recovery
Posted by AsterixDB Code Review <do...@asterix-gerrit.ics.uci.edu>.
From Jenkins <je...@fulliautomatix.ics.uci.edu>:
Jenkins has posted comments on this change. ( https://asterix-gerrit.ics.uci.edu/c/asterixdb/+/11583 )
Change subject: [NO ISSUE][EXT] enable override of active recovery
......................................................................
Patch Set 1: Integration-Tests+1
Integration Tests Successful
https://asterix-jenkins.ics.uci.edu/job/asterix-gerrit-integration-tests/12005/ : SUCCESS
--
To view, visit https://asterix-gerrit.ics.uci.edu/c/asterixdb/+/11583
To unsubscribe, or for help writing mail filters, visit https://asterix-gerrit.ics.uci.edu/settings
Gerrit-Project: asterixdb
Gerrit-Branch: stabilization-3b6982ce7f
Gerrit-Change-Id: I50639d8b61af5d9d0068433ab132d76e363f7bef
Gerrit-Change-Number: 11583
Gerrit-PatchSet: 1
Gerrit-Owner: Michael Blow <mb...@apache.org>
Gerrit-Reviewer: Jenkins <je...@fulliautomatix.ics.uci.edu>
Gerrit-CC: Anon. E. Moose #1000171
Gerrit-Comment-Date: Sat, 22 May 2021 16:33:34 +0000
Gerrit-HasComments: No
Gerrit-Has-Labels: Yes
Gerrit-MessageType: comment
Change in asterixdb[stabilization-3b6982ce7f]: [NO ISSUE][EXT] enable override of active recovery
Posted by AsterixDB Code Review <do...@asterix-gerrit.ics.uci.edu>.
Anon. E. Moose #1000171 has posted comments on this change. ( https://asterix-gerrit.ics.uci.edu/c/asterixdb/+/11583 )
Change subject: [NO ISSUE][EXT] enable override of active recovery
......................................................................
Patch Set 1: Contrib-2
Analytics Compatibility Tests Failed
https://cbjenkins.page.link/N1tuxtFMyiSXYbcDA : UNSTABLE
--
To view, visit https://asterix-gerrit.ics.uci.edu/c/asterixdb/+/11583
To unsubscribe, or for help writing mail filters, visit https://asterix-gerrit.ics.uci.edu/settings
Gerrit-Project: asterixdb
Gerrit-Branch: stabilization-3b6982ce7f
Gerrit-Change-Id: I50639d8b61af5d9d0068433ab132d76e363f7bef
Gerrit-Change-Number: 11583
Gerrit-PatchSet: 1
Gerrit-Owner: Michael Blow <mb...@apache.org>
Gerrit-Reviewer: Anon. E. Moose #1000171
Gerrit-Reviewer: Jenkins <je...@fulliautomatix.ics.uci.edu>
Gerrit-Comment-Date: Sat, 22 May 2021 18:23:13 +0000
Gerrit-HasComments: No
Gerrit-Has-Labels: Yes
Gerrit-MessageType: comment
Change in asterixdb[stabilization-3b6982ce7f]: [NO ISSUE][EXT] enable override of active recovery
Posted by AsterixDB Code Review <do...@asterix-gerrit.ics.uci.edu>.
Anon. E. Moose #1000171 has posted comments on this change. ( https://asterix-gerrit.ics.uci.edu/c/asterixdb/+/11583 )
Change subject: [NO ISSUE][EXT] enable override of active recovery
......................................................................
Patch Set 1:
Analytics Compatibility Compilation Successful
https://cbjenkins.page.link/1qNbW4CjLThwcbLA6 : SUCCESS
--
To view, visit https://asterix-gerrit.ics.uci.edu/c/asterixdb/+/11583
To unsubscribe, or for help writing mail filters, visit https://asterix-gerrit.ics.uci.edu/settings
Gerrit-Project: asterixdb
Gerrit-Branch: stabilization-3b6982ce7f
Gerrit-Change-Id: I50639d8b61af5d9d0068433ab132d76e363f7bef
Gerrit-Change-Number: 11583
Gerrit-PatchSet: 1
Gerrit-Owner: Michael Blow <mb...@apache.org>
Gerrit-CC: Anon. E. Moose #1000171
Gerrit-CC: Jenkins <je...@fulliautomatix.ics.uci.edu>
Gerrit-Comment-Date: Sat, 22 May 2021 15:39:00 +0000
Gerrit-HasComments: No
Gerrit-Has-Labels: No
Gerrit-MessageType: comment