Skip to content

fix(task): scope user exit preparation to the requesting owner #2741

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
HandSonic wants to merge 1 commit into
base: main
Choose a base branch
from
Open

fix(task): scope user exit preparation to the requesting owner #2741

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
24 changes: 18 additions & 6 deletions ...omain-core/src/main/java/ai/chat2db/community/domain/core/impl/task/LocalTaskManager.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,9 +32,11 @@
import java.util.ArrayList;
import java.util.Collections;
import java.util.Date;
import java.util.HashSet;
import java.util.List;
import java.util.Map;
import java.util.Objects;
import java.util.Set;
import java.util.concurrent.ArrayBlockingQueue;
import java.util.concurrent.FutureTask;
import java.util.concurrent.RejectedExecutionException;
Expand Down Expand Up @@ -65,7 +67,9 @@ public class LocalTaskManager {

private final ReentrantLock lifecycleLock = new ReentrantLock();

private boolean preparingForExit;
private boolean applicationExiting;

private final Set<TaskOwner> exitingOwners = new HashSet<>();

public LocalTaskManager(TaskStorage taskStorage, TaskExecutorRegistry taskExecutorRegistry,
ArtifactService artifactService, ConnectionContextConverter connectionContextConverter,
Expand Down Expand Up @@ -102,7 +106,7 @@ <S extends TaskSpec> Task submit(Task task, TaskEvent createdEvent, S spec, Cont
ConnectInfo connectInfo) {
lifecycleLock.lock();
try {
if (preparingForExit) {
if (applicationExiting || exitingOwners.contains(ownerOf(task))) {
throw new RejectedExecutionException("The application is preparing to exit");
}
Task persistedTask = taskStorage.create(task, createdEvent);
Expand Down Expand Up @@ -193,10 +197,10 @@ void prepareForUserExit(Long userId, Long organizationId) {
new TaskOwner(userId, organizationId));
}

void abortUserExit() {
void abortUserExit(Long userId, Long organizationId) {
lifecycleLock.lock();
try {
preparingForExit = false;
exitingOwners.remove(new TaskOwner(userId, organizationId));
} finally {
lifecycleLock.unlock();
}
Expand All @@ -213,10 +217,14 @@ void shutdown() {
private void terminateActiveTasks(String errorCode, String eventCode, String message, TaskOwner owner) {
lifecycleLock.lock();
try {
if (preparingForExit && owner != null) {
if (applicationExiting && owner != null) {
return;
}
preparingForExit = true;
if (owner == null) {
applicationExiting = true;
} else {
exitingOwners.add(owner);
}
List<Task> activeTasks = taskStorage.listNonTerminalTasks();
List<RunningTask> tasksToAwait = new ArrayList<>();
List<Long> tasksToCleanup = new ArrayList<>();
Expand Down Expand Up @@ -345,6 +353,10 @@ private boolean belongsTo(Task task, Long userId, Long organizationId) {
&& Objects.equals(task.getOrganizationId(), organizationId);
}

private TaskOwner ownerOf(Task task) {
return new TaskOwner(task.getUserId(), task.getOrganizationId());
}

private TaskSubmissionContext extensionContext(Task task, TaskSpec spec, ConnectInfo connectInfo) {
TaskType taskType = TaskType.valueOf(spec.getTaskType());
TaskTargetSnapshot target = spec.getTarget();
Expand Down
3 changes: 2 additions & 1 deletion ...domain-core/src/main/java/ai/chat2db/community/domain/core/impl/task/TaskServiceImpl.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -143,7 +143,8 @@ public void prepareForUserExit() {

@Override
public void abortUserExit() {
localTaskManager.abortUserExit();
TaskOwner owner = currentOwner();
localTaskManager.abortUserExit(owner.userId(), owner.organizationId());
}

@Override
Expand Down
61 changes: 60 additions & 1 deletion ...n-core/src/test/java/ai/chat2db/community/domain/core/impl/task/LocalTaskManagerTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -313,7 +313,7 @@ void abortedUserExitAllowsNewTasksAgain() throws Exception {
taskManager = manager(storage, (spec, context) -> {});
taskManager.prepareForUserExit(null, null);

taskManager.abortUserExit();
taskManager.abortUserExit(null, null);
Task submitted = taskManager.submit(newTask(), event(TaskEventCode.TASK_CREATED.name()),
spec(), null, null);

Expand All @@ -322,6 +322,59 @@ void abortedUserExitAllowsNewTasksAgain() throws Exception {
assertEquals(TaskStatus.SUCCESS.name(), storage.get(submitted.getId()).orElseThrow().getStatus());
}

@Test
void userExitPreparationOnlyRejectsTasksOfTheExitingOwner() throws Exception {
TestTaskStorage storage = new TestTaskStorage();
taskManager = manager(storage, (spec, context) -> {});

taskManager.prepareForUserExit(1L, 10L);

assertThrows(RejectedExecutionException.class,
() -> taskManager.submit(newTask(1L, 10L), event(TaskEventCode.TASK_CREATED.name()),
spec(), null, null));
Task otherOwnerTask = taskManager.submit(newTask(2L, 10L),
event(TaskEventCode.TASK_CREATED.name()), spec(), null, null);

assertNotNull(otherOwnerTask);
assertTrue(storage.awaitTerminal());
assertEquals(TaskStatus.SUCCESS.name(),
storage.get(otherOwnerTask.getId()).orElseThrow().getStatus());
assertTrue(storage.listNonTerminalTasks().isEmpty());
}

@Test
void abortUserExitUnblocksOnlyTheRequestingOwner() throws Exception {
TestTaskStorage storage = new TestTaskStorage();
taskManager = manager(storage, (spec, context) -> {});
taskManager.prepareForUserExit(1L, 10L);
taskManager.prepareForUserExit(2L, 10L);

taskManager.abortUserExit(1L, 10L);

Task firstOwnerTask = taskManager.submit(newTask(1L, 10L),
event(TaskEventCode.TASK_CREATED.name()), spec(), null, null);
assertNotNull(firstOwnerTask);
assertThrows(RejectedExecutionException.class,
() -> taskManager.submit(newTask(2L, 10L), event(TaskEventCode.TASK_CREATED.name()),
spec(), null, null));
}

@Test
void applicationExitRejectsTasksOfAllOwners() {
TestTaskStorage storage = new TestTaskStorage();
taskManager = manager(storage, (spec, context) -> {});

taskManager.shutdown();

assertThrows(RejectedExecutionException.class,
() -> taskManager.submit(newTask(1L, 10L), event(TaskEventCode.TASK_CREATED.name()),
spec(), null, null));
assertThrows(RejectedExecutionException.class,
() -> taskManager.submit(newTask(2L, 10L), event(TaskEventCode.TASK_CREATED.name()),
spec(), null, null));
assertTrue(storage.listNonTerminalTasks().isEmpty());
}

@Test
void executionContextBindingFailureFailsTaskAndCleansRunningRegistry() {
TestTaskStorage storage = new TestTaskStorage();
Expand Down Expand Up @@ -558,10 +611,16 @@ private TaskExtensionManager emptyExtensionManager() {
}

private Task newTask() {
return newTask(null, null);
}

private Task newTask(Long userId, Long organizationId) {
return Task.builder()
.type(TaskType.QUERY_RESULT_EXPORT.name())
.name("Export result")
.target(TaskTargetSnapshot.builder().dataSourceId(1L).build())
.userId(userId)
.organizationId(organizationId)
.build();
}

Expand Down
Loading