Do the dump was done with the patched taper?

Jean-Louis

Jean-Francois Malouin wrote:
Hello Jean-Louis,

I was away hence the delay.

* Jean-Louis Martineau <martin...@zmanda.com> [20100719 08:31]:
Hi Jean-François,

Try the attached patch, it will works with newer log files only.
Thanks for reporting the bug.

I applied the patch but it doesn't seem to do the right thing.
I get essentially the same output with the patched amstatus.
From a different amanda run than below:

[...]

SUMMARY          part      real  estimated
                           size       size
partition       :  98
estimated       :  50              1855244m
flush           :  48    606853m
failed          :   0                    0m           (  0.00%)
wait for dumping:   0                    0m           (  0.00%)
dumping to tape :   0                    0m           (  0.00%)
dumping         :   0         0m         0m (  0.00%) (  0.00%)
dumped          :  50   1855210m   1855244m (100.00%) (100.00%)
wait for writing:  49    968740m    968774m (100.00%) ( 52.22%)
wait to flush   :   0         0m         0m (100.00%) (  0.00%)
writing to tape :   1    886469m    886469m (100.00%) ( 47.78%)
failed to tape  :   0         0m         0m (  0.00%) (  0.00%)
taped           :  48    606853m    606853m (100.00%) ( 24.65%)
12 dumpers idle : no-dumpers
taper status: Writing bigbrain:BIG_BRAIN_pm3903_postmortem_mnc_original
taper qlen: 49

plus other stats.

Thanks,
jf

Jean-Louis

Jean-Francois Malouin wrote:
Hi,

With amanda-3.1 seems we lost the tape usage in the summary report
output by amstatus. Prior versions were showning which tape has been
used along with its usage like (2.6.1p2):


SUMMARY          part      real  estimated
                           size       size
partition       :  35
estimated       :  21               871112m
flush           :  14    341794m
failed          :   0                    0m           (  0.00%)
wait for dumping:   0                    0m           (  0.00%)
dumping to tape :   0                    0m           (  0.00%)
dumping         :   0         0m         0m (  0.00%) (  0.00%)
dumped          :  21    872030m    871112m (100.11%) (100.11%)
wait for writing:  20    472157m    471239m (100.19%) ( 54.20%)
wait to flush   :   0         0m         0m (100.00%) (  0.00%)
writing to tape :   1    399873m    399873m (100.00%) ( 45.90%)
failed to tape  :   0         0m         0m (  0.00%) (  0.00%)
taped           :  14    341794m    341794m (100.00%) ( 28.18%)
  tape 1        :  14    520994m    520994m (134.96%) av24-2_right2_V00023L3 
(128 chunks)

I liked that feature. Possible to get it back?

Thanks!
jf

diff --git a/installcheck/amstatus.pl b/installcheck/amstatus.pl
index cf41b47..6985c6c 100644
--- a/installcheck/amstatus.pl
+++ b/installcheck/amstatus.pl
@@ -153,7 +153,7 @@ DUMP clienthost ffffffff9ffeffffffff1f /some/dir 
20080618130147 14050 0 1970:1:1
 --------
 dumper: pid 4086 executable dumper0 version 9.8.7
 dumper: pid 4095 executable dumper3 version 9.8.7
-taper: using label `Conf-001' date `20080618130147'
+taper: wrote label 'Conf-001'
 driver: result time 1.312 from taper: TAPER-OK
 driver: state time 1.312 free kps: 600 space: 868352 taper: idle idle-dumpers: 
4 qlen tapeq: 0 runq: 0 roomq: 0 wakeup: 0 driver-idle: not-idle
 driver: interface-state time 1.312 if default: free 600
@@ -270,7 +270,7 @@ DUMP clienthost ffffffff9ffeffffffff1f "C:\\Some Dir\\" 
20080618130147 14050 0 1
 --------
 dumper: pid 4086 executable dumper0 version 9.8.7
 dumper: pid 4095 executable dumper3 version 9.8.7
-taper: using label `Conf-001' date `20080618130147'
+taper: wrote label 'Conf-001'
 driver: result time 1.312 from taper: TAPER-OK
 driver: state time 1.312 free kps: 600 space: 868352 taper: idle idle-dumpers: 
4 qlen tapeq: 0 runq: 0 roomq: 0 wakeup: 0 driver-idle: not-idle
 driver: interface-state time 1.312 if default: free 600
@@ -414,7 +414,7 @@ DUMP localhost ffffffff9efeffffffffff01 /etc 20090410074759 
14339 0 1970:1:1:0:0
 dumper: pid 4119 executable dumper3 version 3.0.0
 dumper: pid 4118 executable dumper2 version 3.0.0
 dumper: pid 4117 executable dumper1 version 3.0.0
-taper: using label `maitreyee-010' date `20090410074759'
+taper: wrote label 'maitreyee-010'
driver: result time 2.928 from taper: TAPER-OK driver: state time 2.937 free kps: 8000 space: 1215488 taper: idle idle-dumpers: 4 qlen tapeq: 0 runq: 0 roomq: 0 wakeup: 0 driver-idle: not-idle
 driver: interface-state time 2.937 if default: free 8000
diff --git a/server-src/amstatus.pl b/server-src/amstatus.pl
index 79803c1..7d46425 100644
--- a/server-src/amstatus.pl
+++ b/server-src/amstatus.pl
@@ -740,31 +740,10 @@ while($lineX = <AMDUMP>) {
                }
        }
        elsif($line[0] eq "taper") {
-               if($line[1] eq "slot") {
-                       #2:slot 3:"wrote" 4:"label" 5:corrupted...
+               if($line[1] eq "wrote") {
+                       #1:"wrote" 2:"label" 3:label
                        $nb_tape++;
-                       $lineX =~ /wrote label `(\S*)'/;
-                       $label = $1;
-                       $ntlabel{$nb_tape} = $label;
-                       $ntpartition{$nb_tape} = 0;
-                       $ntsize{$nb_tape} = 0;
-                       $ntesize{$nb_tape} = 0;
-               }
-               elsif($line[1] eq "wrote") {
-                       #1:"wrote" 2:"label" 3:corrupted
-                       $nb_tape++;
-                       $lineX =~ /wrote label `(\S*)'/;
-                       $label = $1;
-                       $ntlabel{$nb_tape} = $label;
-                       $ntpartition{$nb_tape} = 0;
-                       $ntsize{$nb_tape} = 0;
-                       $ntesize{$nb_tape} = 0;
-               }
-               elsif($line[1] eq "using") {
-                       #1:"using" #2:"label" #3:`label' #4:date #5 `timestamp'
-                       $nb_tape++;
-                       $lineX =~ /using label `(\S*)'/;
-                       $label = $1;
+                       $label = $line[3];
                        $ntlabel{$nb_tape} = $label;
                        $ntpartition{$nb_tape} = 0;
                        $ntsize{$nb_tape} = 0;
diff --git a/server-src/taper.pl b/server-src/taper.pl
index 0b2883e..8c42493 100644
--- a/server-src/taper.pl
+++ b/server-src/taper.pl
@@ -344,7 +344,7 @@ sub notif_new_tape {
                ++$self->{'tape_num'}));
# and the amdump log
-       print STDERR "taper: wrote label `$self->{label}'\n";
+       print STDERR "taper: wrote label '$self->{label}'\n";
# and inform the driver
        $self->{'proto'}->send(main::Protocol::NEW_TAPE,


Reply via email to