Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Sync beta with master #3673

Merged
merged 6 commits into from
Oct 29, 2024
Merged

Sync beta with master #3673

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
0a411fd
Merge pull request #3662 from atlanhq/task/minorMM-3720
aarshi0301 Oct 25, 2024
3b831f2
Added code refactors based on PR comments
hr2904 Oct 28, 2024
4a65908
Merge pull request #3670 from atlanhq/arpitpmexpiry
arpit-at Oct 28, 2024
05408e0
Added refactors based on PR comments
hr2904 Oct 28, 2024
0a233e0
Added refactors based on PR comments - 2
hr2904 Oct 28, 2024
30d5879
Merge pull request #3665 from atlanhq/dg1875
hr2904 Oct 29, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions intg/src/main/java/org/apache/atlas/AtlasConfiguration.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -84,6 +84,7 @@ public enum AtlasConfiguration {
DEBUG_METRICS_ENABLED("atlas.debug.metrics.enabled", false),
TASKS_USE_ENABLED("atlas.tasks.enabled", true),
TASKS_REQUEUE_GRAPH_QUERY("atlas.tasks.requeue.graph.query", false),
TASKS_IN_PROGRESS_GRAPH_QUERY("atlas.tasks.inprogress.graph.query", false),
TASKS_REQUEUE_POLL_INTERVAL("atlas.tasks.requeue.poll.interval.millis", 60000),
TASKS_QUEUE_SIZE("atlas.tasks.queue.size", 1000),
SESSION_TIMEOUT_SECS("atlas.session.timeout.secs", -1),
Expand Down
64 changes: 48 additions & 16 deletions repository/src/main/java/org/apache/atlas/repository/store/graph/v2/EntityGraphMapper.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -94,6 +94,7 @@
import static org.apache.atlas.model.instance.EntityMutations.EntityOperation.DELETE;
import static org.apache.atlas.model.instance.EntityMutations.EntityOperation.PARTIAL_UPDATE;
import static org.apache.atlas.model.instance.EntityMutations.EntityOperation.UPDATE;
import static org.apache.atlas.model.tasks.AtlasTask.Status.IN_PROGRESS;
import static org.apache.atlas.model.typedef.AtlasStructDef.AtlasAttributeDef.Cardinality.SET;
import static org.apache.atlas.repository.Constants.*;
import static org.apache.atlas.repository.graph.GraphHelper.getClassificationEdge;
Expand Down Expand Up @@ -3569,7 +3570,7 @@ public void deleteClassification(String entityGuid, String classificationName) t
// Get in progress task to see if there already is a propagation for this particular vertex
List<AtlasTask> inProgressTasks = taskManagement.getInProgressTasks();
for (AtlasTask task : inProgressTasks) {
if (isTaskMatchingWithVertexIdAndEntityGuid(task, classificationVertex.getIdForDisplay(), entityGuid)) {
if (IN_PROGRESS.equals(task.getStatus()) && isTaskMatchingWithVertexIdAndEntityGuid(task, classificationVertex.getIdForDisplay(), entityGuid)) {
throw new AtlasBaseException(AtlasErrorCode.CLASSIFICATION_CURRENTLY_BEING_PROPAGATED, classificationName);
}
}
Expand Down Expand Up @@ -4773,25 +4774,55 @@ public List<AtlasVertex> linkBusinessPolicy(String policyId, Set<String> linkGui

updateModificationMetadata(ev);

cacheDifferentialEntity(ev, existingValues);
cacheDifferentialEntity(ev, existingValues, ev.getMultiValuedSetProperty(NON_COMPLIANT_ASSET_POLICY_GUIDS, String.class));
}).collect(Collectors.toList());
}


