ATLAS-1266: fixed typedef APIs to update type-registry only on successful graph commit

repository/src/main/java/org/apache/atlas/GraphTransactionInterceptor.java

@@ -26,8 +26,14 @@ import org.apache.atlas.typesystem.exception.SchemaNotFoundException;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
+import java.util.ArrayList;
+import java.util.List;
+
 public class GraphTransactionInterceptor implements MethodInterceptor {
     private static final Logger LOG = LoggerFactory.getLogger(GraphTransactionInterceptor.class);
+
+    private static final ThreadLocal<List<PostTransactionHook>> postTransactionHooks = new ThreadLocal<>();
+
     private AtlasGraph graph;
 
     @Override
@@ -37,19 +43,38 @@ public class GraphTransactionInterceptor implements MethodInterceptor {
             graph = AtlasGraphProvider.getGraphInstance();
         }
 
+        boolean isSuccess = false;
+
         try {
-            Object response = invocation.proceed();
-            graph.commit();
-            LOG.info("graph commit");
-            return response;
-        } catch (Throwable t) {
-            if (logException(t)) {
-                LOG.error("graph rollback due to exception ", t);
-            } else {
-                LOG.error("graph rollback due to exception " + t.getClass().getSimpleName() + ":" + t.getMessage());
+            try {
+                Object response = invocation.proceed();
+                graph.commit();
+                isSuccess = true;
+                LOG.info("graph commit");
+                return response;
+            } catch (Throwable t) {
+                if (logException(t)) {
+                    LOG.error("graph rollback due to exception ", t);
+                } else {
+                    LOG.error("graph rollback due to exception " + t.getClass().getSimpleName() + ":" + t.getMessage());
+                }
+                graph.rollback();
+                throw t;
+            }
+        } finally {
+            List<PostTransactionHook> trxHooks = postTransactionHooks.get();
+
+            if (trxHooks != null) {
+                postTransactionHooks.remove();
+
+                for (PostTransactionHook trxHook : trxHooks) {
+                    try {
+                        trxHook.onComplete(isSuccess);
+                    } catch (Throwable t) {
+                        LOG.error("postTransactionHook failed", t);
+                    }
+                }
             }
-            graph.rollback();
-            throw t;
         }
     }
 
@@ -59,4 +84,19 @@ public class GraphTransactionInterceptor implements MethodInterceptor {
         }
         return true;
     }
+
+    public static abstract class PostTransactionHook {
+        protected PostTransactionHook() {
+            List<PostTransactionHook> trxHooks = postTransactionHooks.get();
+
+            if (trxHooks == null) {
+                trxHooks = new ArrayList<>();
+                postTransactionHooks.set(trxHooks);
+            }
+
+            trxHooks.add(this);
+        }
+
+        public abstract void onComplete(boolean isSuccess);
+    }
 }

repository/src/main/java/org/apache/atlas/RepositoryMetadataModule.java

@@ -48,6 +48,7 @@ import org.apache.atlas.services.IBootstrapTypesRegistrar;
 import org.apache.atlas.services.MetadataService;
 import org.apache.atlas.services.ReservedTypesRegistrar;
 import org.apache.atlas.store.AtlasTypeDefStore;
+import org.apache.atlas.type.AtlasTypeRegistry;
 import org.apache.atlas.typesystem.types.TypeSystem;
 import org.apache.atlas.typesystem.types.TypeSystemProvider;
 import org.apache.atlas.typesystem.types.cache.TypeCache;
