opendev/gerrit
Code Issues Proposed changes

Merge "Add REST endpoint to kill a task"

Browse Source
This commit is contained in:
Edwin Kempin
2014-07-10 07:57:53 +00:00
committed by Gerrit Code Review
parent 657c36006e 7e28381f0e
commit 0a76254bb9
5 changed files with 146 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
gerrit-sshd/src/main/java/com/google/gerrit/sshd/commands/KillCommand.java
View File

@@ -16,17 +16,18 @@ package com.google.gerrit.sshd.commands;
import com.google.gerrit.common.data.GlobalCapability;
import com.google.gerrit.extensions.annotations.RequiresCapability;
import com.google.gerrit.server.config.DeleteTask;
import com.google.gerrit.server.config.TaskResource;
import com.google.gerrit.server.git.WorkQueue;
import com.google.gerrit.server.git.WorkQueue.Task;
import com.google.gerrit.server.util.IdGenerator;
import com.google.gerrit.sshd.AdminHighPriorityCommand;
import com.google.gerrit.sshd.SshCommand;
import com.google.inject.Inject;
import org.kohsuke.args4j.Argument;
import java.util.HashSet;
import java.util.Set;
import java.util.ArrayList;
import java.util.List;
/** Kill a task in the work queue. */
@AdminHighPriorityCommand
@@ -35,25 +36,20 @@ final class KillCommand extends SshCommand {
@Inject
private WorkQueue workQueue;
private final Set<Integer> taskIds = new HashSet<>();
@Inject
private DeleteTask deleteTask;
@Argument(index = 0, multiValued = true, required = true, metaVar = "ID")
void addTaskId(final String taskId) {
int p = 0;
while (p < taskId.length() - 1 && taskId.charAt(p) == '0') {
p++;
}
taskIds.add((int) Long.parseLong(taskId.substring(p), 16));
}
private final List<String> taskIds = new ArrayList<>();
@Override
protected void run() {
for (final Integer id : taskIds) {
final Task<?> task = workQueue.getTask(id);
if (task != null) {
task.cancel(true);
} else {
stderr.print("kill: " + IdGenerator.format(id) + ": No such task\n");
for (String id : taskIds) {
try {
Task<?> task = workQueue.getTask((int) Long.parseLong(id, 16));
deleteTask.apply(new TaskResource(task), null);
} catch (NumberFormatException e) {
stderr.print("kill: " + id + ": No such task\n");
}
}
}