From e2f6ab9e7a8e7c84465d90c965b9b4848a87fee1 Mon Sep 17 00:00:00 2001 From: Kern Sibbald Date: Fri, 20 Mar 2009 09:49:16 +0000 Subject: [PATCH] Proposed fix for bug #1227 Job and labeling new tape git-svn-id: https://bacula.svn.sourceforge.net/svnroot/bacula/trunk@8557 91ce42f0-d328-0410-95d8-f526ca767f89 --- bacula/src/stored/label.c | 3 ++- bacula/src/stored/wait.c | 8 +++++++- bacula/src/version.h | 6 +++--- bacula/technotes-2.5 | 28 +++++++++++++++++++--------- 4 files changed, 31 insertions(+), 14 deletions(-) diff --git a/bacula/src/stored/label.c b/bacula/src/stored/label.c index b4274059bd..48656a4f3f 100644 --- a/bacula/src/stored/label.c +++ b/bacula/src/stored/label.c @@ -1,7 +1,7 @@ /* Bacula® - The Network Backup Solution - Copyright (C) 2000-2008 Free Software Foundation Europe e.V. + Copyright (C) 2000-2009 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. @@ -398,6 +398,7 @@ bool write_new_volume_label_to_dev(DCR *dcr, const char *VolName, if (reserve_volume(dcr, VolName) == NULL) { Mmsg2(dcr->jcr->errmsg, _("Could not reserve volume %s on %s\n"), dev->VolHdr.VolumeName, dev->print_name()); + Dmsg1(100, "%s", dcr->jcr->errmsg); goto bail_out; } dev = dcr->dev; /* may have changed in reserve_volume */ diff --git a/bacula/src/stored/wait.c b/bacula/src/stored/wait.c index ca44328955..3cdf8e095a 100644 --- a/bacula/src/stored/wait.c +++ b/bacula/src/stored/wait.c @@ -62,8 +62,14 @@ int wait_for_sysop(DCR *dcr) dev->dlock(); Dmsg1(dbglvl, "Enter blocked=%s\n", dev->print_blocked()); - unmounted = is_device_unmounted(dev); + /* + * Since we want to mount a tape, make sure current one is + * not marked as using this drive. + */ + volume_unused(dcr); + + unmounted = is_device_unmounted(dev); dev->poll = false; /* * Wait requested time (dev->rem_wait_sec). However, we also wake up every diff --git a/bacula/src/version.h b/bacula/src/version.h index 9612460079..ea0444ef2f 100644 --- a/bacula/src/version.h +++ b/bacula/src/version.h @@ -3,9 +3,9 @@ */ #undef VERSION -#define VERSION "2.5.42-b2" -#define BDATE "16 March 2009" -#define LSMDATE "16Mar09" +#define VERSION "2.5.43" +#define BDATE "20 March 2009" +#define LSMDATE "20Mar09" #define PROG_COPYRIGHT "Copyright (C) %d-2009 Free Software Foundation Europe e.V.\n" #define BYEAR "2009" /* year for copyright messages in progs */ diff --git a/bacula/technotes-2.5 b/bacula/technotes-2.5 index b22e0e1e57..e4c449a8ca 100644 --- a/bacula/technotes-2.5 +++ b/bacula/technotes-2.5 @@ -23,15 +23,21 @@ bpipe fd plugin Exchange plugin -New features to be documented: -Update src/plugins/README -command separator in console (!$%&'()*+,-/:;<>?[]^`{|}~) -examples/database/dbcheck.sql -enhancement to wait command: wait mount ... -dbport in dbcheck -filepattern (restore with regex in bsr) -Allow Mixed Priorities -Eliminated license problems with OpenSSL. +-New features to be documented: +-Update src/plugins/README +-command separator in console (!$%&'()*+,-/:;<>?[]^`{|}~) +-examples/database/dbcheck.sql +-enhancement to wait command: wait mount ... +-dbport in dbcheck +-filepattern (restore with regex in bsr) +-Allow Mixed Priorities Kjetil Torgrim Homme 30Jun08 +-Eliminated license problems with OpenSSL. +- The exchange plugin truncates the exchange logs as soon as it has +sent the data to the sd. If the sd is spooling and something +goes wrong and the data doesn't make it to the backup medium then +the logs are lost, which could be a problem under some +restore scenarios. +- Regex filtered bsrs Kjetil Torgrim Homme 15Aug08 Code to be completed before 3.0.0 is released: *1. Fix bug #1221 problem with NODUMP flag @@ -43,6 +49,10 @@ Code to be completed before 3.0.0 is released: General: +20Mar09 +kes Proposed fix for bug #1227 Job and labeling new tape. + +Beta release 2.5.42-b2 16Mar09 kes Increase timeout for unmounting DVD as suggested by reporter of bug #1250. -- 2.39.5