@@ -71,6 +72,7 @@ public class RepositoryMetadataModule extends com.google.inject.AbstractModule {
         // bind the ITypeStore interface to an implementation
         bind(ITypeStore.class).to(GraphBackedTypeStore.class).asEagerSingleton();
         bind(AtlasTypeDefStore.class).to(AtlasTypeDefGraphStoreV1.class).asEagerSingleton();
+        bind(AtlasTypeRegistry.class).asEagerSingleton();
 
         //GraphBackedSearchIndexer must be an eager singleton to force the search index creation to happen before
         //we try to restore the type system (otherwise we'll end up running queries

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

@@ -285,7 +285,7 @@ public class GraphBackedSearchIndexer implements SearchIndexer, ActiveStateChang
             } else if (isEnumType(atlasType)) {
                 createIndexes(management, propertyName, String.class, isUnique, cardinality, false, isIndexable);
             } else if (isStructType(atlasType)) {
-                AtlasStructDef structDef = typeRegistry.getStructDefByName(attributeDef.getName());
+                AtlasStructDef structDef = typeRegistry.getStructDefByName(attribTypeName);
                 updateIndexForTypeDef(management, structDef);
             }
         } catch (AtlasBaseException e) {

repository/src/main/java/org/apache/atlas/repository/store/graph/v1/AtlasTypeDefGraphStoreV1.java

@@ -110,9 +110,9 @@ public class AtlasTypeDefGraphStoreV1 extends AtlasTypeDefGraphStore {
         LOG.info("<== AtlasTypeDefGraphStoreV1.init()");
     }
 
-    public AtlasGraph getAtlasGraph() { return atlasGraph; }
+    AtlasGraph getAtlasGraph() { return atlasGraph; }
 
-    public AtlasVertex findTypeVertexByName(String typeName) {
+    AtlasVertex findTypeVertexByName(String typeName) {
         Iterator results = atlasGraph.query().has(VERTEX_TYPE_PROPERTY_KEY, VERTEX_TYPE)
                                              .has(Constants.TYPENAME_PROPERTY_KEY, typeName)
                                              .vertices().iterator();
@@ -122,7 +122,7 @@ public class AtlasTypeDefGraphStoreV1 extends AtlasTypeDefGraphStore {
         return ret;
     }
 
-    public AtlasVertex findTypeVertexByNameAndCategory(String typeName, TypeCategory category) {
+    AtlasVertex findTypeVertexByNameAndCategory(String typeName, TypeCategory category) {
         Iterator results = atlasGraph.query().has(VERTEX_TYPE_PROPERTY_KEY, VERTEX_TYPE)
                                              .has(Constants.TYPENAME_PROPERTY_KEY, typeName)
                                              .has(TYPE_CATEGORY_PROPERTY_KEY, category)
@@ -133,7 +133,7 @@ public class AtlasTypeDefGraphStoreV1 extends AtlasTypeDefGraphStore {
         return ret;
     }
 
-    public AtlasVertex findTypeVertexByGuid(String typeGuid) {
+    AtlasVertex findTypeVertexByGuid(String typeGuid) {
         Iterator<AtlasVertex> vertices = atlasGraph.query().has(VERTEX_TYPE_PROPERTY_KEY, VERTEX_TYPE)
                                                       .has(Constants.GUID_PROPERTY_KEY, typeGuid)
                                                       .vertices().iterator();
@@ -143,7 +143,7 @@ public class AtlasTypeDefGraphStoreV1 extends AtlasTypeDefGraphStore {
         return ret;
     }
 
-    public AtlasVertex findTypeVertexByGuidAndCategory(String typeGuid, TypeCategory category) {
+    AtlasVertex findTypeVertexByGuidAndCategory(String typeGuid, TypeCategory category) {
         Iterator<AtlasVertex> vertices = atlasGraph.query().has(VERTEX_TYPE_PROPERTY_KEY, VERTEX_TYPE)
                                                       .has(Constants.GUID_PROPERTY_KEY, typeGuid)
                                                       .has(TYPE_CATEGORY_PROPERTY_KEY, category)
@@ -154,7 +154,7 @@ public class AtlasTypeDefGraphStoreV1 extends AtlasTypeDefGraphStore {
         return ret;
     }
 
-    public Iterator<AtlasVertex> findTypeVerticesByCategory(TypeCategory category) {
+    Iterator<AtlasVertex> findTypeVerticesByCategory(TypeCategory category) {
         Iterator<AtlasVertex> ret = atlasGraph.query().has(VERTEX_TYPE_PROPERTY_KEY, VERTEX_TYPE)
                                                  .has(TYPE_CATEGORY_PROPERTY_KEY, category)
                                                  .vertices().iterator();
@@ -162,7 +162,7 @@ public class AtlasTypeDefGraphStoreV1 extends AtlasTypeDefGraphStore {
         return ret;
     }
 
-    public AtlasVertex createTypeVertex(AtlasBaseTypeDef typeDef) {
+    AtlasVertex createTypeVertex(AtlasBaseTypeDef typeDef) {
         // Validate all the required checks
         Preconditions.checkArgument(StringUtils.isNotBlank(typeDef.getName()), "Type name can't be null/empty");
 
@@ -203,7 +203,7 @@ public class AtlasTypeDefGraphStoreV1 extends AtlasTypeDefGraphStore {
         return ret;
     }
 
-    public void updateTypeVertex(AtlasBaseTypeDef typeDef, AtlasVertex vertex) {
+    void updateTypeVertex(AtlasBaseTypeDef typeDef, AtlasVertex vertex) {
         if (!isTypeVertex(vertex)) {
             LOG.warn("updateTypeVertex(): not a type-vertex - {}", vertex);
 
@@ -223,7 +223,7 @@ public class AtlasTypeDefGraphStoreV1 extends AtlasTypeDefGraphStore {
         markVertexUpdated(vertex);
     }
 
-    public void deleteTypeVertexOutEdges(AtlasVertex vertex) throws AtlasBaseException {
+    void deleteTypeVertexOutEdges(AtlasVertex vertex) throws AtlasBaseException {
         Iterable<AtlasEdge> edges = vertex.getEdges(AtlasEdgeDirection.OUT);
 
         for (AtlasEdge edge : edges) {
@@ -231,7 +231,7 @@ public class AtlasTypeDefGraphStoreV1 extends AtlasTypeDefGraphStore {
         }
     }
 
-    public void deleteTypeVertex(AtlasVertex vertex) throws AtlasBaseException {
+    void deleteTypeVertex(AtlasVertex vertex) throws AtlasBaseException {
         Iterator<AtlasEdge> inEdges = vertex.getEdges(AtlasEdgeDirection.IN).iterator();
 
         if (inEdges.hasNext()) {
@@ -247,7 +247,7 @@ public class AtlasTypeDefGraphStoreV1 extends AtlasTypeDefGraphStore {
         atlasGraph.removeVertex(vertex);
     }
 
-    public void vertexToTypeDef(AtlasVertex vertex, AtlasBaseTypeDef typeDef) {
+    void vertexToTypeDef(AtlasVertex vertex, AtlasBaseTypeDef typeDef) {
         String name        = vertex.getProperty(Constants.TYPENAME_PROPERTY_KEY, String.class);
         String description = vertex.getProperty(Constants.TYPEDESCRIPTION_PROPERTY_KEY, String.class);
         String typeVersion = vertex.getProperty(Constants.TYPEVERSION_PROPERTY_KEY, String.class);
@@ -274,7 +274,7 @@ public class AtlasTypeDefGraphStoreV1 extends AtlasTypeDefGraphStore {
         }
     }
 
-    public boolean isTypeVertex(AtlasVertex vertex) {
+    boolean isTypeVertex(AtlasVertex vertex) {
         String vertexType = vertex.getProperty(Constants.VERTEX_TYPE_PROPERTY_KEY, String.class);
 
         boolean ret = VERTEX_TYPE.equals(vertexType);
@@ -282,7 +282,7 @@ public class AtlasTypeDefGraphStoreV1 extends AtlasTypeDefGraphStore {
         return ret;
     }
 
-    public boolean isTypeVertex(AtlasVertex vertex, TypeCategory category) {
+    boolean isTypeVertex(AtlasVertex vertex, TypeCategory category) {
         boolean ret = false;
 
         if (isTypeVertex(vertex)) {
@@ -294,7 +294,7 @@ public class AtlasTypeDefGraphStoreV1 extends AtlasTypeDefGraphStore {
         return ret;
     }
 
-    public boolean isTypeVertex(AtlasVertex vertex, TypeCategory[] categories) {
+    boolean isTypeVertex(AtlasVertex vertex, TypeCategory[] categories) {
         boolean ret = false;
 
         if (isTypeVertex(vertex)) {
@@ -312,7 +312,7 @@ public class AtlasTypeDefGraphStoreV1 extends AtlasTypeDefGraphStore {
         return ret;
     }
 
-    public AtlasEdge getOrCreateEdge(AtlasVertex outVertex, AtlasVertex inVertex, String edgeLabel) {
+    AtlasEdge getOrCreateEdge(AtlasVertex outVertex, AtlasVertex inVertex, String edgeLabel) {
         AtlasEdge           ret   = null;
         Iterable<AtlasEdge> edges = outVertex.getEdges(AtlasEdgeDirection.OUT, edgeLabel);
 
@@ -330,13 +330,13 @@ public class AtlasTypeDefGraphStoreV1 extends AtlasTypeDefGraphStore {
         return ret;
     }
 
-    public AtlasEdge addEdge(AtlasVertex outVertex, AtlasVertex inVertex, String edgeLabel) {
+    AtlasEdge addEdge(AtlasVertex outVertex, AtlasVertex inVertex, String edgeLabel) {
         AtlasEdge ret = atlasGraph.addEdge(outVertex, inVertex, edgeLabel);
 
         return ret;
     }
 
-    public void createSuperTypeEdges(AtlasVertex vertex, Set<String> superTypes, TypeCategory typeCategory)
+    void createSuperTypeEdges(AtlasVertex vertex, Set<String> superTypes, TypeCategory typeCategory)
         throws AtlasBaseException {
         Set<String> currentSuperTypes = getSuperTypeNames(vertex);
 
@@ -355,7 +355,7 @@ public class AtlasTypeDefGraphStoreV1 extends AtlasTypeDefGraphStore {
         }
     }
 
-    public Set<String> getSuperTypeNames(AtlasVertex vertex) {
+    Set<String> getSuperTypeNames(AtlasVertex vertex) {
         Set<String>    ret   = new HashSet<>();
         Iterable<AtlasEdge> edges = vertex.getEdges(AtlasEdgeDirection.OUT, AtlasGraphUtilsV1.SUPERTYPE_EDGE_LABEL);
 
@@ -366,7 +366,7 @@ public class AtlasTypeDefGraphStoreV1 extends AtlasTypeDefGraphStore {
         return ret;
     }
 
-    private TypeCategory getTypeCategory(AtlasBaseTypeDef typeDef) {
+    TypeCategory getTypeCategory(AtlasBaseTypeDef typeDef) {
         TypeCategory ret = null;
 
         if (typeDef instanceof AtlasEntityDef) {