public List<AtlasVertex> unlinkBusinessPolicy(String policyId, Set<String> unlinkGuids) {
return unlinkGuids.stream().map(guid -> AtlasGraphUtilsV2.findByGuid(graph, guid)).filter(Objects::nonNull).filter(ev -> {
Set<String> existingValues = ev.getMultiValuedSetProperty(ASSET_POLICY_GUIDS, String.class);
return existingValues.contains(policyId);
}).peek(ev -> {
Set<String> existingValues = ev.getMultiValuedSetProperty(ASSET_POLICY_GUIDS, String.class);
existingValues.remove(policyId);
ev.removePropertyValue(ASSET_POLICY_GUIDS, policyId);
ev.setProperty(ASSET_POLICIES_COUNT, existingValues.size());
if (policyId == null || unlinkGuids == null || unlinkGuids.isEmpty()) {
throw new IllegalArgumentException("PolicyId and unlinkGuids must not be null or empty");
}

updateModificationMetadata(ev);
return unlinkGuids.stream()
.map(guid -> AtlasGraphUtilsV2.findByGuid(graph, guid))
.filter(Objects::nonNull)
.filter(vertex -> isPolicyLinked(vertex, policyId))
.map(vertex -> updateVertexPolicy(vertex, policyId))
.collect(Collectors.toList());
}

cacheDifferentialEntity(ev, existingValues);
}).collect(Collectors.toList());
private boolean isPolicyLinked(AtlasVertex vertex, String policyId) {
Set<String> compliantPolicies = getMultiValuedSetProperty(vertex, ASSET_POLICY_GUIDS);
Set<String> nonCompliantPolicies = getMultiValuedSetProperty(vertex, NON_COMPLIANT_ASSET_POLICY_GUIDS);
return compliantPolicies.contains(policyId) || nonCompliantPolicies.contains(policyId);
}

private AtlasVertex updateVertexPolicy(AtlasVertex vertex, String policyId) {
Set<String> compliantPolicies = getMultiValuedSetProperty(vertex, ASSET_POLICY_GUIDS);
Set<String> nonCompliantPolicies = getMultiValuedSetProperty(vertex, NON_COMPLIANT_ASSET_POLICY_GUIDS);

boolean removed = compliantPolicies.remove(policyId);
removed |= nonCompliantPolicies.remove(policyId);

if (removed) {
vertex.removePropertyValue(ASSET_POLICY_GUIDS, policyId);
vertex.removePropertyValue(NON_COMPLIANT_ASSET_POLICY_GUIDS, policyId);

int totalPolicies = compliantPolicies.size() + nonCompliantPolicies.size();
vertex.setProperty(ASSET_POLICIES_COUNT, totalPolicies);

updateModificationMetadata(vertex);
cacheDifferentialEntity(vertex, compliantPolicies, nonCompliantPolicies);
}

return vertex;
}

private Set<String> getMultiValuedSetProperty(AtlasVertex vertex, String propertyName) {
return Optional.ofNullable(vertex.getMultiValuedSetProperty(propertyName, String.class))
.map(HashSet::new)
.orElseGet(HashSet::new);
}

