-# Copyright (c) 2009, 2010 Zmanda Inc. All Rights Reserved.
+# Copyright (c) 2009-2012 Zmanda Inc. All Rights Reserved.
#
-# This program is free software; you can redistribute it and/or modify it
-# under the terms of the GNU General Public License version 2 as published
-# by the Free Software Foundation.
+# This program is free software; you can redistribute it and/or
+# modify it under the terms of the GNU General Public License
+# as published by the Free Software Foundation; either version 2
+# of the License, or (at your option) any later version.
#
# This program is distributed in the hope that it will be useful, but
# WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
package Amanda::Taper::Worker;
+use Carp;
use POSIX qw( :errno_h );
use Amanda::Changer;
use Amanda::Config qw( :getconf config_dir_relative );
my $self = shift;
my ($msgtype, %params) = @_;
- $self->_assert_in_state("writing") or return;
+ if ($params{'handle'} ne $self->{'handle'}) {
+ # ignore message for previous handle
+ return;
+ }
+
+ if (defined $self->{'dumper_status'}) {
+ # ignore duplicate message
+ return
+ }
+
$self->{'dumper_status'} = "DONE";
$self->{'orig_kb'} = $params{'orig_kb'};
if (defined $self->{'result'}) {
my $self = shift;
my ($msgtype, %params) = @_;
- $self->_assert_in_state("writing") or return;
+ if ($params{'handle'} ne $self->{'handle'}) {
+ # ignore message for previous handle
+ return;
+ }
+
+ if (defined $self->{'dumper_status'}) {
+ # ignore duplicate message
+ return
+ }
$self->{'dumper_status'} = "FAILED";
- if (defined $self->{'result'}) {
+ if (defined $self->{'header_xfer'}) {
+ $self->{'header_xfer'}->cancel();
+ } elsif (defined $self->{'result'}) {
$self->result_cb(undef);
+ } elsif (!defined $self->{'scribe'}->{'xdt'}) {
+ # ignore, the dump is already cancelled or not yet started.
+ } elsif (!defined $self->{'scribe'}->{'xfer'}) {
+ # ignore, the dump is already cancelled or not yet started.
+ } else { # Abort the dump
+ push @{$self->{'input_errors'}}, "dumper failed";
+ $self->{'scribe'}->cancel_dump(
+ xfer => $self->{'scribe'}->{'xfer'},
+ dump_cb => $self->{'dump_cb'});
}
}
my $logtype;
if ($params{'result'} eq 'DONE') {
- if (!$self->{'doing_port_write'} or $self->{'dumper_status'} eq "DONE") {
+ if ($self->{'dumper_status'} eq "DONE") {
$msgtype = Amanda::Taper::Protocol::DONE;
$logtype = $L_DONE;
} else {
$msg_params{'taper'} = 'TAPE-ERROR';
$msg_params{'tapererr'} = join("; ", @{$params{'device_errors'}});
} elsif ($params{'config_denial_message'}) {
- $msg_params{'taper'} = 'TAPE-ERROR';
+ $msg_params{'taper'} = 'TAPE-CONFIG';
$msg_params{'tapererr'} = $params{'config_denial_message'};
} else {
$msg_params{'taper'} = 'TAPE-GOOD';
$self->{timer}->set_callback(sub {
my $size = $self->{scribe}->get_bytes_written();
seek $self->{status_fh}, 0, 0;
- print {$self->{status_fh}} $size;
+ print {$self->{status_fh}} $size, ' ';
$self->{status_fh}->flush();
});
}
my $self = shift;
my ($finished_cb) = @_;
- my $header_xfer;
my ($xsrc, $xdst);
my $errmsg;
($xsrc, $xdst) = (
Amanda::Xfer::Source::DirectTCPListen->new(),
Amanda::Xfer::Dest::Buffer->new(0));
- $header_xfer = Amanda::Xfer->new([$xsrc, $xdst]);
- $header_xfer->start($steps->{'header_xfer_xmsg_cb'});
+ $self->{'header_xfer'} = Amanda::Xfer->new([$xsrc, $xdst]);
+ $self->{'header_xfer'}->start($steps->{'header_xfer_xmsg_cb'});
my $header_addrs = $xsrc->get_addrs();
my $header_port = $header_addrs->[0][1];
my $hdr_buf = $xdst->get();
# close stuff up
- $header_xfer = $xsrc = $xdst = undef;
+ $self->{'header_xfer'} = $xsrc = $xdst = undef;
if (!defined $hdr_buf) {
return $finished_cb->("Got empty header");
my ($msgtype, %params) = @_;
my %get_xfer_dest_args;
+ $self->{'dump_cb'} = $params{'dump_cb'};
+
# setting up the dump is a bit complex, due to the requirements of
# a directtcp port_write. This function:
# 1. creates and starts a transfer (make_xfer)
step process_args => sub {
# extract the splitting-related parameters, stripping out empty strings
my %splitting_args = map {
- ($params{$_} ne '')? ($_, $params{$_}) : ()
+ (defined $params{$_} && $params{$_} ne '')? ($_, $params{$_}) : ()
} qw(
dle_tape_splitsize dle_split_diskbuffer dle_fallback_splitsize dle_allow_split
- part_size part_cache_type part_cache_dir part_cache_max_size
+ part_size part_cache_type part_cache_dir part_cache_max_size data_path
);
# convert numeric values to BigInts
my $device = $self->{'scribe'}->get_device();
if (!defined $device) {
- die "no device is available to create an xfer_dest";
+ confess "no device is available to create an xfer_dest";
}
$splitting_args{'leom_supported'} = $device->property_get("leom");
# and convert those to get_xfer_dest args
# getting the header is easy for FILE-WRITE..
my $hdr = $self->{'header'} = Amanda::Holding::get_header($params{'filename'});
+ if (!defined $hdr || $hdr->{'type'} != $Amanda::Header::F_DUMPFILE) {
+ confess("Could not read header from '$params{filename}'");
+ }
+
# stip out header fields we don't need
$hdr->{'cont_filename'} = '';
- if (!defined $hdr || $hdr->{'type'} != $Amanda::Header::F_DUMPFILE) {
- die("Could not read header from '$params{filename}'");
+ if ($self->{'header'}->{'is_partial'}) {
+ $self->{'dumper_status'} = "FAILED";
+ } else {
+ $self->{'dumper_status'} = "DONE";
}
+
$steps->{'start_dump'}->(undef);
} else {
# ..but quite a bit harder for PORT-WRITE; this method will send the
$self->_assert_in_state("getting_header") or return;
$self->{'state'} = 'writing';
+ # abort if we already got a device_errors
+ if (@{$self->{'scribe'}->{'device_errors'}}) {
+ $self->{'scribe'}->abort_setup(dump_cb => $params{'dump_cb'});
+ return;
+ }
# if $err is set, cancel the dump, treating it as a input error
if ($err) {
push @{$self->{'input_errors'}}, $err;
or $hdr->{'name'} ne $params{'hostname'}
or $hdr->{'disk'} ne $params{'diskname'}
or $hdr->{'datestamp'} ne $params{'datestamp'}) {
- die("Header of dumpfile does not match command from driver");
+ confess("Header of dumpfile does not match command from driver");
}
# start producing status
projects / debian / amanda / blobdiff