From 302c2d7fc7182f7ddd962a22654f74f3e8e6f1c2 Mon Sep 17 00:00:00 2001 From: Eric Bollengier Date: Wed, 7 Nov 2007 21:22:16 +0000 Subject: [PATCH] ebl remove some bnet_sig(dir, BNET_TERMINATE); git-svn-id: https://bacula.svn.sourceforge.net/svnroot/bacula/trunk@5875 91ce42f0-d328-0410-95d8-f526ca767f89 --- bacula/patches/testing/bug_897_1005.patch | 22 ++++++++++++++-------- 1 file changed, 14 insertions(+), 8 deletions(-) diff --git a/bacula/patches/testing/bug_897_1005.patch b/bacula/patches/testing/bug_897_1005.patch index ddbe7b844f..34f732e649 100644 --- a/bacula/patches/testing/bug_897_1005.patch +++ b/bacula/patches/testing/bug_897_1005.patch @@ -8,7 +8,7 @@ Index: src/dird/backup.c /* Cancel SD */ - cancel_storage_daemon_job(jcr); - wait_for_storage_daemon_termination(jcr); -+ wait_for_job_termination(jcr); ++ wait_for_job_termination(jcr, 300); Dmsg1(400, "after wait for sd. use=%d\n", jcr->use_count()); return false; } @@ -137,7 +137,7 @@ Index: src/filed/job.c jcr->JobType = JT_VERIFY; if (sscanf(dir->msg, verifycmd, level) != 1) { -@@ -1585,13 +1587,6 @@ +@@ -1585,15 +1587,6 @@ bnet_sig(dir, BNET_EOD); @@ -148,10 +148,12 @@ Index: src/filed/job.c - jcr->pki_encrypt); - Dmsg1(110, "End FD msg: %s\n", dir->msg); - - /* Inform Director that we are done */ - bnet_sig(dir, BNET_TERMINATE); +- /* Inform Director that we are done */ +- bnet_sig(dir, BNET_TERMINATE); return 0; /* return and terminate command loop */ -@@ -1609,7 +1604,6 @@ + } + +@@ -1609,7 +1602,6 @@ bool use_regexwhere=false; int prefix_links; char replace; @@ -159,7 +161,7 @@ Index: src/filed/job.c /* * Scan WHERE (base directory for restore) from command -@@ -1696,12 +1690,6 @@ +@@ -1696,16 +1688,7 @@ if (jcr->Errors) { set_jcr_job_status(jcr, JS_ErrorTerminated); } @@ -170,8 +172,12 @@ Index: src/filed/job.c - jcr->pki_encrypt); - Dmsg1(110, "End FD msg: %s\n", dir->msg); - /* Inform Director that we are done */ - bnet_sig(dir, BNET_TERMINATE); +- /* Inform Director that we are done */ +- bnet_sig(dir, BNET_TERMINATE); +- + Dmsg0(130, "Done in job.c\n"); + return 0; /* return and terminate command loop */ + } Index: src/jcr.h =================================================================== --- src/jcr.h (révision 5856) -- 2.39.5