From 58754f931be37814b0b42f1e5c140d629df0a8eb Mon Sep 17 00:00:00 2001
From: Kern Sibbald <kern@sibbald.com>
Date: Mon, 21 Feb 2011 19:12:33 +0100
Subject: [PATCH] Add more debug to restart regress scripts

---
 bacula/src/filed/accurate.c             | 4 ++--
 regress/tests/restart-accurate-job-test | 6 ++++++
 regress/tests/restart-base-job-test     | 3 +++
 regress/tests/restart-job-test          | 3 +++
 regress/tests/restart2-job-test         | 6 ++++++
 5 files changed, 20 insertions(+), 2 deletions(-)

diff --git a/bacula/src/filed/accurate.c b/bacula/src/filed/accurate.c
index 3f917e6173..c029559329 100644
--- a/bacula/src/filed/accurate.c
+++ b/bacula/src/filed/accurate.c
@@ -1,7 +1,7 @@
 /*
    Bacula® - The Network Backup Solution
 
-   Copyright (C) 2000-2009 Free Software Foundation Europe e.V.
+   Copyright (C) 2000-2011 Free Software Foundation Europe e.V.
 
    The main author of Bacula is Kern Sibbald, with contributions from
    many others, a complete list can be found in the file AUTHORS.
@@ -192,7 +192,7 @@ bool accurate_finish(JCR *jcr)
          }
       }
       accurate_free(jcr);
-      if (!jcr->incomplete && jcr->is_JobLevel(L_FULL)) {
+      if (jcr->is_JobLevel(L_FULL)) {
          Jmsg(jcr, M_INFO, 0, _("Space saved with Base jobs: %lld MB\n"), 
               jcr->base_size/(1024*1024));
       }
diff --git a/regress/tests/restart-accurate-job-test b/regress/tests/restart-accurate-job-test
index 37e6d82f8f..eff5f15090 100755
--- a/regress/tests/restart-accurate-job-test
+++ b/regress/tests/restart-accurate-job-test
@@ -26,6 +26,9 @@ setdebug level=0 trace=0 hangup=100 client
 run job=$JobName yes
 wait
 messages
+sql
+select * from JobMedia;
+
 quit
 END_OF_DATA
 
@@ -42,6 +45,9 @@ setdebug level=0 trace=0 hangup=50 client
 run job=$JobName yes
 wait
 messages
+sql
+select * from JobMedia;
+
 @# 
 @# now do a restore
 @#
diff --git a/regress/tests/restart-base-job-test b/regress/tests/restart-base-job-test
index 4894f5f093..42d6a5894d 100755
--- a/regress/tests/restart-base-job-test
+++ b/regress/tests/restart-base-job-test
@@ -31,6 +31,9 @@ setdebug level=200 trace=1 dir
 run job=$JobName yes
 wait
 messages
+sql
+select * from JobMedia;
+
 setdebug level=0 trace=0 dir
 @$out ${cwd}/tmp/log3.out
 list jobs
diff --git a/regress/tests/restart-job-test b/regress/tests/restart-job-test
index cd9b60864c..4c36734d00 100755
--- a/regress/tests/restart-job-test
+++ b/regress/tests/restart-job-test
@@ -24,6 +24,9 @@ label storage=File volume=TestVolume001
 run job=$JobName yes
 wait
 messages
+sql
+select * from JobMedia where JobId=1;
+
 quit
 END_OF_DATA
 
diff --git a/regress/tests/restart2-job-test b/regress/tests/restart2-job-test
index 8119028e03..12f5681687 100755
--- a/regress/tests/restart2-job-test
+++ b/regress/tests/restart2-job-test
@@ -29,6 +29,9 @@ END_OF_DATA
 
 run_bacula  
 
+# Note, the following stops and restarts the FD while it
+#  is running to simulate a crash, so it is normal if
+#  orphanned buffers are reported
 sleep 5
 $bin/bacula-ctl-fd stop
 sleep 5
@@ -39,6 +42,9 @@ cat <<END_OF_DATA >${cwd}/tmp/bconcmds
 @$out ${cwd}/tmp/log1.out
 wait
 messages
+sql
+select * from JobMedia where JobId=1;
+
 quit
 END_OF_DATA
 
-- 
2.39.5