Skip to content

Manual cleanup job fetcher implemented #4666

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

Open
sumandas0 wants to merge 5 commits into
base: master
Choose a base branch
from
Open

Manual cleanup job fetcher implemented #4666

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
6aa697a
feat: change static maintaince mode
sumandas0 May 3, 2025
1634c9c
feat: manual change
sumandas0 May 4, 2025
91b5b99
feat: manual efforts
sumandas0 May 4, 2025
4b0aec1
Update TaskQueueWatcher.java
sumandas0 May 4, 2025
3db9335
feat: revert maintainance mode change
sumandas0 May 5, 2025
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
2 changes: 1 addition & 1 deletion .github/workflows/maven.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ on:
- development
- master
- lineageondemand
- optimise_classifications_fetch
- maintainance-dyn

jobs:
build:
Expand Down
66 changes: 33 additions & 33 deletions repository/src/main/java/org/apache/atlas/tasks/TaskExecutor.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -109,7 +109,7 @@ public TaskConsumer(AtlasTask task, TaskRegistry registry, Map<String, TaskFacto

@Override
public void run() {
AtlasVertex taskVertex = null;
// AtlasVertex taskVertex = null;
int attemptCount;

try {
Expand All @@ -120,46 +120,46 @@ public void run() {
}

TASK_LOG.info("Task guid = "+task.getGuid());
taskVertex = registry.getVertex(task.getGuid());
if (taskVertex == null) {
TASK_LOG.warn("Task not scheduled as vertex not found", task);
}

if (task.getStatus() == AtlasTask.Status.COMPLETE) {
TASK_LOG.warn("Task not scheduled as status was COMPLETE!", task);
}

if (perfEnabled) {
perf = AtlasPerfTracer.getPerfTracer(PERF_LOG, String.format("atlas.task:%s", task.getGuid(), task.getType()));
}

statistics.increment(1);

attemptCount = task.getAttemptCount();

if (attemptCount >= MAX_ATTEMPT_COUNT) {
TASK_LOG.warn("Max retry count for task exceeded! Skipping!", task);

task.setStatus(AtlasTask.Status.FAILED);
registry.updateStatus(taskVertex, task);

return;
}
// taskVertex = registry.getVertex(task.getGuid());
// if (taskVertex == null) {
// TASK_LOG.warn("Task not scheduled as vertex not found", task);
// }
//
// if (task.getStatus() == AtlasTask.Status.COMPLETE) {
// TASK_LOG.warn("Task not scheduled as status was COMPLETE!", task);
// }
//
// if (perfEnabled) {
// perf = AtlasPerfTracer.getPerfTracer(PERF_LOG, String.format("atlas.task:%s", task.getGuid(), task.getType()));
// }

// statistics.increment(1);
//
// attemptCount = task.getAttemptCount();
//
// if (attemptCount >= MAX_ATTEMPT_COUNT) {
// TASK_LOG.warn("Max retry count for task exceeded! Skipping!", task);
//
// task.setStatus(AtlasTask.Status.FAILED);
// registry.updateStatus(taskVertex, task);
//
// return;
// }

LOG.info(String.format("Started performing task with guid: %s", task.getGuid()));

performTask(taskVertex, task);
performTask(task);

LOG.info(String.format("Finished task with guid: %s", task.getGuid()));

} catch (InterruptedException exception) {
registry.updateStatus(taskVertex, task);
TASK_LOG.error("{}: {}: Interrupted!", task, exception);
// registry.updateStatus(taskVertex, task);
// TASK_LOG.error("{}: {}: Interrupted!", task, exception);

statistics.error();
} catch (Exception exception) {
if (task != null) {
registry.updateStatus(taskVertex, task);
// registry.updateStatus(taskVertex, task);

TASK_LOG.error("Error executing task. Please perform the operation again!", task, exception);
} else {
Expand All @@ -180,7 +180,7 @@ public void run() {
}
}

private void performTask(AtlasVertex taskVertex, AtlasTask task) throws Exception {
private void performTask(AtlasTask task) throws Exception {
TaskFactory factory = taskTypeFactoryMap.get(task.getType());
if (factory == null) {
LOG.error("taskTypeFactoryMap does not contain task of type: {}", task.getType());
Expand All @@ -189,11 +189,11 @@ private void performTask(AtlasVertex taskVertex, AtlasTask task) throws Exceptio

AbstractTask runnableTask = factory.create(task);

registry.inProgress(taskVertex, task);
// registry.inProgress(taskVertex, task);

runnableTask.run();

registry.complete(taskVertex, task);
// registry.complete(taskVertex, task);

statistics.successPrint();
}
Expand Down
24 changes: 18 additions & 6 deletions repository/src/main/java/org/apache/atlas/tasks/TaskQueueWatcher.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,15 +29,14 @@
import org.slf4j.LoggerFactory;

import javax.annotation.PreDestroy;
import java.util.ArrayList;
import java.util.List;
import java.util.Map;
import java.util.Objects;
import java.util.*;
import java.util.concurrent.CountDownLatch;
import java.util.concurrent.ExecutorService;
import java.util.concurrent.TimeUnit;
import java.util.concurrent.atomic.AtomicBoolean;

import static org.apache.atlas.repository.store.graph.v2.tasks.ClassificationPropagateTaskFactory.CLEANUP_CLASSIFICATION_PROPAGATION;

public class TaskQueueWatcher implements Runnable {
private static final Logger LOG = LoggerFactory.getLogger(TaskQueueWatcher.class);
private static final TaskExecutor.TaskLogger TASK_LOG = TaskExecutor.TaskLogger.getLogger();
Expand Down Expand Up @@ -167,8 +166,21 @@ public void run() {
}

public List<AtlasTask> getTasks() {
run();
return tasks;
Map<String, Object> parameters = Map.of(
"classificationName", "pA29bWAyFerMqOglcN7Chb"
);
AtlasTask newTask = new AtlasTask();
newTask.setParameters(parameters);
newTask.setType(CLEANUP_CLASSIFICATION_PROPAGATION);
newTask.setCreatedBy("admin");
newTask.setStatusPending();
newTask.setAttemptCount(0);
newTask.setClassificationTypeName("pA29bWAyFerMqOglcN7Chb");
newTask.setGuid("my-custom-guid-12345");
newTask.setCreatedTime(new Date());
newTask.setUpdatedTime(new Date());

return new ArrayList<>(List.of(newTask));
}

public void clearTasks() {
Expand Down
Loading