From: Kern Sibbald <kern@sibbald.com>
Date: Wed, 26 Sep 2007 15:43:24 +0000 (+0000)
Subject: Suppress extra error messages during batch insert failure.
X-Git-Tag: Release-3.0.0~2450
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=632f67766555af9b2538fab71e38d6cda20bdf2e;p=bacula%2Fbacula

Suppress extra error messages during batch insert failure.

git-svn-id: https://bacula.svn.sourceforge.net/svnroot/bacula/trunk@5656 91ce42f0-d328-0410-95d8-f526ca767f89
---

diff --git a/bacula/src/dird/catreq.c b/bacula/src/dird/catreq.c
index 8609039e17..cc1903615f 100644
--- a/bacula/src/dird/catreq.c
+++ b/bacula/src/dird/catreq.c
@@ -358,7 +358,7 @@ void catalog_update(JCR *jcr, BSOCK *bs)
    POOLMEM *omsg;
 
    Dsm_check(1);
-   if (!jcr->pool->catalog_files) {
+   if (job_canceled(jcr) || !jcr->pool->catalog_files) {
       goto bail_out;                  /* user disabled cataloging */
    }
    if (!jcr->db) {
diff --git a/bacula/technotes-2.3 b/bacula/technotes-2.3
index 812dc78379..2cf9febc6d 100644
--- a/bacula/technotes-2.3
+++ b/bacula/technotes-2.3
@@ -2,6 +2,7 @@
 
 General:
 26Sep07
+kes  Suppress extra error messages during batch insert failure.
 kes  Add jcr to timer packets so if killed message can be sent to job.
 kes  Add JobId to all Dmsg() output.
 kes  Put some FD auth code on dbglvl rather than fixed.