From: Kern Sibbald <kern@sibbald.com>
Date: Sat, 16 Feb 2008 12:31:54 +0000 (+0000)
Subject: Misc copyright dates, debug enhancement ...
X-Git-Tag: Release-7.0.0~5013
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=52557ca5af151fbcb4779eda090f32215df9177a;p=bacula%2Fbacula

Misc copyright dates, debug enhancement ...

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

diff --git a/bacula/kernstodo b/bacula/kernstodo
index 3ac80e0e44..a178b1fb8c 100644
--- a/bacula/kernstodo
+++ b/bacula/kernstodo
@@ -1,5 +1,5 @@
                     Kern's ToDo List
-                    02 January 2008
+                    15 February 2008
 
 
 Document:
@@ -71,6 +71,7 @@ Professional Needs:
    and http://www.openeyet.nl/scc/ for managing customer changes
 
 Priority:
+- Implement unmount of USB volumes.
 - Use "./config no-idea no-mdc2 no-rc5" on building OpenSSL for
   Win32 to avoid patent problems.
 - Plugins
diff --git a/bacula/src/stored/acquire.c b/bacula/src/stored/acquire.c
index e060ae9e16..a9946dc354 100644
--- a/bacula/src/stored/acquire.c
+++ b/bacula/src/stored/acquire.c
@@ -359,7 +359,8 @@ DCR *acquire_device_for_append(DCR *dcr)
           !(dir_find_next_appendable_volume(dcr) &&
             strcmp(dev->VolHdr.VolumeName, dcr->VolumeName) == 0)) { /* wrong tape mounted */
          /* Wrong tape mounted, release it, then fall through to get correct one */
-         Dmsg0(50, "Wrong tape mounted, release and try mount.\n");
+         Dmsg3(50, "Wrong tape mounted. Wanted:%s, got:%s, dev=%s release and try mount.\n",
+              dcr->VolumeName, dev->VolHdr.VolumeName, dev->print_name());
          release = true;
          do_mount = true;
       } else {
@@ -371,14 +372,6 @@ DCR *acquire_device_for_append(DCR *dcr)
           do_mount = strcmp(dcr->VolCatInfo.VolCatStatus, "Recycle") == 0;
           Dmsg2(190, "jid=%u Correct tape mounted. recycle=%d\n", 
                 (uint32_t)jcr->JobId, do_mount);
-#ifdef xxx
-          if (do_mount && dev->num_writers != 0) {
-             Jmsg(jcr, M_FATAL, 0, _("Cannot recycle volume \"%s\""
-                  " on device %s because it is in use by another job.\n"),
-                  dev->VolHdr.VolumeName, dev->print_name());
-             goto get_out;
-          }
-#endif
           if (dev->num_writers == 0) {
              memcpy(&dev->VolCatInfo, &dcr->VolCatInfo, sizeof(dev->VolCatInfo));
           }
diff --git a/bacula/src/stored/bextract.c b/bacula/src/stored/bextract.c
index b4c9ff1a44..53eb01b8f1 100644
--- a/bacula/src/stored/bextract.c
+++ b/bacula/src/stored/bextract.c
@@ -516,5 +516,3 @@ bool dir_get_volume_info(DCR *dcr, enum get_vol_info_rw  writing)
    return 1;
 }
 
-void generate_plugin_event(JCR *jcr, bEventType eventType, void *value)
-{ return; }
diff --git a/bacula/src/stored/bls.c b/bacula/src/stored/bls.c
index 82cc3f1b7b..3e18ddb76f 100644
--- a/bacula/src/stored/bls.c
+++ b/bacula/src/stored/bls.c
@@ -476,5 +476,3 @@ bool dir_get_volume_info(DCR *dcr, enum get_vol_info_rw  writing)
    return 1;
 }
 
-void generate_plugin_event(JCR *jcr, bEventType eventType, void *value)
-{ return; }
diff --git a/bacula/src/stored/lock.c b/bacula/src/stored/lock.c
index 28200047b9..647dd19dcf 100644
--- a/bacula/src/stored/lock.c
+++ b/bacula/src/stored/lock.c
@@ -1,7 +1,7 @@
 /*
    Bacula® - The Network Backup Solution
 
-   Copyright (C) 2000-2007 Free Software Foundation Europe e.V.
+   Copyright (C) 2000-2008 Free Software Foundation Europe e.V.
 
    The main author of Bacula is Kern Sibbald, with contributions from
    many others, a complete list can be found in the file AUTHORS.
diff --git a/bacula/technotes-2.3 b/bacula/technotes-2.3
index 1f137286c4..bc9d0987b2 100644
--- a/bacula/technotes-2.3
+++ b/bacula/technotes-2.3
@@ -2,6 +2,8 @@
 
 General:
 14Feb08
+kes  Fix creating first JobMedia record during Migration to include
+     proper index. This caused slow restores of migrated jobs.
 kes  Temp fix to plugin name file_index.
 kes  Bacula backed up and restored a MySQL database.
 13Feb08