diff --git a/core/src/dird/consolidate.cc b/core/src/dird/consolidate.cc index 1d57443750d..123ea2295b0 100644 --- a/core/src/dird/consolidate.cc +++ b/core/src/dird/consolidate.cc @@ -68,9 +68,10 @@ static inline void StartNewConsolidationJob(JobControlRecord* jcr, ua->batch = true; Mmsg(ua->cmd, "run job=\"%s\" jobid=%s level=VirtualFull priority=%d accurate=%s " - "allowmixedpriority=%s", + "spooldata=%s allowmixedpriority=%s", jobname, jcr->dir_impl->vf_jobids, jcr->JobPriority, - jcr->accurate ? "yes" : "no", jcr->allow_mixed_priority ? "yes" : "no"); + jcr->accurate ? "yes" : "no", jcr->dir_impl->spool_data ? "yes" : "no", + jcr->allow_mixed_priority ? "yes" : "no"); Dmsg1(debuglevel, "=============== consolidate cmd=%s\n", ua->cmd); ParseUaArgs(ua); /* parse command */ diff --git a/core/src/dird/ua_run.cc b/core/src/dird/ua_run.cc index 6f6882b66c3..d7cc2752272 100644 --- a/core/src/dird/ua_run.cc +++ b/core/src/dird/ua_run.cc @@ -992,8 +992,8 @@ static bool ResetRestoreContext(UaContext* ua, jcr->dir_impl->IgnoreDuplicateJobChecking = rc.ignoreduplicatecheck; } - // Used by consolidate jobs to make spawned virtualfulls inherit the - // AllowMixedPriority flag + /* Used by consolidate jobs to make spawned virtualfulls inherit the + * AllowMixedPriority flag */ if (rc.allow_mixed_priority_set) { jcr->allow_mixed_priority = rc.allow_mixed_priority; } diff --git a/systemtests/tests/always-incremental-consolidate/etc/bareos/bareos-dir.d/job/Consolidate-lower-priority.conf b/systemtests/tests/always-incremental-consolidate/etc/bareos/bareos-dir.d/job/Consolidate-lower-priority.conf index d6519cb051e..41cd7396200 100644 --- a/systemtests/tests/always-incremental-consolidate/etc/bareos/bareos-dir.d/job/Consolidate-lower-priority.conf +++ b/systemtests/tests/always-incremental-consolidate/etc/bareos/bareos-dir.d/job/Consolidate-lower-priority.conf @@ -9,4 +9,5 @@ Job { Cancel Running Duplicates = no Allow Mixed Priority = yes Priority = 20 + Spool Data = no } diff --git a/systemtests/tests/always-incremental-consolidate/etc/bareos/bareos-dir.d/job/backup-bareos-fd-high-priority.conf.in b/systemtests/tests/always-incremental-consolidate/etc/bareos/bareos-dir.d/job/backup-bareos-fd-high-priority.conf.in index 1d8edd6d736..563571426fe 100644 --- a/systemtests/tests/always-incremental-consolidate/etc/bareos/bareos-dir.d/job/backup-bareos-fd-high-priority.conf.in +++ b/systemtests/tests/always-incremental-consolidate/etc/bareos/bareos-dir.d/job/backup-bareos-fd-high-priority.conf.in @@ -10,6 +10,7 @@ Job { AlwaysIncrementalMaxFullAge = 1 seconds Allow Mixed Priority = no Priority = 10 + Spool Data = yes # Enabling spooling to test consolidate Spool Data = no override Run Script { Command = "sleep 5" Runs When = Before diff --git a/systemtests/tests/always-incremental-consolidate/testrunner b/systemtests/tests/always-incremental-consolidate/testrunner index 9a1174f2458..22448132377 100755 --- a/systemtests/tests/always-incremental-consolidate/testrunner +++ b/systemtests/tests/always-incremental-consolidate/testrunner @@ -182,7 +182,7 @@ wait job=$JobNameLowPriority messages @$out $tmp/priorities1.out list jobs -@$out /dev/null +@$out $tmp/spooling.out wait messages @$out $tmp/priorities2.out @@ -234,4 +234,8 @@ expect_grep "|.*26.*|.*${JobNameHighPriority}.*|.*T.*|" \ "$tmp"/priorities2.out \ "spawned low priority consolidate job was not successful." +expect_not_grep "Spooling data" \ + "$tmp"/spooling.out \ + "spawned low priority consolidate job is spooling unexpectedly." + end_test