ATLAS-3168: PatchFix: Support for HA Mode

repository/src/main/java/org/apache/atlas/repository/audit/HBaseBasedAuditRepository.java

@@ -53,6 +53,7 @@ import org.apache.hadoop.hbase.util.Bytes;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.stereotype.Component;
+import org.springframework.core.annotation.Order;
 
 import javax.inject.Singleton;
 import java.io.Closeable;
@@ -84,6 +85,7 @@ import java.util.Set;
 @Singleton
 @Component
 @ConditionalOnAtlasProperty(property = "atlas.EntityAuditRepository.impl", isDefault = true)
+@Order(0)
 public class HBaseBasedAuditRepository extends AbstractStorageBasedAuditRepository {
     private static final Logger LOG = LoggerFactory.getLogger(HBaseBasedAuditRepository.class);
 

repository/src/main/java/org/apache/atlas/repository/graph/GraphBackedSearchIndexer.java

@@ -58,6 +58,7 @@ import org.apache.commons.configuration.Configuration;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.stereotype.Component;
+import org.springframework.core.annotation.Order;
 
 import javax.inject.Inject;
 import java.math.BigDecimal;
@@ -85,6 +86,7 @@ import static org.apache.atlas.type.AtlasTypeUtil.isMapType;
  * Adds index for properties of a given type when its added before any instances are added.
  */
 @Component
+@Order(1)
 public class GraphBackedSearchIndexer implements SearchIndexer, ActiveStateChangeHandler, TypeDefChangeListener {
 
     private static final Logger LOG = LoggerFactory.getLogger(GraphBackedSearchIndexer.class);

repository/src/main/java/org/apache/atlas/repository/patches/AtlasPatchService.java

@@ -18,8 +18,13 @@
 
 package org.apache.atlas.repository.patches;
 
+import javafx.application.Application;
+import org.apache.atlas.ApplicationProperties;
 import org.apache.atlas.AtlasException;
+import org.apache.atlas.ha.HAConfiguration;
+import org.apache.atlas.listener.ActiveStateChangeHandler;
 import org.apache.atlas.service.Service;
+import org.apache.commons.configuration.Configuration;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.core.annotation.Order;
@@ -28,13 +33,12 @@ import org.springframework.stereotype.Component;
 import javax.inject.Inject;
 
 @Component
-@Order(2)
-public class AtlasPatchService implements Service {
+@Order(3)
+public class AtlasPatchService implements Service, ActiveStateChangeHandler {
     private static final Logger LOG = LoggerFactory.getLogger(AtlasPatchService.class);
 
     private final AtlasPatchManager patchManager;
 
-
     @Inject
     public AtlasPatchService(AtlasPatchManager patchManager) {
         this.patchManager = patchManager;
@@ -44,11 +48,38 @@ public class AtlasPatchService implements Service {
     public void start() throws AtlasException {
         LOG.info("PatchService: Started.");
 
-        patchManager.applyAll();
+        startInternal(ApplicationProperties.get());
+    }
+
+    void startInternal(Configuration configuration) {
+        if (!HAConfiguration.isHAEnabled(configuration)) {
+            instanceIsActive();
+        }
     }
 
     @Override
-    public void stop() throws AtlasException {
+    public void stop() {
         LOG.info("PatchService: Stopped.");
     }
+
+    @Override
+    public void instanceIsActive() {
+        try {
+            LOG.info("PatchService: Applying patches...");
+            patchManager.applyAll();
+        }
+        catch (Exception ex) {
+            LOG.error("PatchService: Applying patches: Failed!", ex);
+        }
+    }
+
+    @Override
+    public void instanceIsPassive() {
+        LOG.info("Reacting to passive: No action for now.");
+    }
+
+    @Override
+    public int getHandlerOrder() {
+        return HandlerOrder.ATLAS_PATCH_SERVICE.getOrder();
+    }
 }

repository/src/main/java/org/apache/atlas/repository/store/bootstrap/AtlasTypeDefStoreInitializer.java

@@ -55,6 +55,7 @@ import org.apache.commons.lang.ObjectUtils;
 import org.apache.commons.lang3.StringUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
+import org.springframework.core.annotation.Order;
 import org.springframework.stereotype.Service;
 
 import javax.annotation.PostConstruct;
@@ -82,6 +83,7 @@ import static org.apache.atlas.model.patches.AtlasPatch.PatchStatus.UNKNOWN;
  * Class that handles initial loading of models and patches into typedef store
  */
 @Service
+@Order(2)
 public class AtlasTypeDefStoreInitializer implements ActiveStateChangeHandler {
     public static final Logger LOG                    = LoggerFactory.getLogger(AtlasTypeDefStoreInitializer.class);
     public static final String PATCHES_FOLDER_NAME    = "patches";
@@ -93,7 +95,7 @@ public class AtlasTypeDefStoreInitializer implements ActiveStateChangeHandler {
     private final AtlasTypeDefStore        typeDefStore;
     private final AtlasTypeRegistry        typeRegistry;
     private final Configuration            conf;
-    private final AtlasPatchRegistry       patchRegistry;
+    private final AtlasGraph               graph;
 
     @Inject
     public AtlasTypeDefStoreInitializer(AtlasTypeDefStore typeDefStore, AtlasTypeRegistry typeRegistry,
@@ -101,24 +103,15 @@ public class AtlasTypeDefStoreInitializer implements ActiveStateChangeHandler {
         this.typeDefStore  = typeDefStore;
         this.typeRegistry  = typeRegistry;
         this.conf          = conf;
-        this.patchRegistry = new AtlasPatchRegistry(graph);
+        this.graph         = graph;
     }
 
     @PostConstruct
-    public void init() throws AtlasBaseException {
+    public void init() {
         LOG.info("==> AtlasTypeDefStoreInitializer.init()");
 
         if (!HAConfiguration.isHAEnabled(conf)) {
-            typeDefStore.init();
-            loadBootstrapTypeDefs();
-
-            try {
-                AtlasAuthorizerFactory.getAtlasAuthorizer();
-            } catch (Throwable t) {
-                LOG.error("AtlasTypeDefStoreInitializer.init(): Unable to obtain AtlasAuthorizer", t);
-            }
-        } else {
-            LOG.info("AtlasTypeDefStoreInitializer.init(): deferring type loading until instance activation");
+            startInternal();
         }
 
         LOG.info("<== AtlasTypeDefStoreInitializer.init()");
@@ -348,12 +341,17 @@ public class AtlasTypeDefStoreInitializer implements ActiveStateChangeHandler {
     }
 
     @Override
-    public void instanceIsActive() throws AtlasException {
+    public void instanceIsActive() {
         LOG.info("==> AtlasTypeDefStoreInitializer.instanceIsActive()");
 
+        startInternal();
+
+        LOG.info("<== AtlasTypeDefStoreInitializer.instanceIsActive()");
+    }
+
+    private void startInternal() {
         try {
             typeDefStore.init();
-
             loadBootstrapTypeDefs();
 
             try {
@@ -364,8 +362,6 @@ public class AtlasTypeDefStoreInitializer implements ActiveStateChangeHandler {
         } catch (AtlasBaseException e) {
             LOG.error("Failed to init after becoming active", e);
         }
-
-        LOG.info("<== AtlasTypeDefStoreInitializer.instanceIsActive()");
     }
 
     @Override
@@ -414,6 +410,7 @@ public class AtlasTypeDefStoreInitializer implements ActiveStateChangeHandler {
         String             typePatchesDirName = typesDirName + File.separator + PATCHES_FOLDER_NAME;
         File               typePatchesDir     = new File(typePatchesDirName);
         File[]             typePatchFiles     = typePatchesDir.exists() ? typePatchesDir.listFiles() : null;
+        AtlasPatchRegistry patchRegistry      = new AtlasPatchRegistry(graph);
 
         if (typePatchFiles == null || typePatchFiles.length == 0) {
             LOG.info("Type patches directory {} does not exist or not readable or has no patches", typePatchesDirName);

server-api/src/main/java/org/apache/atlas/listener/ActiveStateChangeHandler.java

@@ -30,8 +30,9 @@ public interface ActiveStateChangeHandler {
         AUDIT_REPOSITORY(0),
         GRAPH_BACKED_SEARCH_INDEXER(1),
         TYPEDEF_STORE_INITIALIZER(2),
-        DEFAULT_METADATA_SERVICE(3),
-        NOTIFICATION_HOOK_CONSUMER(4);
+        ATLAS_PATCH_SERVICE(3),
+        DEFAULT_METADATA_SERVICE(4),
+        NOTIFICATION_HOOK_CONSUMER(5);
 
 
         private final int order;

webapp/src/main/java/org/apache/atlas/web/service/ActiveInstanceElectorService.java

@@ -53,7 +53,9 @@ import java.util.Set;
  */
 
 @Component
-@Order(1)
+//
+// This should be called the last, leaving it without the @Order(Integer.MAX_VALUE) will make it get
+// called after all services have their start called.
 public class ActiveInstanceElectorService implements Service, LeaderLatchListener {
     private static final Logger LOG = LoggerFactory.getLogger(ActiveInstanceElectorService.class);