[asterixdb] branch master updated: [NO ISSUE][*DB][ACTIVE] RecoveryTask adjustments

[mb...@apache.org]

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


The following commit(s) were added to refs/heads/master by this push:
     new 92ccf30  [NO ISSUE][*DB][ACTIVE] RecoveryTask adjustments
92ccf30 is described below

commit 92ccf30bccc9fd4f1ff1e9beeacc933609f9c2f3
Author: Michael Blow <mb...@apache.org>
AuthorDate: Sun Nov 15 08:54:55 2020 -0500

    [NO ISSUE][*DB][ACTIVE] RecoveryTask adjustments
    
    - expose helpful members to subclasses
    - provide IMetadataLockUtil to acquireRecoveryLocks()
    
    Change-Id: Iadfad29bfcbd59cebb817a7732d50c371cffc5de
    Reviewed-on: https://asterix-gerrit.ics.uci.edu/c/asterixdb/+/8903
    Reviewed-by: Michael Blow <mb...@apache.org>
    Reviewed-by: Ali Alsuliman <al...@gmail.com>
    Integration-Tests: Jenkins <je...@fulliautomatix.ics.uci.edu>
    Tested-by: Jenkins <je...@fulliautomatix.ics.uci.edu>
---
 .../main/java/org/apache/asterix/app/active/RecoveryTask.java  | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

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 c941258..968876d 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
@@ -42,10 +42,10 @@ public class RecoveryTask {
 
     private static final Logger LOGGER = LogManager.getLogger();
     private static final Level level = Level.INFO;
-    private final ActiveEntityEventsListener listener;
+    protected final ActiveEntityEventsListener listener;
     private volatile boolean cancelRecovery = false;
     private final IRetryPolicyFactory retryPolicyFactory;
-    private final MetadataProvider metadataProvider;
+    protected final MetadataProvider metadataProvider;
     private final IClusterStateManager clusterStateManager;
 
     public RecoveryTask(ICcApplicationContext appCtx, ActiveEntityEventsListener listener,
@@ -118,8 +118,9 @@ public class RecoveryTask {
                 }
             }
             IMetadataLockManager lockManager = metadataProvider.getApplicationContext().getMetadataLockManager();
+            IMetadataLockUtil lockUtil = metadataProvider.getApplicationContext().getMetadataLockUtil();
             try {
-                acquireRecoveryLocks(lockManager);
+                acquireRecoveryLocks(lockManager, lockUtil);
                 synchronized (listener) {
                     try {
                         if (!cancelRecovery && listener.getState() == ActivityState.TEMPORARILY_FAILED) {
@@ -173,7 +174,8 @@ public class RecoveryTask {
         return null;
     }
 
-    protected void acquireRecoveryLocks(IMetadataLockManager lockManager) throws AlgebricksException {
+    protected void acquireRecoveryLocks(IMetadataLockManager lockManager, IMetadataLockUtil lockUtil)
+            throws AlgebricksException {
         EntityId entityId = listener.getEntityId();
         lockManager.acquireActiveEntityWriteLock(metadataProvider.getLocks(), entityId.getDataverseName(),
                 entityId.getEntityName());