/[smeserver]/rpms/e-smith-backup/sme7/e-smith-backup-2.0.0-verbose.patch
ViewVC logotype

Contents of /rpms/e-smith-backup/sme7/e-smith-backup-2.0.0-verbose.patch

Parent Directory Parent Directory | Revision Log Revision Log | View Revision Graph Revision Graph


Revision 1.1 - (show annotations) (download)
Tue Oct 21 20:21:32 2008 UTC (16 years ago) by slords
Branch: MAIN
CVS Tags: e-smith-backup-2_0_0-36_el4_sme, e-smith-backup-2_0_0-21_el4_sme, e-smith-backup-2_0_0-35_el4_sme, e-smith-backup-2_0_0-27_el4_sme, e-smith-backup-2_0_0-15_el4_sme, e-smith-backup-2_0_0-23_el4_sme, e-smith-backup-2_0_0-19_el4_sme, e-smith-backup-2_0_0-26_el4_sme, e-smith-backup-2_0_0-38_el4_sme, e-smith-backup-2_0_0-33_el4_sme, e-smith-backup-2_0_0-32_el4_sme, e-smith-backup-2_0_0-29_el4_sme, e-smith-backup-2_0_0-11_el4_sme, e-smith-backup-2_0_0-22_el4_sme, e-smith-backup-2_0_0-14_el4_sme, e-smith-backup-2_0_0-12_el4_sme, e-smith-backup-2_0_0-20_el4_sme, e-smith-backup-2_0_0-16_el4_sme, e-smith-backup-2_0_0-31_el4_sme, e-smith-backup-2_0_0-18_el4_sme, e-smith-backup-2_0_0-28_el4_sme, e-smith-backup-2_0_0-13_el4_sme, e-smith-backup-2_0_0-30_el4_sme, e-smith-backup-2_0_0-37_el4_sme, e-smith-backup-2_0_0-34_el4_sme, e-smith-backup-2_0_0-24_el4_sme, e-smith-backup-2_0_0-17_el4_sme, e-smith-backup-2_0_0-25_el4_sme, HEAD
Dar udpates

1 --- e-smith-backup-2.0.0/root/etc/e-smith/events/actions/workstation-backup-dar.verbose 2008-10-21 14:12:17.000000000 -0600
2 +++ e-smith-backup-2.0.0/root/etc/e-smith/events/actions/workstation-backup-dar 2008-10-21 14:11:56.000000000 -0600
3 @@ -323,7 +323,6 @@
4 chdir '/';
5 #fork && exit;
6
7 - warn "Dar killer $$ started for PID $darpid with gracetime $gracetime\n";
8 # wait for timeout or backup termination
9 while ($tick > 0) {
10 sleep 10;
11 @@ -332,9 +331,9 @@
12 }
13
14 if (kill(0, $darpid)) {
15 - do {
16 - warn "Cleanly stops $darpid dar process\n";
17 - } while (kill('QUIT', $darpid) != 1);
18 + while (kill('QUIT', $darpid) != 1) {
19 + warn "Failed to stop $darpid dar process\n";
20 + }
21 }
22 warn "Partial backup stored on backup workstation.\n",
23 "Session cleanly closed by timeout after $timeout seconds.\n",
24 @@ -350,8 +349,7 @@
25 my $killerpid = undef;
26
27 eval {
28 - ($pid = open INPUT, "-|", "/usr/bin/dar", "--create", "$tmpdir/$id/$bkname", split(/\s+/,$ref), "-B", "/etc/dar/$job.dcf") or ldie("cannot start : $!" );
29 - warn "Running dar backup with PID $pid\n";
30 + ($pid = open INPUT, "-|", "/usr/bin/dar", "-Q", "--create", "$tmpdir/$id/$bkname", split(/\s+/,$ref), "-B", "/etc/dar/$job.dcf") or ldie("cannot start : $!" );
31
32 if ($pid) {
33 $killerpid = start_dar_killer($pid, $timeout); }
34 @@ -361,9 +359,9 @@
35 $report .= $data;
36
37 if ($killerpid && kill(0, $killerpid)) {
38 - do {
39 - warn "Killing killer $killerpid\n";
40 - } while (kill(9, $killerpid) != 1);
41 + while (kill(9, $killerpid) != 1) {
42 + warn "Failed to kill $killerpid killer process\n";
43 + }
44
45 waitpid($killerpid, 0);
46 }

admin@koozali.org
ViewVC Help
Powered by ViewVC 1.2.1 RSS 2.0 feed