Merge pull request #810 from alaaeddineelamri/dev/alaaeddineelamri/ma…

…ster/bug-0001194-incremental-backup

Fix bug-0001194: accurate incremental backup

CHANGELOG.md

@@ -8,6 +8,7 @@ and since Bareos version 20 this project adheres to [Semantic Versioning](https:
 ### Fixed
 - fix shutdown of the Storage Daemon backends, especially call UnlockDoor on tape devices [PR #809]
 - fix possible deadlock in storage backend on Solaris and FreeBSD [PR #809]
+- [bug-0001194]: when doing an accurate incremental backup, if there is a database error, a full backup is done instead of reporting the error [PR #810]
 - fix a bug in a date function that leads to errors on the 31st day of a month [PR #782]
 - fix possible read/write problems when using droplet with https [PR #765]
 - fix "configure add" handling of quoted strings [PR #764]

core/src/dird/backup.cc

@@ -351,9 +351,13 @@ bool SendAccurateCurrentFiles(JobControlRecord* jcr)
       return false; /* Fail */
     }
 
-    jcr->db_batch->GetFileList(
-        jcr, jobids.GetAsString().c_str(), jcr->impl->use_accurate_chksum,
-        false /* no delta */, AccurateListHandler, (void*)jcr);
+    if (!jcr->db_batch->GetFileList(
+            jcr, jobids.GetAsString().c_str(), jcr->impl->use_accurate_chksum,
+            false /* no delta */, AccurateListHandler, (void*)jcr)) {
+      Jmsg(jcr, M_FATAL, 0, "error in jcr->db_batch->GetBaseFileList:%s\n",
+           jcr->db_batch->strerror());
+      return false;
+    }
   }
 
   jcr->file_bsock->signal(BNET_EOD);