From: Eric Bollengier <eric@baculasystems.com>
Date: Fri, 24 Apr 2020 15:56:17 +0000 (+0200)
Subject: BEE Backport bacula/src/dird/mac_sql.c
X-Git-Tag: Release-11.3.2~1756
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=ec87558847a015c4f7eb82fc7b154dcd0f47dfdc;p=thirdparty%2Fbacula.git

BEE Backport bacula/src/dird/mac_sql.c

This commit is the result of the squash of the following main commits:

Author: Eric Bollengier <eric@baculasystems.com>
Date:   Fri Aug 16 18:15:00 2019 +0200

    Fix PoolUncopiedJob query for MySQL
---

diff --git a/bacula/src/dird/mac_sql.c b/bacula/src/dird/mac_sql.c
index a00850092b..466558546b 100644
--- a/bacula/src/dird/mac_sql.c
+++ b/bacula/src/dird/mac_sql.c
@@ -157,7 +157,7 @@ static const char *sql_jobids_of_pool_uncopied_jobs =
    "SELECT DISTINCT Job.JobId,Job.StartTime FROM Job,Pool"
    " WHERE Pool.Name = '%s' AND Pool.PoolId = Job.PoolId"
    " AND Job.Type = 'B' AND Job.JobStatus IN ('T','W')"
-   " AND Job.jobBytes > 0"
+   " AND Job.JobBytes > 0"
    " AND Job.JobId NOT IN"
    " (SELECT PriorJobId FROM Job WHERE"
    " Type IN ('B','C') AND Job.JobStatus IN ('T','W')"
@@ -382,7 +382,7 @@ int getJob_to_migrate(JCR *jcr)
       Dmsg2(dbglevel, "Before loop count=%d ids=%s\n", ids.count, ids.list);
       /*
        * Note: to not over load the system, limit the number
-       *  of new jobs started to Maximum Spawned Jobs
+       *  of new jobs started to 100 (see limit above)
        */
       for (int i=1; i < (int)ids.count; i++) {
          JobId = 0;