use strict;
use POSIX;
use FileHandle;
+use File::Copy;
use GDBM_File;
use MLDBM qw(GDBM_File Storable);
use WannaBuild;
our ($verbose, $mail_logs, $list_order, $list_state,
$curr_date, $op_mode, $user, $real_user, $distribution,
$fail_reason, $opt_override, $import_from, $export_to, $opt_create_db,
- $transactlog, %db, %otherdb, %otherdb_lock, %prioval, %sectval,
+ %db, %otherdb, %otherdb_lock, %prioval, %sectval,
$info_all_dists, $arch,
$category, %catval, %short_category,
$short_date, $list_min_age, $dbbase, @curr_time,
- $build_priority, %new_vers, $binNMUver, %merge_srcvers, %merge_binsrc);
+ $build_priority, %new_vers, $binNMUver, %merge_srcvers, %merge_binsrc,
+ $lock_for_pid, $transactional);
# global vars
$ENV{'PATH'} = "/bin:/usr/bin:/usr/local/bin";
$curr_date = strftime("%Y %b %d %H:%M:%S",@curr_time);
$short_date = strftime("%m/%d/%y",@curr_time);
$| = 1;
+$lock_for_pid = -1; # -1 means normal procedure
+$transactional = 0; # 0 means: work on main copy
# map program invocation names to operation modes
my %prognames = ( "uploaded-build" => "set-uploaded",
# special actions
import => { arg => \$import_from, mode => "import" },
export => { arg => \$export_to, mode => "export" },
+ "lock-for" => { arg => \$lock_for_pid, mode => "lock-for" },
+ "unlock-for" => { arg => \$lock_for_pid, mode => "unlock-for" },
+ "act-on-behalve-of" => { arg => \$lock_for_pid },
+ "start-transaction" => { mode => "start-transaction" },
+ "commit-transaction" => { mode => "commit-transaction" },
+ "transactional" => { flag => \$transactional },
"manual-edit" => { mode => "manual-edit" },
"create-maintenance-lock" => { mode => "maintlock-create" },
"remove-maintenance-lock" => { mode => "maintlock-remove" },
$distribution ||= "unstable";
die "Bad distribution '$distribution'\n"
if !isin($distribution, keys %conf::distributions);
-$conf::dbbase =~ m#^([^/]+/)#;
-$transactlog = "$conf::basedir/$1$conf::transactlog";
if ($verbose) {
my $version = '$Revision: db181a534e9d $ $Date: 2008/03/26 06:20:22 $ $Author: rmurray $';
}
if (!@ARGV && !isin( $op_mode, qw(list merge-quinn merge-partial-quinn import export
- merge-packages manual-edit maintlock-create
+ merge-packages manual-edit maintlock-create lock-for unlock-for
+ start-transaction commit-transaction
merge-sources maintlock-remove clean-db))) {
warn "No packages given.\n";
usage();
while(!eof(STDIN)) {
$line = <STDIN>;
last if $line eq ".\n";
- $line = ".\n" if $line eq "\n";
$fail_reason .= $line;
}
chomp( $fail_reason );
waitfor_maintlock() if $op_mode !~ /^(?:merge-|clean-db$)/;
if (!-f db_filename( $distribution ) && !$opt_create_db) {
- die "Database for $distribution doesn't exist\n";
+ if ($transactional) {
+ die "No running transaction for $distribution\n";
+ } else {
+ die "Database for $distribution doesn't exist\n";
+ }
+}
+
+# Locking for another process means that a longer running process (most likely
+# wb) wants to do several steps at once, and manages the locks.
+if ($op_mode eq "lock-for") {
+ lock_db( $distribution );
+ exit 0;
}
+if ($op_mode eq "unlock-for") {
+ unlock_db( $distribution );
+ exit 0;
+}
+
lock_db( $distribution );
+
+if ($op_mode eq "start-transaction") {
+ copy ( db_filename_master( $distribution ), db_filename_transaction( $distribution ))
+ or die "Copy failed: $!";
+ open LOG, ">", db_transactlog_transaction( $distribution )
+ or die "Could not create logfile for transaction: $!";
+ close LOG;
+ exit 0;
+}
+
+if ($op_mode eq "commit-transaction") {
+ # we need to copy here to preserve the owner and group of the file
+ copy ( db_filename_transaction( $distribution ), db_filename_master( $distribution ))
+ or die "Copy failed: $!";
+ unlink db_filename_transaction( $distribution );
+ open TLOG, "<", db_transactlog_transaction( $distribution )
+ or die "Could not open logfile from transaction: $!";
+ open LOG, ">>", db_transactlog_master( $distribution )
+ or die "Could not open logfile: $!";
+ while (<TLOG>) { print LOG $_ };
+ close TLOG;
+ close LOG;
+ unlink db_transactlog_transaction( $distribution );
+ exit 0;
+}
+
END {
- untie %db;
- unlock_db( $distribution );
+ untie %db;
+ if ($lock_for_pid == -1) {
+ unlock_db( $distribution );
+ }
foreach (keys %conf::distributions) {
untie %{$otherdb{$_}} if tied(%{$otherdb{$_}});
unlock_db( $_ ) if $otherdb_lock{$_};
my $val = $pkg->{$key};
chomp( $val );
$val = "\n$val" if isin( $key, qw(Failed Old-Failed));
- $val =~ s/\n/\n /g;
+ $val =~ s/\n/\n /g;
printf " %-20s: %s\n", $key, $val;
}
foreach $key (sort keys %$pkg) {
my $val = $pkg->{$key};
chomp( $val );
$val = "\n$val" if isin( $key, qw(Failed Old-Failed));
- $val =~ s/\n/\n /g;
+ $val =~ s/\n/\n /g;
printf " %-20s: %s\n", $key, $val;
}
}
sub lock_db {
my $dist = shift;
my $try = 0;
- my $lockfile = db_filename($dist) . ".lock";
+ my $lockfile = db_lockfilename($dist);
local( *F );
print "Locking $dist database\n" if $verbose >= 2;
unlink( $lockfile );
goto repeat;
}
+ if ($pid == $lock_for_pid) {
+ # We are allowed to use this lock.
+ return;
+ }
warn "Database locked by $usr -- please wait\n" if $try == 0;
}
if (++$try > 200) {
}
die "Can't create lock file $lockfile: $!\n";
}
- F->print("$$ $real_user\n");
+ my $pid = $lock_for_pid == -1 ? $$ : $lock_for_pid;
+ F->print("$pid $real_user\n");
F->close();
}
sub unlock_db {
my $dist = shift;
- my $lockfile = db_filename($dist) . ".lock";
+ my $lockfile = db_lockfilename($dist);
if (!$main::keep_lock{$dist}) {
print "Unlocking $dist database\n" if $verbose >= 2;
}
sub create_maintlock {
- my $lockfile = db_filename("maintenance") . ".lock";
+ my $lockfile = db_lockfilename("maintenance");
my $try = 0;
local( *F );
}
sub remove_maintlock {
- my $lockfile = db_filename("maintenance") . ".lock";
+ my $lockfile = db_lockfilename("maintenance");
print "Removing maintenance lock\n" if $verbose >= 2;
unlink $lockfile;
}
sub waitfor_maintlock {
- my $lockfile = db_filename("maintenance") . ".lock";
+ my $lockfile = db_lockfilename("maintenance");
my $try = 0;
local( *F );
return if $op_mode eq "manual-edit"; # no checks then
# check for required fields
- if (!exists $pkg->{'Package'} || !exists $pkg->{'User'}) {
+ if (exists $pkg->{'User'}) {
+ return;
+ }
+ if (!exists $pkg->{'Package'}) {
print STDERR "Bad entry: ",
join( "\n", map { "$_: $pkg->{$_}" } keys %$pkg ), "\n";
die "Database entry lacks Package or User: field\n";
if (!defined($ui->{'User'}));
foreach $key (keys %{$ui}) {
my $val = $ui->{$key};
- chomp($val);
- $val =~ s/\n/\n /g;
+ $val =~ s/\n*$//;
+ $val =~ s/^/ /mg;
+ $val =~ s/^ $/ ./mg;
print F "$key: $val\n";
}
print F "\n";
else {
foreach $key (keys %{$pkg}) {
my $val = $pkg->{$key};
- chomp( $val );
- $val =~ s/\n/\n /g;
+ $val =~ s/\n*$//;
+ $val =~ s/^/ /mg;
+ $val =~ s/^ $/ ./mg;
print F "$key: $val\n";
}
print F "\n";
"changed from $prevstate to $pkg->{'State'} ".
"by $real_user as $user";
+ my $transactlog = db_transactlog( $distribution );
if (!open( LOG, ">>$transactlog" )) {
warn "Can't open log file $transactlog: $!\n";
return;
}
sub db_filename {
+ my $dist = shift;
+ return $transactional ? db_filename_transaction($dist) : db_filename_master($dist);
+}
+sub db_filename_master {
my $dist = shift;
return "$conf::basedir/$conf::dbbase-$dist";
}
+sub db_filename_transaction {
+ my $dist = shift;
+ return "$conf::basedir/$conf::dbbase-$dist-transaction";
+}
+
+sub db_lockfilename {
+ my $dist = shift;
+ return db_filename_master($dist) . ".lock";
+}
+
+
+sub db_transactlog {
+ my $dist = shift;
+ return $transactional ? db_transactlog_transaction($dist) : db_transactlog_master($dist);
+}
+sub db_transactlog_master {
+ my $dist = shift;
+ $conf::dbbase =~ m#^([^/]+/)#;
+ return "$conf::basedir/$1$conf::transactlog";
+}
+sub db_transactlog_transaction {
+ my $dist = shift;
+ $conf::dbbase =~ m#^([^/]+/)#;
+ return "$conf::basedir/$1$conf::transactlog-$dist-transaction";
+}
# for parsing input to dep-wait
sub parse_deplist {
if they're out of date.
--dep-wait: Record in the database that the packages are waiting
for some source dependencies to become available
+ --binNMU num: Schedule a re-build of the package with unchanged source, but
+ a new version number (source-version + "+b<num>")
+ --give-back: Mark a package as ready to build that is in state Building,
+ Built or Build-Attempted. To give back a package in state Failed, use
+ --override
--merge-quinn: Merge quinn-diff output into database.
--merge-packages: Merge Packages files into database.
--pretend-avail: Pretend that given packages are available now and give
automatically choosen
--import FILE: Import database from a ASCII file FILE
--export FILE: Export database to a ASCII file FILE
+ --lock-for PID: Locks the database for the process with this pid
+ --unlock-for PID: Unlocks the database for the process with this pid
+ --act-on-behalve-of PID: Ignores the log (if it is held by this pid)
+ --start-transaction: Creates a copy of the state of the database, for
+ use with --transactional. This overrides any previous uncommited
+ transaction. Should only be used after --lock-for
+ --commit-transaction: Atomically moves the copy back to the main, thus
+ commiting the changes
+ --transactional: Flag to indicate that we want to work on the copy
+
The remaining arguments (depending on operation) usually start with
"name_version", the trailer is ignored. This allows to pass the names
of .dsc files, for which file name completion can be used.
projects / wannabuild.git / blobdiff