opendev/gerrit
Code Issues Proposed changes

Merge "SSH show-queue: option to group output by queue and print queue info"

Browse Source
This commit is contained in:
Edwin Kempin
2016-07-14 07:15:15 +00:00
committed by Gerrit Code Review
parent 93954dd399 eaf64568a7
commit ece1d7db72
4 changed files with 105 additions and 44 deletions
Download Patch File Download Diff File Expand all files Collapse all files

126
gerrit-sshd/src/main/java/com/google/gerrit/sshd/commands/ShowQueue.java
View File

@@ -17,12 +17,15 @@ package com.google.gerrit.sshd.commands;
import static com.google.gerrit.sshd.CommandMetaData.Mode.MASTER_OR_SLAVE;
import com.google.common.base.MoreObjects;
import com.google.common.collect.LinkedListMultimap;
import com.google.common.collect.ListMultimap;
import com.google.gerrit.common.TimeUtil;
import com.google.gerrit.extensions.restapi.AuthException;
import com.google.gerrit.server.IdentifiedUser;
import com.google.gerrit.server.config.ConfigResource;
import com.google.gerrit.server.config.ListTasks;
import com.google.gerrit.server.config.ListTasks.TaskInfo;
import com.google.gerrit.server.git.WorkQueue;
import com.google.gerrit.server.git.WorkQueue.Task;
import com.google.gerrit.sshd.AdminHighPriorityCommand;
import com.google.gerrit.sshd.CommandMetaData;
@@ -39,18 +42,27 @@ import java.util.List;
/** Display the current work queue. */
@AdminHighPriorityCommand
@CommandMetaData(name = "show-queue", description = "Display the background work queues",
runsAt = MASTER_OR_SLAVE)
@CommandMetaData(name = "show-queue",
description = "Display the background work queues",
runsAt = MASTER_OR_SLAVE)
final class ShowQueue extends SshCommand {
@Option(name = "--wide", aliases = {"-w"}, usage = "display without line width truncation")
@Option(name = "--wide", aliases = {"-w"},
usage = "display without line width truncation")
private boolean wide;
@Option(name = "--by-queue", aliases = {"-q"},
usage = "group tasks by queue and print queue info")
private boolean groupByQueue;
@Inject
private ListTasks listTasks;
@Inject
private IdentifiedUser currentUser;
@Inject
private WorkQueue workQueue;
private int columns = 80;
private int maxCommandWidth;
@@ -75,50 +87,78 @@ final class ShowQueue extends SshCommand {
stdout.print("----------------------------------------------"
+ "--------------------------------\n");
List<TaskInfo> tasks;
try {
List<TaskInfo> tasks = listTasks.apply(new ConfigResource());
long now = TimeUtil.nowMs();
boolean viewAll = currentUser.getCapabilities().canViewQueue();
for (TaskInfo task : tasks) {
String start;
switch (task.state) {
case DONE:
case CANCELLED:
case RUNNING:
case READY:
start = format(task.state);
break;
case OTHER:
case SLEEPING:
default:
start = time(now, task.delay);
break;
}
// Shows information about tasks depending on the user rights
if (viewAll || task.projectName == null) {
String command = task.command.length() < maxCommandWidth
? task.command
: task.command.substring(0, maxCommandWidth);
stdout.print(String.format("%8s %-12s %-12s %-4s %s\n",
task.id, start, startTime(task.startTime), "", command));
} else {
String remoteName = task.remoteName != null
? task.remoteName + "/" + task.projectName
: task.projectName;
stdout.print(String.format("%8s %-12s %-4s %s\n",
task.id, start, startTime(task.startTime),
MoreObjects.firstNonNull(remoteName, "n/a")));
}
}
stdout.print("----------------------------------------------"
+ "--------------------------------\n");
stdout.print(" " + tasks.size() + " tasks\n");
tasks = listTasks.apply(new ConfigResource());
} catch (AuthException e) {
throw die(e);
}
boolean viewAll = currentUser.getCapabilities().canViewQueue();
long now = TimeUtil.nowMs();
if (groupByQueue) {
ListMultimap<String, TaskInfo> byQueue = byQueue(tasks);
for (String queueName : byQueue.keySet()) {
WorkQueue.Executor e = workQueue.getExecutor(queueName);
stdout.print(String.format("Queue: %s\n", queueName));
print(byQueue.get(queueName), now, viewAll, e.getCorePoolSize());
}
} else {
print(tasks, now, viewAll, 0);
}
}
private ListMultimap<String, TaskInfo> byQueue(List<TaskInfo> tasks) {
ListMultimap<String, TaskInfo> byQueue = LinkedListMultimap.create();
for (TaskInfo task : tasks) {
byQueue.put(task.queueName, task);
}
return byQueue;
}
private void print(List<TaskInfo> tasks, long now, boolean viewAll,
int threadPoolSize) {
for (TaskInfo task : tasks) {
String start;
switch (task.state) {
case DONE:
case CANCELLED:
case RUNNING:
case READY:
start = format(task.state);
break;
case OTHER:
case SLEEPING:
default:
start = time(now, task.delay);
break;
}
// Shows information about tasks depending on the user rights
if (viewAll || task.projectName == null) {
String command = task.command.length() < maxCommandWidth
? task.command
: task.command.substring(0, maxCommandWidth);
stdout.print(String.format("%8s %-12s %-12s %-4s %s\n",
task.id, start, startTime(task.startTime), "", command));
} else {
String remoteName = task.remoteName != null
? task.remoteName + "/" + task.projectName
: task.projectName;
stdout.print(String.format("%8s %-12s %-4s %s\n",
task.id, start, startTime(task.startTime),
MoreObjects.firstNonNull(remoteName, "n/a")));
}
}
stdout.print("----------------------------------------------"
+ "--------------------------------\n");
stdout.print(" " + tasks.size() + " tasks");
if (threadPoolSize > 0) {
stdout.print(", " + threadPoolSize + " worker threads");
}
stdout.print("\n\n");
}
private static String time(long now, long delay) {