This is an automated email from the ASF dual-hosted git repository. madhan pushed a commit to branch atlas-2.5 in repository https://gitbox.apache.org/repos/asf/atlas.git
commit c48247b6bc0357c2a6fa6161fe82278df112bbe2 Author: chaitalicod <[email protected]> AuthorDate: Tue Jul 29 14:41:08 2025 +0530 ATLAS-5055: Incremental Export : When entity exported has a tag propagated from entity which is deleted , tag is not propagated to it at target (#377) Co-authored-by: chaitalithombare <[email protected]> (cherry picked from commit 1e100339a8f3bf8dfadd54358e0501cc5d2fa91c) --- .../apache/atlas/repository/store/graph/v2/EntityGraphRetriever.java | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/repository/src/main/java/org/apache/atlas/repository/store/graph/v2/EntityGraphRetriever.java b/repository/src/main/java/org/apache/atlas/repository/store/graph/v2/EntityGraphRetriever.java index a6aa1695f..765aa7ddc 100644 --- a/repository/src/main/java/org/apache/atlas/repository/store/graph/v2/EntityGraphRetriever.java +++ b/repository/src/main/java/org/apache/atlas/repository/store/graph/v2/EntityGraphRetriever.java @@ -18,7 +18,9 @@ package org.apache.atlas.repository.store.graph.v2; import com.fasterxml.jackson.core.type.TypeReference; +import org.apache.atlas.AtlasConfiguration; import org.apache.atlas.AtlasErrorCode; +import org.apache.atlas.RequestContext; import org.apache.atlas.exception.AtlasBaseException; import org.apache.atlas.model.TimeBoundary; import org.apache.atlas.model.glossary.AtlasGlossaryCategory; @@ -162,6 +164,7 @@ public class EntityGraphRetriever { private static final String GLOSSARY_CATEGORY_HIERARCHY_EDGE_LABEL = "r:AtlasGlossaryCategoryHierarchyLink"; private static final String GLOSSARY_CATEGORY_TYPE_NAME = AtlasGlossaryCategory.class.getSimpleName(); private static final String PARENT_GLOSSARY_CATEGORY_GUID = "parentCategoryGuid"; + private boolean deferredActionEnabled = AtlasConfiguration.TASKS_USE_ENABLED.getBoolean(); private static final TypeReference<List<TimeBoundary>> TIME_BOUNDARIES_LIST_TYPE = new TypeReference<List<TimeBoundary>>() {}; @@ -698,7 +701,7 @@ public class EntityGraphRetriever { Iterable<AtlasEdge> propagationEdges = entityVertex.getEdges(AtlasEdgeDirection.BOTH, tagPropagationEdges); for (AtlasEdge propagationEdge : propagationEdges) { - if (getEdgeStatus(propagationEdge) != ACTIVE) { + if (getEdgeStatus(propagationEdge) != ACTIVE && !deferredActionEnabled && !RequestContext.get().isImportInProgress()) { continue; }
