summaryrefslogtreecommitdiffabout
authorSergey Poznyakoff <gray@gnu.org>2018-12-19 12:35:49 (GMT)
committer Sergey Poznyakoff <gray@gnu.org>2018-12-19 12:55:09 (GMT)
commitea2c058ce96484937fcfe52dc7382a461a9d72e3 (patch) (side-by-side diff)
treeae86e1115c3ef91bc03d2cfcb7df4f7ff8d19ce9
parent249512af92d3f592ae683279c2cd1f54a7c1a726 (diff)
downloadglacier-ea2c058ce96484937fcfe52dc7382a461a9d72e3.tar.gz
glacier-ea2c058ce96484937fcfe52dc7382a461a9d72e3.tar.bz2
Bugfixes.
* lib/App/Glacier/Command.pm (option,check_job): New methods. * lib/App/Glacier/Command/Get.pm: Rewrite debug messages (fixes temporary solution in 6c6dab5d). * lib/App/Glacier/Command/Jobs.pm: Rewrite the db->foreach sub. * lib/App/Glacier/Command/Periodic.pm: Likewise. * lib/App/Glacier/DB/GDBM.pm (CLONE_SKIP): New method. * lib/App/Glacier/Job.pm: Overload the "" operator. * lib/App/Glacier/Roster.pm (foreach): Overload method.
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--lib/App/Glacier/Command.pm43
-rw-r--r--lib/App/Glacier/Command/Get.pm11
-rw-r--r--lib/App/Glacier/Command/Jobs.pm39
-rw-r--r--lib/App/Glacier/Command/Periodic.pm38
-rw-r--r--lib/App/Glacier/DB/GDBM.pm11
-rw-r--r--lib/App/Glacier/Job.pm5
-rw-r--r--lib/App/Glacier/Roster.pm9
7 files changed, 81 insertions, 75 deletions
diff --git a/lib/App/Glacier/Command.pm b/lib/App/Glacier/Command.pm
index 7178a75..1f9a130 100644
--- a/lib/App/Glacier/Command.pm
+++ b/lib/App/Glacier/Command.pm
@@ -162,6 +162,14 @@ sub clone {
$self
}
+sub option {
+ my ($self, $opt, $val) = @_;
+ if (defined($val)) {
+ $self->{_options}{$opt} = $val;
+ }
+ return $self->{_options}{$opt};
+}
+
sub touchdir {
my ($self, $dir) = @_;
unless (-d $dir) {
@@ -276,4 +284,39 @@ sub archive_cache_filename {
$archive_id);
}
+sub check_job {
+ my ($self, $key, $descr, $vault) = @_;
+
+ $self->debug(2, "$descr->{JobId} $descr->{Action} $vault");
+ if ($descr->{StatusCode} eq 'Failed') {
+ $self->debug(1,
+ "deleting failed $key $vault "
+ . ($descr->{JobDescription} || $descr->{Action})
+ . ' '
+ . $descr->{JobId});
+ $self->jobdb()->delete($key) unless $self->dry_run;
+ return;
+ }
+
+ my $res = $self->glacier->Describe_job($vault, $descr->{JobId});
+ if ($self->glacier->lasterr) {
+ if ($self->glacier->lasterr('code') == 404) {
+ $self->debug(1,
+ "deleting expired $key $vault "
+ . ($descr->{JobDescription} || $descr->{Action})
+ . ' '
+ . $descr->{JobId});
+ App::Glacier::Job->fromdb($self, $vault, $key, $res)->delete()
+ unless $self->dry_run;
+ } else {
+ $self->error("can't describe job $descr->{JobId}: ",
+ $self->glacier->last_error_message);
+ }
+ return;
+ } elsif (ref($res) ne 'HASH') {
+ croak "describe_job returned wrong datatype (".ref($res).") for \"$descr->{JobId}\"";
+ }
+ return $res;
+}
+
1;
diff --git a/lib/App/Glacier/Command/Get.pm b/lib/App/Glacier/Command/Get.pm
index 0d17659..82b32c8 100644
--- a/lib/App/Glacier/Command/Get.pm
+++ b/lib/App/Glacier/Command/Get.pm
@@ -160,6 +160,8 @@ sub run {
if ($job->is_completed) {
my $cache_file = $job->cache_file;
if (-f $cache_file) {
+ $self->debug(1, "$job: copying from $cache_file");
+ return if $self->dry_run;
unless (copy($cache_file, $localname)) {
$self->abend(EX_FAILURE,
"can't copy $cache_file to $localname: $!");
@@ -193,6 +195,7 @@ use constant TWOMB => 2*MB;
sub download {
my ($self, $job, $localname) = @_;
+
my $archive_size = $job->get('ArchiveSizeInBytes');
if ($archive_size < $self->cf_transfer_param(qw(download single-part-size))) {
# simple download
@@ -214,9 +217,7 @@ sub _open_output {
sub _download_simple {
my ($self, $job, $localname) = @_;
- eval { # FIXME: file_name might be absent
- $self->debug(1, "downloading", $job->file_name(1), "in single part");
- };
+ $self->debug(1, "$job: downloading in single part");
return if $self->dry_run;
my $fd = $self->_open_output($localname);
my ($res, $tree_hash) = $self->glacier->Get_job_output($job->vault,
@@ -256,8 +257,8 @@ sub _download_multipart {
# Compute the number of parts per job
my $job_parts = int(($total_parts + $njobs - 1) / $njobs);
- $self->debug(1,
- "downloading", $job->file_name(1), "to $localname in chunks of $part_size bytes, in $njobs jobs, with $job_parts parts per job");
+ $self->debug(1, "$job: downloading in chunks of $part_size bytes, in $njobs jobs, with $job_parts parts per job");
+
return if $self->dry_run;
use Fcntl qw(SEEK_SET);
diff --git a/lib/App/Glacier/Command/Jobs.pm b/lib/App/Glacier/Command/Jobs.pm
index 5a5f488..7dc5d06 100644
--- a/lib/App/Glacier/Command/Jobs.pm
+++ b/lib/App/Glacier/Command/Jobs.pm
@@ -116,42 +116,17 @@ sub list {
my $db = $self->jobdb();
$db->foreach(sub {
- my ($key, $descr) = @_;
- my $vault = $descr->{VaultARN};
- $vault =~ s{.*:vaults/}{};
+ my ($key, $descr, $vault) = @_;
return if (@vault_names && ! grep { $_ eq $vault } @vault_names);
unless ($self->{_options}{cached}) {
- if ($descr->{StatusCode} eq 'Failed') {
- $self->debug(1, "deleting failed $key $vault " .
- ($descr->{JobDescription} || $descr->{Action}) .
- $descr->{JobId});
- $db->delete($key) unless $self->dry_run;
- return;
- }
-
- my $res = $self->glacier->Describe_job($vault, $descr->{JobId});
- if ($self->glacier->lasterr) {
- if ($self->glacier->lasterr('code') == 404) {
- $self->debug(1, "deleting expired $key $vault " .
- ($descr->{JobDescription} || $descr->{Action}) .
- $descr->{JobId});
- App::Glacier::Job->fromdb($self, $vault, $key, $res)->delete()
- unless $self->dry_run;
- return;
- } else {
- $self->error("can't describe job $descr->{JobId}: ",
- $self->glacier->last_error_message);
- }
- } elsif (ref($res) ne 'HASH') {
- croak "describe_job returned wrong datatype (".ref($res).") for \"$descr->{JobId}\"";
- } else {
- $res = timestamp_deserialize($res);
- $self->debug(2, $res->{StatusCode});
- $db->store($key, $res) unless $self->dry_run;
- $descr = $res;
- }
+ my $res = $self->check_job($key, $descr, $vault)
+ or return;
+ $res = timestamp_deserialize($res);
+ $self->debug(2, $res->{StatusCode});
+ $db->store($key, $res) unless $self->dry_run;
+ $descr = $res;
}
my $started = $self->format_date_time($descr, 'CreationDate');
diff --git a/lib/App/Glacier/Command/Periodic.pm b/lib/App/Glacier/Command/Periodic.pm
index 5a4dc2a..39a2d7a 100644
--- a/lib/App/Glacier/Command/Periodic.pm
+++ b/lib/App/Glacier/Command/Periodic.pm
@@ -7,6 +7,7 @@ use Carp;
use Data::Dumper;
use File::Basename;
use App::Glacier::Job;
+use App::Glacier::Command::Get;
=head1 NAME
@@ -38,39 +39,10 @@ sub run {
my $db = $self->jobdb();
$db->foreach(sub {
- my ($key, $descr) = @_;
- my $vault = $descr->{VaultARN};
- $vault =~ s{.*:vaults/}{};
+ my ($key, $descr, $vault) = @_;
- my $completed = $descr->{Completed};
-
- $self->debug(2, "$descr->{JobId} $descr->{Action} $vault");
- if ($descr->{StatusCode} eq 'Failed') {
- $self->debug(1,
- "deleting failed $key $vault "
- . ($descr->{JobDescription} || $descr->{Action})
- . ' '
- . $descr->{JobId});
- $db->delete($key) unless $self->dry_run;
- }
-
- my $res = $self->glacier->Describe_job($vault, $descr->{JobId});
- if ($self->glacier->lasterr) {
- if ($self->glacier->lasterr('code') == 404) {
- $self->debug(1,
- "deleting expired $key $vault "
- . ($descr->{JobDescription} || $descr->{Action})
- . ' '
- . $descr->{JobId});
- App::Glacier::Job->fromdb($self, $vault, $key, $res)->delete()
- unless $self->dry_run;
- } else {
- $self->error("can't describe job $descr->{JobId}: ",
- $self->glacier->last_error_message);
- }
- } elsif (ref($res) ne 'HASH') {
- croak "describe_job returned wrong datatype (".ref($res).") for \"$descr->{JobId}\"";
- } elsif ($res->{Completed} ne $completed) {
+ my $res = $self->check_job($key, $descr, $vault);
+ if ($res && $res->{Completed} ne $descr->{Completed}) {
$self->debug(2, $res->{StatusCode});
if ($res->{Completed} && $res->{StatusCode} eq 'Succeeded') {
$self->debug(1, "$descr->{JobId}: processing $descr->{Action} for $vault");
@@ -86,8 +58,8 @@ sub run {
$res->{ArchiveId});
$self->touchdir(dirname($localname));
- require App::Glacier::Command::Get;
my $get = clone App::Glacier::Command::Get($self);
+ $get->option(quiet => 1);
$get->download($job, $localname);
}
}
diff --git a/lib/App/Glacier/DB/GDBM.pm b/lib/App/Glacier/DB/GDBM.pm
index 0e14a65..f7cc29a 100644
--- a/lib/App/Glacier/DB/GDBM.pm
+++ b/lib/App/Glacier/DB/GDBM.pm
@@ -6,6 +6,10 @@ use Carp;
use File::Basename;
use File::Path qw(make_path);
+# Avoid coredumps in threaded code.
+# See https://rt.perl.org/Public/Bug/Display.html?id=61912.
+sub CLONE_SKIP { 1 }
+
sub new {
my $class = shift;
local %_ = @_;
@@ -52,11 +56,8 @@ sub configtest {
$cfg->lint(\%lexicon, @path);
}
-# We can't tie the DB to $self->{_map} at once, in the new method, because
-# this will cause coredumps in threaded code (see
-# https://rt.perl.org/Public/Bug/Display.html?id=61912). So, the following
-# auxiliary method is used, which calls &$code with $self->{_map} tied
-# to the DB.
+# Tie in the database, run $code, and untie it again. Correctly handle
+# nested invocations to avoid deadlocking.
sub _tied {
my ($self, $code) = @_;
croak "argument must be a CODE ref" unless ref($code) eq 'CODE';
diff --git a/lib/App/Glacier/Job.pm b/lib/App/Glacier/Job.pm
index ae12b22..9478b20 100644
--- a/lib/App/Glacier/Job.pm
+++ b/lib/App/Glacier/Job.pm
@@ -108,6 +108,11 @@ sub get {
return $job->{$key};
}
+sub as_string { shift->get('JobDescription') }
+
+use overload
+ '""' => \&as_string;
+
sub is_finished {
my $self = shift;
return defined($self->get('StatusCode'));
diff --git a/lib/App/Glacier/Roster.pm b/lib/App/Glacier/Roster.pm
index ee56ff5..32c2b08 100644
--- a/lib/App/Glacier/Roster.pm
+++ b/lib/App/Glacier/Roster.pm
@@ -1,4 +1,13 @@
package App::Glacier::Roster;
use parent 'App::Glacier::DB';
+sub foreach {
+ my ($self, $fun) = @_;
+ $self->SUPER::foreach(sub {
+ my ($key, $descr) = @_;
+ (my $vault = $descr->{VaultARN}) =~ s{.*:vaults/}{};
+ &{$fun}($key, $descr, $vault);
+ });
+}
+
1;

Return to:

Send suggestions and report system problems to the System administrator.