Add message to migration job when the target job is already migrated.

     This closes bug #1129.

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

diff --git a/bacula/kernstodo b/bacula/kernstodo
index 530d143294a850ace68f623eaf0744fd3e235fbd..d9ff41505329eb31f804165ae704161664605618 100644 (file)
--- a/bacula/kernstodo
+++ b/bacula/kernstodo
@@ -114,6 +114,23 @@ Professional Needs:
 
 Priority:
 ================
+- Can be posible modify package to create and use configuration files in 
+   the Debian manner? 
+
+   For example:
+
+   /etc/bacula/bacula-dir.conf
+   /etc/bacula/conf.d/pools.conf
+   /etc/bacula/conf.d/clients.conf
+   /etc/bacula/conf.d/storages.conf
+
+   and into bacula-dir.conf file include
+
+   @/etc/bacula/conf.d/pools.conf
+   @/etc/bacula/conf.d/clients.conf
+   @/etc/bacula/conf.d/storages.conf
+- Possibly add an Inconsistent state when a Volume is in error
+  for non I/O reasons.
 - Fix #ifdefing so that smartalloc can be disabled. Check manual
   -- the default is enabled.
 - Change calling sequence to delete_job_id_range() in ua_cmds.c 

diff --git a/bacula/patches/2.4.2-mig-message.patch b/bacula/patches/2.4.2-mig-message.patch
new file mode 100644 (file)
index 0000000..a9d2f67
--- /dev/null
+++ b/bacula/patches/2.4.2-mig-message.patch
@@ -0,0 +1,29 @@
+
+ This patch causes a message to be printed if the migration job finds that
+ the target job has already been migrated:
+
+    JobId %s already migrated probably by another Job. Migration stopped.
+
+  It can be applied to 2.4.2 (not to previous versions) with:
+
+  cd <bacula-source>
+  patch -p0 <2.4.2-mig-message.patch
+  ./configure <your-options>
+  make
+  ...
+  make install
+
+
+Index: src/dird/migrate.c
+===================================================================
+--- src/dird/migrate.c (revision 7444)
++++ src/dird/migrate.c (working copy)
+@@ -284,6 +284,8 @@
+    }
+    /* Make sure this job was not already migrated */
+    if (jcr->previous_jr.JobType != JT_BACKUP) {
++      Jmsg(jcr, M_INFO, 0, _("JobId %s already migrated probably by another Job. Migration stopped.\n"),
++         edit_int64(jcr->previous_jr.JobId, ed1));
+       set_jcr_job_status(jcr, JS_Terminated);
+       migration_cleanup(jcr, jcr->JobStatus);
+       return true;

diff --git a/bacula/src/dird/migrate.c b/bacula/src/dird/migrate.c
index 07d90fe75da53cd62c44500c73d3070f890cbf6d..edc24b1f566e6066bb9b34f92a11d26221fd2228 100644 (file)
--- a/bacula/src/dird/migrate.c
+++ b/bacula/src/dird/migrate.c
@@ -286,6 +286,8 @@ bool do_migration(JCR *jcr)
    }
    /* Make sure this job was not already migrated */
    if (jcr->previous_jr.JobType != JT_BACKUP) {
+      Jmsg(jcr, M_INFO, 0, _("JobId %s already migrated probably by another Job. Migration stopped.\n"),
+         edit_int64(jcr->previous_jr.JobId, ed1));
       set_jcr_job_status(jcr, JS_Terminated);
       migration_cleanup(jcr, jcr->JobStatus);
       return true;

diff --git a/bacula/src/version.h b/bacula/src/version.h
index 95f056365b0b522fabc78b034eaeafb8d64584d0..e65f12ae8775b91d1f15c11ee26fd2124e00a43e 100644 (file)
--- a/bacula/src/version.h
+++ b/bacula/src/version.h
@@ -3,9 +3,9 @@
  */
 
 #undef  VERSION
-#define VERSION "2.5.2"
-#define BDATE   "30 July 2008"
-#define LSMDATE "30Jul08"
+#define VERSION "2.5.3"
+#define BDATE   "08 Aug 2008"
+#define LSMDATE "08Aug08"
 
 #define PROG_COPYRIGHT "Copyright (C) %d-2008 Free Software Foundation Europe e.V.\n"
 #define BYEAR "2008"       /* year for copyright messages in progs */

diff --git a/bacula/technotes-2.5 b/bacula/technotes-2.5
index 05aa12047e619df91e4aaf850c8ce942327c98e4..6c355d22e520a63cae03d011c287061a084945b1 100644 (file)
--- a/bacula/technotes-2.5
+++ b/bacula/technotes-2.5
@@ -32,6 +32,9 @@ separator in console (!$%&'()*+,-/:;<>?[]^`{|}~)
 
 
 General:
+08Aug08
+kes  Add message to migration job when the target job is already migrated.
+     This closes bug #1129.
 30Jul08
 kes  Fix Win32 build.
 kes  Raise some restore debug levels.