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

DG-1875 setClassification.deleteClassification optimisation fix #3666

Merged
merged 2 commits into from
Oct 27, 2024
Merged

DG-1875 setClassification.deleteClassification optimisation fix #3666

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
517a810
Removed the getInProgressTasks method flow, which is taking 90% of th…
hr2904 Oct 25, 2024
6fc4e7a
Re-added the getInProgressTasks method flow, but with ES fetching mec…
hr2904 Oct 27, 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
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_REQUEUE_GRAPH_QUERY.getBoolean()) {
return registry.getInProgressTasks();
} else {
return registry.getInProgressTasksES();
}
}

public void deleteByGuid(String guid) throws AtlasBaseException {
Expand Down
33 changes: 31 additions & 2 deletions 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 @@ -50,8 +50,7 @@
import java.util.concurrent.TimeUnit;
import java.util.stream.Collectors;

import static org.apache.atlas.repository.Constants.TASK_GUID;
import static org.apache.atlas.repository.Constants.TASK_STATUS;
import static org.apache.atlas.repository.Constants.*;
import static org.apache.atlas.repository.store.graph.v2.AtlasGraphUtilsV2.setEncodedProperty;

@Component
Expand Down Expand Up @@ -128,6 +127,36 @@ public List<AtlasTask> getInProgressTasks() {
return ret;
}

public List<AtlasTask> getInProgressTasksES() {
List<AtlasTask> ret = new ArrayList<>();
int size = 100;
try {
int from = 0;
while(true) {
List statusClauseList = new ArrayList();
statusClauseList.add(mapOf("match", mapOf(TASK_STATUS, AtlasTask.Status.IN_PROGRESS.toString())));

Map<String, Object> dsl = mapOf("query", mapOf("bool", mapOf("must", statusClauseList)));
dsl.put("sort", Collections.singletonList(mapOf(Constants.TASK_CREATED_TIME, mapOf("order", "asc"))));
dsl.put("size", size);
dsl.put("from", from);
TaskSearchParams taskSearchParams = new TaskSearchParams();
taskSearchParams.setDsl(dsl);
List<AtlasTask> results = taskService.getTasks(taskSearchParams).getTasks();
if (results.isEmpty()){
break;
}
ret.addAll(results);
from+=size;
}
} catch (Exception exception) {
LOG.error("Error fetching in progress tasks!", exception);
exception.printStackTrace();
}

return ret;
}

@GraphTransaction
public void updateStatus(AtlasVertex taskVertex, AtlasTask task) {
if (taskVertex == null) {
Expand Down
Loading