Merge pull request #1154

systemtest: fix `always-incremental-consolidate` sporadic failures

CHANGELOG.md

@@ -49,6 +49,7 @@ and since Bareos version 20 this project adheres to [Semantic Versioning](https:
 - FreeBSD packages: add missing ddl/update 2171_2192 and 2192_2210 files [PR #1147]
 - Fix director connects to client while `Connection From Director To Client` is disabled. [PR #1099]
 - cats: make `.bvfs_update` and `.bvfs_versions` take archive jobs into consideration [PR #1152]
+- Fix `always-incremental-consolidate` systemtest sporadic fails, and rename it. [PR #1154]
 
 ### Changed
 - contrib: rename Python modules to satisfy PEP8 [PR #768]

core/src/cats/sql_get.cc

@@ -1398,10 +1398,10 @@ bool BareosDb::AccurateGetJobids(JobControlRecord* jcr,
 
   // Build a jobid list ie: 1,2,3,4
   if (jr->limit) {
-    Mmsg(query, "SELECT JobId FROM btemp3%s ORDER by JobTDate LIMIT %d", jobid,
-         jr->limit);
+    Mmsg(query, "SELECT JobId FROM btemp3%s ORDER by JobTDate ASC LIMIT %d",
+         jobid, jr->limit);
   } else {
-    Mmsg(query, "SELECT JobId FROM btemp3%s ORDER by JobTDate", jobid);
+    Mmsg(query, "SELECT JobId FROM btemp3%s ORDER by JobTDate ASC", jobid);
   }
   SqlQueryWithHandler(query.c_str(), DbListHandler, jobids);
   Dmsg1(1, "db_accurate_get_jobids=%s\n", jobids->GetAsString().c_str());

systemtests/tests/CMakeLists.txt

@@ -18,7 +18,7 @@
 #   02110-1301, USA.
 
 add_subdirectory(acl)
-add_subdirectory(ai-consolidate-ignore-duplicate-job)
+add_subdirectory(always-incremental-consolidate)
 add_subdirectory(autochanger)
 add_subdirectory(bareos)
 add_subdirectory(bareos-acl)

systemtests/tests/ai-consolidate-ignore-duplicate-job/etc/bareos/bareos-dir.d/job/backup-bareos-fd.conf.in → systemtests/tests/always-incremental-consolidate/etc/bareos/bareos-dir.d/job/backup-bareos-fd.conf.in

@@ -7,4 +7,8 @@ Job {
   AlwaysIncrementalJobRetention = 1 seconds
   AlwaysIncrementalKeepNumber = 1
   AlwaysIncrementalMaxFullAge = 1 seconds
+  Run Script {
+        command = "sleep 2"
+        Runs When = Before
+  }
 }