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

[Enhancement][Log] Add pending to running state change log for task #6831

Merged
merged 2 commits into from
Jun 8, 2022
Merged

[Enhancement][Log] Add pending to running state change log for task #6831

Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
02fdecb
Add pending to running state change log
Astralidea Jun 2, 2022
a8c611f
add log for clearUnfinishedTaskRun
Astralidea Jun 2, 2022
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
Prev Previous commit
add log for clearUnfinishedTaskRun
  • Loading branch information
@Astralidea
Astralidea committed Jun 2, 2022
commit a8c611f05ac45f1fd2c74ce5653f5dcdb0f47b6d
31 changes: 24 additions & 7 deletions fe/fe-core/src/main/java/com/starrocks/scheduler/TaskManager.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -105,11 +105,15 @@ private void clearUnfinishedTaskRun() {
Iterator<Long> pendingIter = taskRunManager.getPendingTaskRunMap().keySet().iterator();
while (pendingIter.hasNext()) {
Queue<TaskRun> taskRuns = taskRunManager.getPendingTaskRunMap().get(pendingIter.next());
for (TaskRun taskRun : taskRuns) {
while (!taskRuns.isEmpty()) {
TaskRun taskRun = taskRuns.poll();
taskRun.getStatus().setErrorMessage("Fe abort the task");
taskRun.getStatus().setErrorCode(-1);
taskRun.getStatus().setState(Constants.TaskRunState.FAILED);
taskRunManager.getTaskRunHistory().addHistory(taskRun.getStatus());
TaskRunStatusChange statusChange = new TaskRunStatusChange(taskRun.getTaskId(), taskRun.getStatus(),
Constants.TaskRunState.PENDING, Constants.TaskRunState.FAILED);
GlobalStateMgr.getCurrentState().getEditLog().logUpdateTaskRun(statusChange);
}
pendingIter.remove();
}
Expand All @@ -119,8 +123,12 @@ private void clearUnfinishedTaskRun() {
taskRun.getStatus().setErrorMessage("Fe abort the task");
taskRun.getStatus().setErrorCode(-1);
taskRun.getStatus().setState(Constants.TaskRunState.FAILED);
taskRun.getStatus().setFinishTime(System.currentTimeMillis());
runningIter.remove();
taskRunManager.getTaskRunHistory().addHistory(taskRun.getStatus());
TaskRunStatusChange statusChange = new TaskRunStatusChange(taskRun.getTaskId(), taskRun.getStatus(),
Constants.TaskRunState.RUNNING, Constants.TaskRunState.FAILED);
GlobalStateMgr.getCurrentState().getEditLog().logUpdateTaskRun(statusChange);
}
} finally {
taskRunUnlock();
Expand Down Expand Up @@ -380,7 +388,7 @@ public void replayUpdateTaskRun(TaskRunStatusChange statusChange) {
Constants.TaskRunState fromStatus = statusChange.getFromStatus();
Constants.TaskRunState toStatus = statusChange.getToStatus();
Long taskId = statusChange.getTaskId();
if (fromStatus == Constants.TaskRunState.PENDING && toStatus == Constants.TaskRunState.RUNNING) {
if (fromStatus == Constants.TaskRunState.PENDING) {
Queue<TaskRun> taskRunQueue = taskRunManager.getPendingTaskRunMap().get(taskId);
if (taskRunQueue == null) {
return;
Expand All @@ -392,12 +400,21 @@ public void replayUpdateTaskRun(TaskRunStatusChange statusChange) {

TaskRun pendingTaskRun = taskRunQueue.poll();
TaskRunStatus status = pendingTaskRun.getStatus();
if (status.getQueryId().equals(statusChange.getQueryId())) {
status.setState(Constants.TaskRunState.RUNNING);
taskRunManager.getRunningTaskRunMap().put(taskId, pendingTaskRun);
if (taskRunQueue.size() == 0) {
taskRunManager.getPendingTaskRunMap().remove(taskId);

if (toStatus == Constants.TaskRunState.RUNNING) {
if (status.getQueryId().equals(statusChange.getQueryId())) {
status.setState(Constants.TaskRunState.RUNNING);
taskRunManager.getRunningTaskRunMap().put(taskId, pendingTaskRun);
}
// for fe restart, should keep logic same as clearUnfinishedTaskRun
} else if (toStatus == Constants.TaskRunState.FAILED) {
status.setErrorMessage(statusChange.getErrorMessage());
status.setErrorCode(statusChange.getErrorCode());
status.setState(Constants.TaskRunState.FAILED);
taskRunManager.getTaskRunHistory().addHistory(status);
}
if (taskRunQueue.size() == 0) {
taskRunManager.getPendingTaskRunMap().remove(taskId);
}
} else if (fromStatus == Constants.TaskRunState.RUNNING &&
(toStatus == Constants.TaskRunState.SUCCESS || toStatus == Constants.TaskRunState.FAILED)) {
Expand Down