From 1f8bc7d3a8872ac4130e80413165ccff52ea0eac Mon Sep 17 00:00:00 2001 From: Alaa Eddine Elamri Date: Thu, 6 May 2021 00:24:22 +0100 Subject: [PATCH] dir: fix for incremental backup bug Added check for file list fetching in case of failure --- core/src/dird/backup.cc | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/core/src/dird/backup.cc b/core/src/dird/backup.cc index 21edf705317..a6d97db4fe9 100644 --- a/core/src/dird/backup.cc +++ b/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);