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 9b1432ebc539ef34677a1a440a8b7326fcde23f9..151a4e62606e1899c9dc861fde3799c76ccdd626 100644 (file)
--- 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 e915e22bbc76ac8508fc7843ff5717bb34e6d7d1..7cd2f781a5179915b9c941d0c92db01e23449c20 100644 (file)
--- 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 aa65c156e0a2df6a9b652f2c7e37ae6cffbc526e..aca9514aa2ffb012d412c240209e4276f6d5e9e4 100644 (file)
--- 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.