From: Kern Sibbald <kern@sibbald.com>
Date: Mon, 4 Dec 2006 17:25:18 +0000 (+0000)
Subject: kes  Make migration with nothing to do set normal termination.
X-Git-Tag: Release-2.0.0~170
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=b62182c03f31c6e10cdd6785165ccf0fdc7bcaaf;p=bacula%2Fbacula

kes  Make migration with nothing to do set normal termination.
kes  Change message when job manually started to say Job queued. ...


git-svn-id: https://bacula.svn.sourceforge.net/svnroot/bacula/trunk@3747 91ce42f0-d328-0410-95d8-f526ca767f89
---

diff --git a/bacula/src/dird/migrate.c b/bacula/src/dird/migrate.c
index 9b1432ebc5..151a4e6260 100644
--- a/bacula/src/dird/migrate.c
+++ b/bacula/src/dird/migrate.c
@@ -255,8 +255,14 @@ bool do_migration(JCR *jcr)
    BSOCK *sd;
    JCR *mig_jcr = jcr->mig_jcr;    /* newly migrated job */
 
+   /*
+    * If mig_jcr is NULL, there is nothing to do for this job,
+    *  so set a normal status, cleanup and return OK.
+    */
    if (!mig_jcr) {
-      return false;
+      set_jcr_job_status(jcr, JS_Terminated);
+      migration_cleanup(jcr, jcr->JobStatus);
+      return true;
    }
 
    /* Print Job Start message */
diff --git a/bacula/src/dird/ua_run.c b/bacula/src/dird/ua_run.c
index e915e22bbc..7cd2f781a5 100644
--- a/bacula/src/dird/ua_run.c
+++ b/bacula/src/dird/ua_run.c
@@ -958,7 +958,7 @@ start_job:
          bsendmsg(ua, _("Job failed.\n"));
       } else {
          char ed1[50];
-         bsendmsg(ua, _("Job started. JobId=%s\n"), edit_int64(JobId,ed1));
+         bsendmsg(ua, _("Job queued. JobId=%s\n"), edit_int64(JobId,ed1));
       }
       return JobId;
    }
diff --git a/bacula/technotes-1.39 b/bacula/technotes-1.39
index aa65c156e0..aca9514aa2 100644
--- a/bacula/technotes-1.39
+++ b/bacula/technotes-1.39
@@ -2,6 +2,8 @@
 
 General:
 04Dec06
+kes  Make migration with nothing to do set normal termination.
+kes  Change message when job manually started to say Job queued. ... 
 kes  Add job report indication of whether or not VSS and Encryption were
      used by the FD.
 kes  Modify sparseBlock variable name to make the code clearer.