commit aecdfe4283e5bc46d301f2a5fabc89b8655f7437
author Michael Blow <mblow@apache.org> Mon Oct 26 18:13:06 2020 -0400
committer Michael Blow <mblow@apache.org> Mon Oct 26 18:13:06 2020 -0400
tree a4f6fb79df8b45b668052c3bd4bac55f79f3a1be
parent 70bf47a48b016dd47b6e9d213aa3965c9883af5c
parent 301abd15c4e2cfb6061ae9c868fa42c230ef71cd

Merge commit '301abd1'

Change-Id: Ie0ba7112b1b4a5a8f55719b7e0a121a06d09565b

asterixdb/asterix-app/src/main/java/org/apache/asterix/app/active/RecoveryTask.java

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 40ed7a4..c941258 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
@@ -109,7 +109,7 @@
         Exception failure;
         do {
             synchronized (listener) {
-                while (!cancelRecovery && clusterStateManager.getState() != ClusterState.ACTIVE) {
+                while (!cancelRecovery && !canStartRecovery()) {
                     listener.wait();
                 }
                 if (cancelRecovery) {
@@ -202,4 +202,9 @@
     protected void releasePostRecoveryLocks() {
         metadataProvider.getLocks().reset();
     }
+
+    private boolean canStartRecovery() {
+        return clusterStateManager.getState() == ClusterState.ACTIVE
+                || clusterStateManager.getState() == ClusterState.REBALANCE_REQUIRED;
+    }
 }