X-Git-Url: http://www.git.stargrave.org/?a=blobdiff_plain;f=lib%2FPublicInbox%2FXapcmd.pm;h=106856369c689007470b7ec364796e29079821f6;hb=14fa0abdcc7b6513540e529375e53edd74ce13e8;hp=74abf9999e88274a55c2eb55b7efaf3b22ac0384;hpb=0e41e076145c51f21151e29d64bd66cd3534d3ba;p=public-inbox.git diff --git a/lib/PublicInbox/Xapcmd.pm b/lib/PublicInbox/Xapcmd.pm index 74abf999..10685636 100644 --- a/lib/PublicInbox/Xapcmd.pm +++ b/lib/PublicInbox/Xapcmd.pm @@ -1,62 +1,113 @@ -# Copyright (C) 2018-2019 all contributors +# Copyright (C) all contributors # License: AGPL-3.0+ package PublicInbox::Xapcmd; use strict; -use warnings; -use PublicInbox::Spawn qw(which spawn); +use PublicInbox::Spawn qw(which popen_rd); +use PublicInbox::Syscall; +use PublicInbox::Admin qw(setup_signals); use PublicInbox::Over; -use PublicInbox::Search; -use File::Temp qw(tempdir); +use PublicInbox::SearchIdx; +use File::Temp 0.19 (); # ->newdir use File::Path qw(remove_tree); -use File::Basename qw(dirname); +use POSIX qw(WNOHANG _exit); # support testing with dev versions of Xapian which installs # commands with a version number suffix (e.g. "xapian-compact-1.5") our $XAPIAN_COMPACT = $ENV{XAPIAN_COMPACT} || 'xapian-compact'; -our @COMPACT_OPT = qw(quiet|q blocksize|b=s no-full|n fuller|F); - -sub commit_changes ($$$) { - my ($ibx, $tmp, $opt) = @_; - - my $reindex = $opt->{reindex}; - my $im = $ibx->importer(0); - $im->lock_acquire if !$opt->{-coarse_lock}; - - while (my ($old, $new) = each %$tmp) { - my @st = stat($old) or die "failed to stat($old): $!\n"; +our @COMPACT_OPT = qw(jobs|j=i quiet|q blocksize|b=s no-full|n fuller|F); + +sub commit_changes ($$$$) { + my ($ibx, $im, $tmp, $opt) = @_; + my $reshard = $opt->{reshard}; + + $SIG{INT} or die 'BUG: $SIG{INT} not handled'; + my (@old_shard, $over_chg); + + # Sort shards highest-to-lowest, since ->xdb_shards_flat + # determines the number of shards to load based on the max; + # and we'd rather xdb_shards_flat to momentarily fail rather + # than load out-of-date shards + my @order = sort { + my ($x) = ($a =~ m!/([0-9]+)/*\z!); + my ($y) = ($b =~ m!/([0-9]+)/*\z!); + ($y // -1) <=> ($x // -1) # we may have non-shards + } keys %$tmp; + + my ($dname) = ($order[0] =~ m!(.*/)[^/]+/*\z!); + my $mode = (stat($dname))[2]; + for my $old (@order) { + next if $old eq ''; # no invalid paths + my $newdir = $tmp->{$old}; + my $have_old = -e $old; + if (!$have_old && !defined($opt->{reshard})) { + die "failed to stat($old): $!"; + } + my $new = $newdir->dirname if defined($newdir); my $over = "$old/over.sqlite3"; if (-f $over) { # only for v1, v2 over is untouched + defined $new or die "BUG: $over exists when culling v2"; $over = PublicInbox::Over->new($over); my $tmp_over = "$new/over.sqlite3"; - $over->connect->sqlite_backup_to_file($tmp_over); + $over->dbh->sqlite_backup_to_file($tmp_over); $over = undef; + $over_chg = 1; } - chmod($st[2] & 07777, $new) or die "chmod $old: $!\n"; - # Xtmpdir->DESTROY won't remove $new after this: - rename($old, "$new/old") or die "rename $old => $new/old: $!\n"; + if (!defined($new)) { # culled shard + push @old_shard, $old; + next; + } + + chmod($mode & 07777, $new) or die "chmod($new): $!\n"; + if ($have_old) { + rename($old, "$new/old") or + die "rename $old => $new/old: $!\n"; + } rename($new, $old) or die "rename $new => $old: $!\n"; - my $prev = "$old/old"; - remove_tree($prev) or die "failed to remove $prev: $!\n"; + push @old_shard, "$old/old" if $have_old; } - $tmp->done; + + # trigger ->check_inodes in read-only daemons + syswrite($im->{lockfh}, '.') if $over_chg && $im; + + remove_tree(@old_shard); + $tmp = undef; if (!$opt->{-coarse_lock}) { $opt->{-skip_lock} = 1; - PublicInbox::Admin::index_inbox($ibx, $opt); - # implicit lock_release - } else { - $im->lock_release; + $im //= $ibx if $ibx->can('eidx_sync'); + if ($im->can('count_shards')) { # v2w or eidx + my $pr = $opt->{-progress}; + my $n = $im->count_shards; + if (defined $reshard && $n != $reshard) { + die +"BUG: counted $n shards after resharding to $reshard"; + } + my $prev = $im->{shards}; + if ($pr && $prev != $n) { + $pr->("shard count changed: $prev => $n\n"); + $im->{shards} = $n; + } + } + my $env = $opt->{-idx_env}; + local %ENV = (%ENV, %$env) if $env; + if ($ibx->can('eidx_sync')) { + $ibx->eidx_sync($opt); + } else { + PublicInbox::Admin::index_inbox($ibx, $im, $opt); + } } } sub cb_spawn { my ($cb, $args, $opt) = @_; # $cb = cpdb() or compact() - defined(my $pid = fork) or die "fork: $!"; + my $seed = rand(0xffffffff); + my $pid = fork // die "fork: $!"; return $pid if $pid > 0; - eval { $cb->($args, $opt) }; - die $@ if $@; - exit 0; + srand($seed); + $SIG{__DIE__} = sub { warn @_; _exit(1) }; # don't jump up stack + $cb->($args, $opt); + _exit(0); } sub runnable_or_die ($) { @@ -65,18 +116,17 @@ sub runnable_or_die ($) { } sub prepare_reindex ($$) { - my ($ibx, $reindex) = @_; - if ($ibx->{version} == 1) { + my ($ibx, $opt) = @_; + if ($ibx->can('eidx_sync')) { # no prep needed for ExtSearchIdx + } elsif ($ibx->version == 1) { my $dir = $ibx->search->xdir(1); - my $xdb = Search::Xapian::Database->new($dir); + my $xdb = $PublicInbox::Search::X{Database}->new($dir); if (my $lc = $xdb->get_metadata('last_commit')) { - $reindex->{from} = $lc; + $opt->{reindex}->{from} = $lc; } } else { # v2 - my $v2w = $ibx->importer(0); - my $max; - $v2w->git_dir_latest(\$max) or return; - my $from = $reindex->{from}; + my $max = $ibx->max_git_epoch // return; + my $from = $opt->{reindex}->{from}; my $mm = $ibx->mm; my $v = PublicInbox::Search::SCHEMA_VERSION(); foreach my $i (0..$max) { @@ -85,104 +135,173 @@ sub prepare_reindex ($$) { } } -sub progress_prepare ($) { - my ($opt) = @_; - if ($opt->{quiet}) { - open my $null, '>', '/dev/null' or - die "failed to open /dev/null: $!\n"; - $opt->{1} = fileno($null); - $opt->{-dev_null} = $null; - } else { - $opt->{-progress} = sub { print STDERR @_ }; - } -} - sub same_fs_or_die ($$) { my ($x, $y) = @_; return if ((stat($x))[0] == (stat($y))[0]); # 0 - st_dev die "$x and $y reside on different filesystems\n"; } -sub run { - my ($ibx, $task, $opt) = @_; # task = 'cpdb' or 'compact' - my $cb = \&${\"PublicInbox::Xapcmd::$task"}; - progress_prepare($opt ||= {}); - my $dir = $ibx->{mainrepo} or die "no mainrepo in inbox\n"; - runnable_or_die($XAPIAN_COMPACT) if $opt->{compact}; - my $reindex; # v1:{ from => $x40 }, v2:{ from => [ $x40, $x40, .. ] } } - my $from; # per-epoch ranges +sub kill_pids { + my ($sig, $pids) = @_; + kill($sig, keys %$pids); # pids may be empty +} - if (!$opt->{-coarse_lock}) { - $reindex = $opt->{reindex} = {}; - $from = $reindex->{from} = []; - require Search::Xapian::WritableDatabase; +sub process_queue { + my ($queue, $cb, $opt) = @_; + my $max = $opt->{jobs} // scalar(@$queue); + if ($max <= 1) { + while (defined(my $args = shift @$queue)) { + $cb->($args, $opt); + } + return; } - $ibx->umask_prepare; - my $old = $ibx->search->xdir(1); - -d $old or die "$old does not exist\n"; + # run in parallel: + my %pids; + local @SIG{keys %SIG} = values %SIG; + setup_signals(\&kill_pids, \%pids); + while (@$queue) { + while (scalar(keys(%pids)) < $max && scalar(@$queue)) { + my $args = shift @$queue; + $pids{cb_spawn($cb, $args, $opt)} = $args; + } - my $tmp = PublicInbox::Xtmpdirs->new; - my $v = $ibx->{version} ||= 1; - my @q; + my $flags = 0; + while (scalar keys %pids) { + my $pid = waitpid(-1, $flags) or last; + last if $pid < 0; + my $args = delete $pids{$pid}; + if ($args) { + die join(' ', @$args)." failed: $?\n" if $?; + } else { + warn "unknown PID($pid) reaped: $?\n"; + } + $flags = WNOHANG if scalar(@$queue); + } + } +} + +sub prepare_run { + my ($ibx, $opt) = @_; + my $tmp = {}; # old shard dir => File::Temp->newdir object or undef + my @queue; # ([old//src,newdir]) - list of args for cpdb() or compact() + my ($old, $misc_ok); + if ($ibx->can('eidx_sync')) { + $misc_ok = 1; + $old = $ibx->xdir(1); + } elsif (my $srch = $ibx->search) { + $old = $srch->xdir(1); + } + if (defined $old) { + -d $old or die "$old does not exist\n"; + } + my $reshard = $opt->{reshard}; + if (defined $reshard && $reshard <= 0) { + die "--reshard must be a positive number\n"; + } # we want temporary directories to be as deep as possible, - # so v2 partitions can keep "xap$SCHEMA_VERSION" on a separate FS. - if ($v == 1) { - my $old_parent = dirname($old); - same_fs_or_die($old_parent, $old); - $tmp->{$old} = tempdir('xapcmd-XXXXXXXX', DIR => $old_parent); - push @q, [ $old, $tmp->{$old} ]; - } else { + # so v2 shards can keep "xap$SCHEMA_VERSION" on a separate FS. + if (defined($old) && $ibx->can('version') && $ibx->version == 1) { + if (defined $reshard) { + warn +"--reshard=$reshard ignored for v1 $ibx->{inboxdir}\n"; + } + my ($dir) = ($old =~ m!(.*?/)[^/]+/*\z!); + same_fs_or_die($dir, $old); + my $v = PublicInbox::Search::SCHEMA_VERSION(); + my $wip = File::Temp->newdir("xapian$v-XXXX", DIR => $dir); + $tmp->{$old} = $wip; + PublicInbox::Syscall::nodatacow_dir($wip->dirname); + push @queue, [ $old, $wip ]; + } elsif (defined $old) { opendir my $dh, $old or die "Failed to opendir $old: $!\n"; + my @old_shards; while (defined(my $dn = readdir($dh))) { - if ($dn =~ /\A\d+\z/) { - my $tmpl = "$dn-XXXXXXXX"; - my $dst = tempdir($tmpl, DIR => $old); - same_fs_or_die($old, $dst); - my $cur = "$old/$dn"; - push @q, [ $cur, $dst ]; - $tmp->{$cur} = $dst; + if ($dn =~ /\A[0-9]+\z/) { + push @old_shards, $dn; } elsif ($dn eq '.' || $dn eq '..') { } elsif ($dn =~ /\Aover\.sqlite3/) { + } elsif ($dn eq 'misc' && $misc_ok) { } else { warn "W: skipping unknown dir: $old/$dn\n" } } - die "No Xapian parts found in $old\n" unless @q; - } - my $im = $ibx->importer(0); - my $max = $opt->{jobs} || scalar(@q); - $ibx->with_umask(sub { - $im->lock_acquire; - - # fine-grained locking if we prepare for reindex - if (!$opt->{-coarse_lock}) { - prepare_reindex($ibx, $reindex); - $im->lock_release; + die "No Xapian shards found in $old\n" unless @old_shards; + + my ($src, $max_shard); + if (!defined($reshard) || $reshard == scalar(@old_shards)) { + # 1:1 copy + $max_shard = scalar(@old_shards) - 1; + } else { + # M:N copy + $max_shard = $reshard - 1; + $src = [ map { "$old/$_" } @old_shards ]; } + foreach my $dn (0..$max_shard) { + my $wip = File::Temp->newdir("$dn-XXXX", DIR => $old); + same_fs_or_die($old, $wip->dirname); + my $cur = "$old/$dn"; + push @queue, [ $src // $cur , $wip ]; + PublicInbox::Syscall::nodatacow_dir($wip->dirname); + $tmp->{$cur} = $wip; + } + # mark old shards to be unlinked + if ($src) { + $tmp->{$_} ||= undef for @$src; + } + } + ($tmp, \@queue); +} - delete($ibx->{$_}) for (qw(mm over search)); # cleanup - my %pids; - while (@q) { - while (scalar(keys(%pids)) < $max && scalar(@q)) { - my $args = shift @q; - $pids{cb_spawn($cb, $args, $opt)} = $args; - } +sub check_compact () { runnable_or_die($XAPIAN_COMPACT) } - while (scalar keys %pids) { - my $pid = waitpid(-1, 0); - my $args = delete $pids{$pid}; - die join(' ', @$args)." failed: $?\n" if $?; - } - } - commit_changes($ibx, $tmp, $opt); - }); +sub _run { # with_umask callback + my ($ibx, $cb, $opt) = @_; + my $im = $ibx->can('importer') ? $ibx->importer(0) : undef; + ($im // $ibx)->lock_acquire; + my ($tmp, $queue) = prepare_run($ibx, $opt); + + # fine-grained locking if we prepare for reindex + if (!$opt->{-coarse_lock}) { + prepare_reindex($ibx, $opt); + ($im // $ibx)->lock_release; + } + + $ibx->cleanup if $ibx->can('cleanup'); + process_queue($queue, $cb, $opt); + ($im // $ibx)->lock_acquire if !$opt->{-coarse_lock}; + commit_changes($ibx, $im, $tmp, $opt); +} + +sub run { + my ($ibx, $task, $opt) = @_; # task = 'cpdb' or 'compact' + my $cb = \&$task; + PublicInbox::Admin::progress_prepare($opt ||= {}); + my $dir; + for my $fld (qw(inboxdir topdir)) { + my $d = $ibx->{$fld} // next; + -d $d or die "$fld=$d does not exist\n"; + $dir = $d; + last; + } + check_compact() if $opt->{compact} && $ibx->search; + + if (!$ibx->can('eidx_sync') && !$opt->{-coarse_lock}) { + # per-epoch ranges for v2 + # v1:{ from => $OID }, v2:{ from => [ $OID, $OID, $OID ] } } + $opt->{reindex} = { from => $ibx->version == 1 ? '' : [] }; + PublicInbox::SearchIdx::load_xapian_writable(); + } + + local @SIG{keys %SIG} = values %SIG; + setup_signals(); + $ibx->with_umask(\&_run, $ibx, $cb, $opt); } sub cpdb_retryable ($$) { my ($src, $pfx) = @_; - if (ref($@) eq 'Search::Xapian::DatabaseModifiedError') { + if (ref($@) =~ /\bDatabaseModifiedError\b/) { warn "$pfx Xapian DB modified, reopening and retrying\n"; $src->reopen; return 1; @@ -195,17 +314,23 @@ sub cpdb_retryable ($$) { } sub progress_pfx ($) { - my @p = split('/', $_[0]); + my ($wip) = @_; # tempdir v2: ([0-9])+-XXXX + my @p = split('/', $wip); # return "xap15/0" for v2, or "xapian15" for v1: - ($p[-1] =~ /\A\d+\z/) ? "$p[-2]/$p[-1]" : $p[-1]; + ($p[-1] =~ /\A([0-9]+)/) ? "$p[-2]/$1" : $p[-1]; +} + +sub kill_compact { # setup_signals callback + my ($sig, $pidref) = @_; + kill($sig, $$pidref) if defined($$pidref); } # xapian-compact wrapper -sub compact ($$) { +sub compact ($$) { # cb_spawn callback my ($args, $opt) = @_; - my ($src, $dst) = @$args; - my ($r, $w); + my ($src, $newdir) = @$args; + my $dst = ref($newdir) ? $newdir->dirname : $newdir; my $pfx = $opt->{-progress_pfx} ||= progress_pfx($src); my $pr = $opt->{-progress}; my $rdr = {}; @@ -214,7 +339,6 @@ sub compact ($$) { defined(my $dfd = $opt->{$fd}) or next; $rdr->{$fd} = $dfd; } - $rdr->{1} = fileno($w) if $pr && pipe($r, $w); # we rely on --no-renumber to keep docids synched to NNTP my $cmd = [ $XAPIAN_COMPACT, '--no-renumber' ]; @@ -227,63 +351,50 @@ sub compact ($$) { } $pr->("$pfx `".join(' ', @$cmd)."'\n") if $pr; push @$cmd, $src, $dst; - my $pid = spawn($cmd, undef, $rdr); - if ($pr) { - close $w or die "close: \$w: $!"; - foreach (<$r>) { + my ($rd, $pid); + local @SIG{keys %SIG} = values %SIG; + setup_signals(\&kill_compact, \$pid); + ($rd, $pid) = popen_rd($cmd, undef, $rdr); + while (<$rd>) { + if ($pr) { s/\r/\r$pfx /g; $pr->("$pfx $_"); } } - my $rp = waitpid($pid, 0); - if ($? || $rp != $pid) { - die join(' ', @$cmd)." failed: $? (pid=$pid, reaped=$rp)\n"; - } + waitpid($pid, 0); + die "@$cmd failed: \$?=$?\n" if $?; } -# Like copydatabase(1), this is horribly slow; and it doesn't seem due -# to the overhead of Perl. -sub cpdb ($$) { - my ($args, $opt) = @_; - my ($old, $new) = @$args; - my $src = Search::Xapian::Database->new($old); - my $tmp = $opt->{compact} ? "$new.compact" : $new; +sub cpdb_loop ($$$;$$) { + my ($src, $dst, $pr_data, $cur_shard, $reshard) = @_; + my ($pr, $fmt, $nr, $pfx); + if ($pr_data) { + $pr = $pr_data->{pr}; + $fmt = $pr_data->{fmt}; + $nr = \($pr_data->{nr}); + $pfx = $pr_data->{pfx}; + } - # like copydatabase(1), be sure we don't overwrite anything in case - # of other bugs: - my $creat = Search::Xapian::DB_CREATE(); - my $dst = Search::Xapian::WritableDatabase->new($tmp, $creat); my ($it, $end); - my ($nr, $tot, $fmt); # progress output - my $pr = $opt->{-progress}; - my $pfx = $opt->{-progress_pfx} = progress_pfx($old); - do { eval { - # update the only metadata key for v1: - my $lc = $src->get_metadata('last_commit'); - $dst->set_metadata('last_commit', $lc) if $lc; - $it = $src->postlist_begin(''); $end = $src->postlist_end(''); - if ($pr) { - $nr = 0; - $tot = $src->get_doccount; - $fmt = "$pfx % ".length($tot)."u/$tot\n"; - $pr->("$pfx copying $tot documents\n"); - } }; } while (cpdb_retryable($src, $pfx)); do { eval { - while ($it != $end) { + for (; $it != $end; $it++) { my $docid = $it->get_docid; + if (defined $reshard) { + my $dst_shard = $docid % $reshard; + next if $dst_shard != $cur_shard; + } my $doc = $src->get_document($docid); $dst->replace_document($docid, $doc); - $it->inc; - if ($pr && !(++$nr & 1023)) { - $pr->(sprintf($fmt, $nr)); + if ($pr_data && !(++$$nr & 1023)) { + $pr->(sprintf($fmt, $$nr)); } } @@ -293,8 +404,108 @@ sub cpdb ($$) { # (and public-inbox does not use those features) }; } while (cpdb_retryable($src, $pfx)); +} - $pr->(sprintf($fmt, $nr)) if $pr; +# Like copydatabase(1), this is horribly slow; and it doesn't seem due +# to the overhead of Perl. +sub cpdb ($$) { # cb_spawn callback + my ($args, $opt) = @_; + my ($old, $newdir) = @$args; + my $new = $newdir->dirname; + my ($src, $cur_shard); + my $reshard; + PublicInbox::SearchIdx::load_xapian_writable(); + my $XapianDatabase = $PublicInbox::Search::X{Database}; + if (ref($old) eq 'ARRAY') { + ($cur_shard) = ($new =~ m!(?:xap|ei)[0-9]+/([0-9]+)\b!); + defined $cur_shard or + die "BUG: could not extract shard # from $new"; + $reshard = $opt->{reshard}; + defined $reshard or die 'BUG: got array src w/o --reshard'; + + # resharding, M:N copy means have full read access + foreach (@$old) { + if ($src) { + my $sub = $XapianDatabase->new($_); + $src->add_database($sub); + } else { + $src = $XapianDatabase->new($_); + } + } + } else { + $src = $XapianDatabase->new($old); + } + + my ($tmp, $ft); + local @SIG{keys %SIG} = values %SIG; + if ($opt->{compact}) { + my ($dir) = ($new =~ m!(.*?/)[^/]+/*\z!); + same_fs_or_die($dir, $new); + $ft = File::Temp->newdir("$new.compact-XXXX", DIR => $dir); + setup_signals(); + $tmp = $ft->dirname; + PublicInbox::Syscall::nodatacow_dir($tmp); + } else { + $tmp = $new; + } + + # like copydatabase(1), be sure we don't overwrite anything in case + # of other bugs: + my $flag = eval($PublicInbox::Search::Xap.'::DB_CREATE()'); + die if $@; + my $XapianWritableDatabase = $PublicInbox::Search::X{WritableDatabase}; + $flag |= $PublicInbox::SearchIdx::DB_NO_SYNC if !$opt->{fsync}; + my $dst = $XapianWritableDatabase->new($tmp, $flag); + my $pr = $opt->{-progress}; + my $pfx = $opt->{-progress_pfx} = progress_pfx($new); + my $pr_data = { pr => $pr, pfx => $pfx, nr => 0 } if $pr; + + do { + eval { + # update the only metadata key for v1: + my $lc = $src->get_metadata('last_commit'); + $dst->set_metadata('last_commit', $lc) if $lc; + + # only the first xapian shard (0) gets 'indexlevel' + if ($new =~ m!(?:xapian[0-9]+|xap[0-9]+/0)\b!) { + my $l = $src->get_metadata('indexlevel'); + if ($l eq 'medium') { + $dst->set_metadata('indexlevel', $l); + } + } + if ($pr_data) { + my $tot = $src->get_doccount; + + # we can only estimate when resharding, + # because removed spam causes slight imbalance + my $est = ''; + if (defined $cur_shard && $reshard > 1) { + $tot = int($tot/$reshard); + $est = 'around '; + } + my $fmt = "$pfx % ".length($tot)."u/$tot\n"; + $pr->("$pfx copying $est$tot documents\n"); + $pr_data->{fmt} = $fmt; + $pr_data->{total} = $tot; + } + }; + } while (cpdb_retryable($src, $pfx)); + + if (defined $reshard) { + # we rely on document IDs matching NNTP article number, + # so we can't have the Xapian sharding DB support rewriting + # document IDs. Thus we iterate through each shard + # individually. + $src = undef; + foreach (@$old) { + my $old = $XapianDatabase->new($_); + cpdb_loop($old, $dst, $pr_data, $cur_shard, $reshard); + } + } else { + cpdb_loop($src, $dst, $pr_data); + } + + $pr->(sprintf($pr_data->{fmt}, $pr_data->{nr})) if $pr; return unless $opt->{compact}; $src = $dst = undef; # flushes and closes @@ -305,37 +516,4 @@ sub cpdb ($$) { remove_tree($tmp) or die "failed to remove $tmp: $!\n"; } -# slightly easier-to-manage manage than END{} blocks -package PublicInbox::Xtmpdirs; -use strict; -use warnings; -use File::Path qw(remove_tree); -my %owner; - -sub new { - # http://www.tldp.org/LDP/abs/html/exitcodes.html - $SIG{INT} = sub { exit(130) }; - $SIG{HUP} = $SIG{PIPE} = $SIG{TERM} = sub { exit(1) }; - my $self = bless {}, $_[0]; # old partition => new (tmp) partition - $owner{"$self"} = $$; - $self; -} - -sub done { - my ($self) = @_; - delete $owner{"$self"}; - $SIG{INT} = $SIG{HUP} = $SIG{PIPE} = $SIG{TERM} = 'DEFAULT'; - %$self = (); -} - -sub DESTROY { - my ($self) = @_; - my $owner_pid = delete $owner{"$self"} or return; - return if $owner_pid != $$; - foreach my $new (values %$self) { - remove_tree($new) unless -d "$new/old"; - } - $SIG{INT} = $SIG{HUP} = $SIG{PIPE} = $SIG{TERM} = 'DEFAULT'; -} - 1;