From: Kern Sibbald <kern@sibbald.com>
Date: Wed, 8 Oct 2008 16:50:49 +0000 (+0000)
Subject: kes  Fix migration SQL not to migrate a job that has not terminated.
X-Git-Tag: Release-2.4.3~5
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=abe5bb682be9b677e868d4313470a90b54b8276f;p=bacula%2Fbacula

kes  Fix migration SQL not to migrate a job that has not terminated.
     This is a partial fix to bug #1164.


git-svn-id: https://bacula.svn.sourceforge.net/svnroot/bacula/branches/Branch-2.4@7736 91ce42f0-d328-0410-95d8-f526ca767f89
---

diff --git a/bacula/src/dird/migrate.c b/bacula/src/dird/migrate.c
index a1b54c40f0..0327b018ff 100644
--- a/bacula/src/dird/migrate.c
+++ b/bacula/src/dird/migrate.c
@@ -554,7 +554,7 @@ const char *sql_oldest_vol =
 const char *sql_jobids_from_mediaid =
    "SELECT DISTINCT Job.JobId,Job.StartTime FROM JobMedia,Job"
    " WHERE JobMedia.JobId=Job.JobId AND JobMedia.MediaId IN (%s)"
-   " AND Job.Type='B'"
+   " AND Job.Type='B' AND Job.JobStatus = 'T'"
    " ORDER by Job.StartTime";
 
 /* Get the number of bytes in the pool */
@@ -563,7 +563,7 @@ const char *sql_pool_bytes =
    " (SELECT DISTINCT Job.JobId from Pool,Job,Media,JobMedia WHERE"
    " Pool.Name='%s' AND Media.PoolId=Pool.PoolId AND"
    " VolStatus in ('Full','Used','Error','Append') AND Media.Enabled=1 AND"
-   " Job.Type='B' AND"
+   " Job.Type='B' AND Job.JobStatus = 'T' AND"
    " JobMedia.JobId=Job.JobId AND Job.PoolId=Media.PoolId)";
 
 /* Get the number of bytes in the Jobs */
@@ -582,7 +582,7 @@ const char *sql_pool_time =
    "SELECT DISTINCT Job.JobId from Pool,Job,Media,JobMedia WHERE"
    " Pool.Name='%s' AND Media.PoolId=Pool.PoolId AND"
    " VolStatus in ('Full','Used','Error') AND Media.Enabled=1 AND"
-   " Job.Type='B' AND"
+   " Job.Type='B' AND Job.JobStatus = 'T' AND"
    " JobMedia.JobId=Job.JobId AND Job.PoolId=Media.PoolId"
    " AND Job.RealEndTime<='%s'";