public List<AtlasVertex> linkMeshEntityToAssets(String meshEntityId, Set<String> linkGuids) throws AtlasBaseException {
Expand Down Expand Up @@ -4925,11 +4956,12 @@ public AtlasVertex moveBusinessPolicies(Set<String> policyIds, String assetId, S
return assetVertex;
}

private void cacheDifferentialEntity(AtlasVertex ev, Set<String> existingValues) {
private void cacheDifferentialEntity(AtlasVertex ev, Set<String> complaint, Set<String> nonComplaint) {
AtlasEntity diffEntity = new AtlasEntity(ev.getProperty(TYPE_NAME_PROPERTY_KEY, String.class));
setEntityCommonAttributes(ev, diffEntity);
diffEntity.setAttribute(ASSET_POLICY_GUIDS, existingValues);
diffEntity.setAttribute(ASSET_POLICIES_COUNT, existingValues.size());
diffEntity.setAttribute(ASSET_POLICY_GUIDS, complaint);
diffEntity.setAttribute(NON_COMPLIANT_ASSET_POLICY_GUIDS, nonComplaint);
diffEntity.setAttribute(ASSET_POLICIES_COUNT, complaint.size() + nonComplaint.size());

RequestContext requestContext = RequestContext.get();
requestContext.cacheDifferentialEntity(diffEntity);
Expand Down
6 changes: 5 additions & 1 deletion repository/src/main/java/org/apache/atlas/tasks/TaskManagement.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -208,7 +208,11 @@ public List<AtlasTask> getByGuidsES(List<String> guids) throws AtlasBaseExceptio
}

public List<AtlasTask> getInProgressTasks() {
return registry.getInProgressTasks();
if(AtlasConfiguration.TASKS_IN_PROGRESS_GRAPH_QUERY.getBoolean()) {
return registry.getInProgressTasks();
} else {
return registry.getInProgressTasksES();
}
}

public void deleteByGuid(String guid) throws AtlasBaseException {
Expand Down
38 changes: 37 additions & 1 deletion repository/src/main/java/org/apache/atlas/tasks/TaskRegistry.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,7 @@
import org.apache.atlas.repository.graphdb.AtlasVertex;
import org.apache.atlas.repository.graphdb.DirectIndexQueryResult;
import org.apache.atlas.type.AtlasType;
import org.apache.atlas.utils.AtlasPerfMetrics;
import org.apache.commons.collections.CollectionUtils;
import org.apache.commons.collections4.ListUtils;
import org.slf4j.Logger;
Expand All @@ -46,6 +47,7 @@
import java.util.Iterator;
import java.util.LinkedList;
import java.util.List;
import java.util.Arrays;
import java.util.Map;
import java.util.concurrent.TimeUnit;
import java.util.stream.Collectors;
Expand All @@ -57,12 +59,17 @@
@Component
public class TaskRegistry {
private static final Logger LOG = LoggerFactory.getLogger(TaskRegistry.class);
public static final int TASK_FETCH_BATCH_SIZE = 100;
public static final List<Map<String, Object>> SORT_ARRAY = Collections.singletonList(mapOf(Constants.TASK_CREATED_TIME, mapOf("order", "asc")));

private AtlasGraph graph;
private TaskService taskService;
private int queueSize;
private boolean useGraphQuery;

private static final List<Map<String, Object>> STATUS_CLAUSE_LIST = Arrays.asList(mapOf("match", mapOf(TASK_STATUS, AtlasTask.Status.IN_PROGRESS.toString())));
private static final Map<String, Object> QUERY_MAP = mapOf("bool", mapOf("must", STATUS_CLAUSE_LIST));

@Inject
public TaskRegistry(AtlasGraph graph, TaskService taskService) {
this.graph = graph;
Expand Down Expand Up @@ -128,6 +135,35 @@ public List<AtlasTask> getInProgressTasks() {
return ret;
}

public List<AtlasTask> getInProgressTasksES() {
AtlasPerfMetrics.MetricRecorder metric = RequestContext.get().startMetricRecord("getInProgressTasksES");
List<AtlasTask> ret = new ArrayList<>();
Map<String, Object> dsl = mapOf("query", QUERY_MAP);
dsl.put("sort", SORT_ARRAY);
dsl.put("size", TASK_FETCH_BATCH_SIZE);
int from = 0;
while(true) {
dsl.put("from", from);
TaskSearchParams taskSearchParams = new TaskSearchParams();
taskSearchParams.setDsl(dsl);
try {
List<AtlasTask> results = taskService.getTasks(taskSearchParams).getTasks();
if (results.isEmpty()){
break;
}
ret.addAll(results);
from += TASK_FETCH_BATCH_SIZE;
} catch (AtlasBaseException exception) {
LOG.error("Error fetching in progress tasks from ES, redirecting to GraphQuery", exception);
exception.printStackTrace();
ret = getInProgressTasks();
return ret;
}
}
RequestContext.get().endMetricRecord(metric);
return ret;
}

@GraphTransaction
public void updateStatus(AtlasVertex taskVertex, AtlasTask task) {
if (taskVertex == null) {
Expand Down Expand Up @@ -530,7 +566,7 @@ private AtlasVertex createVertex(AtlasTask task) {
return taskService.createTaskVertex(task);
}

private Map<String, Object> mapOf(String key, Object value) {
private static Map<String, Object> mapOf(String key, Object value) {
Map<String, Object> map = new HashMap<>();
map.put(key, value);

Expand Down
Loading