X-Git-Url: http://mj.ucw.cz/gitweb/?a=blobdiff_plain;f=bq;h=6fb7a1733c2b94bcd50ed0a99cee875c246d3949;hb=53213259a33f355dde552017877f183d17030736;hp=5a2b7863ec0fff3375874dbf5b56a1aece8f0cca;hpb=c52365ee561bcd84c6a36d301d6959b2c68b14a7;p=bex.git

diff --git a/bq b/bq
index 5a2b786..6fb7a17 100755
--- a/bq
+++ b/bq
@@ -1,19 +1,158 @@
 #!/usr/bin/perl
-# Batch EXecutor 2.0
+# Batch EXecutor 2.0 -- Show Queued Jobs
 # (c) 2011 Martin Mares <mj@ucw.cz>
 
 use strict;
 use warnings;
+use Getopt::Long;
+use POSIX;
 
 use lib 'lib';
 use BEX;
 
-my $queue = BEX::Queue->new;
-for my $m (keys %BEX::Config::machines) {
-	print "$m:\n";
-	my @q = $queue->scan($m);
-	for my $j (@q) {
-		my $job = $queue->job_metadata($j);
-		print "\t$j (", $job->attr('Subject'), ")\n";
+my $op_by_job;
+my $op_by_host;
+my $op_rm;
+my $op_move_to;
+
+my $queue_name;
+my $given_job;
+
+GetOptions(
+	"by-job!" => \$op_by_job,
+	"h|by-host!" => \$op_by_host,
+	"rm!" => \$op_rm,
+	"move-to=s" => \$op_move_to,
+	"j|job=s" => \$given_job,
+	"q|queue=s" => \$queue_name,
+) or die <<AMEN ;
+Usage: bq [<options and actions>] [[!]<machine-or-class> ...]
+
+Actions:
+    --by-job		Show jobs sorted by job ID (default)
+-h, --by-host		Show jobs sorted by host
+    --rm		Remove jobs from the queue
+    --move-to=<queue>	Move jobs to a different queue
+
+Options:
+-j, --job=<id>		Act on the specified job (default: on all)
+-q, --queue=<name>	Act on the given queue
+AMEN
+
+my @machines = BEX::Config::parse_machine_list(@ARGV ? @ARGV : '*');
+my $queue = BEX::Queue->new($queue_name);
+
+# Select jobs
+my %jobs = ();
+my %machs = ();
+for my $m (@machines) {
+	for my $j ($queue->scan($m)) {
+		if (defined $given_job) {
+			next if $j ne $given_job;
+		}
+		push @{$jobs{$j}}, $m;
+		push @{$machs{$m}}, $j;
+	}
+}
+
+sub do_ls();
+sub do_rm();
+sub do_move_to();
+
+my $ops = 0 + defined($op_by_host) + defined($op_by_job) + defined($op_rm) + defined($op_move_to);
+if ($ops > 1) { die "Multiple actions are not allowed\n"; }
+
+if ($op_rm) { do_rm(); }
+elsif (defined $op_move_to) { do_move_to(); }
+else { do_ls(); }
+exit 0;
+
+sub do_ls()
+{
+	my %stat = ();
+	my %mach_locked = ();
+	for my $m (keys %machs) {
+		$mach_locked{$m} = $queue->is_locked($m, undef);
+		for my $j (@{$machs{$m}}) {
+			my $st = $queue->read_job_status($m, $j);
+			if (defined($st->{'Time'}) && defined($st->{'Status'})) {
+				$stat{$m}{$j} = ' [' . $st->{'Status'} . ' on ' .
+						POSIX::strftime('%Y-%m-%d', localtime $st->{'Time'}) . ']';
+			} else {
+				$stat{$m}{$j} = '';
+			}
+			if ($mach_locked{$m} || $queue->is_locked($m, $j)) {
+				$stat{$m}{$j} .= ' [LOCKED]';
+			}
+		}
+	}
+
+	if ($queue->is_locked(undef, undef)) {
+		print "### Queue lock present\n\n";
+	}
+
+	if ($op_by_host) {
+		for my $m (sort keys %machs) {
+			print "$m", ($mach_locked{$m} ? ' [LOCKED]' : ''), "\n";
+			for my $j (@{$machs{$m}}) {
+				print "\t" . $queue->job_name($j) . $stat{$m}{$j}, "\n";
+			}
+		}
+	} else {
+		for my $j (sort keys %jobs) {
+			print $queue->job_name($j), "\n";
+			for my $m (sort @{$jobs{$j}}) {
+				print "\t$m", $stat{$m}{$j}, "\n";
+			}
+		}
+	}
+}
+
+sub do_rm()
+{
+	my $err = 0;
+	for my $m (sort keys %machs) {
+		for my $j (sort @{$machs{$m}}) {
+			if (!$queue->lock($m, $j)) {
+				print STDERR "Cannot remove $m:", $queue->job_name($j), ", it is locked\n";
+				$err = 1;
+			} else {
+				$queue->update_job_status($m, $j, 'REMOVED');
+				$queue->remove($m, $j);
+				print "Removed $m:", $queue->job_name($j), "\n";
+			}
+		}
+	}
+	$queue->unlock;
+	exit $err;
+}
+
+sub do_move_to()
+{
+	my $err = 0;
+	my $dest = BEX::Queue->new($op_move_to);
+	$dest->{'Name'} ne $queue->{'Name'} or die "Moving to the same queue is not permitted\n";
+	for my $j (sort keys %jobs) {
+		my $job = BEX::Job->new_from_file($queue->job_file($j));
+		for my $m (sort @{$jobs{$j}}) {
+			if (!$queue->lock($m, $j)) {
+				print STDERR "Cannot move $m:", $queue->job_name($j), ", it is locked\n";
+				$err = 1;
+			} else {
+				my $enq = $dest->enqueue($m, $job);
+				if ($enq) {
+					$dest->update_job_status($m, $job->id, 'NEW', 'Moved to this queue');
+				} else {
+					$dest->log($m, $job->id, 'REQUEUE', 'Moved to this queue');
+				}
+				$queue->update_job_status($m, $job->id, 'REMOVED', 'Moved from this queue');
+				$queue->remove($m, $j);
+				print "Moved $m:", $dest->job_name($j);
+				print " (already queued)" if !$enq;
+				print "\n";
+			}
+		}
 	}
+	$queue->unlock;
+	exit $err;
 }