From 04db1d57234c8d0157419bf75a0419874d994e58 Mon Sep 17 00:00:00 2001 From: Kern Sibbald Date: Sun, 2 Dec 2007 18:04:07 +0000 Subject: [PATCH] kes This patch prevents the 'status dir' command from trying to use a scratch volume and possibly moving it from one pool to another. This patch fixes bug #1019. git-svn-id: https://bacula.svn.sourceforge.net/svnroot/bacula/branches/Branch-2.2@6012 91ce42f0-d328-0410-95d8-f526ca767f89 --- bacula/patches/2.2.6-scratch.patch | 29 +++++++++++++++++++ .../{ => 2.2.x}/2.2.4-ansi-label.patch | 0 .../{ => 2.2.x}/2.2.4-lost-block.patch | 0 .../{ => 2.2.x}/2.2.4-parse-command.patch | 0 .../{ => 2.2.x}/2.2.4-poll-mount.patch | 0 .../patches/{ => 2.2.x}/2.2.4-replace.patch | 0 .../patches/{ => 2.2.x}/2.2.4-restore.patch | 0 .../{ => 2.2.x}/2.2.4-sd-auth-fail.patch | 0 bacula/patches/{ => 2.2.x}/2.2.4-sql.patch | 0 bacula/patches/{ => 2.2.x}/2.2.4-verify.patch | 0 bacula/patches/{ => 2.2.x}/2.2.5-deamon.patch | 0 bacula/patches/{ => 2.2.x}/2.2.5-hb.patch | 0 .../{ => 2.2.x}/2.2.5-lastwritten.patch | 0 .../patches/{ => 2.2.x}/2.2.5-nextvol.patch | 0 .../{ => 2.2.x}/2.2.5-postgresql-errors.patch | 0 .../{ => 2.2.x}/2.2.5-tray-monitor.patch | 0 .../{ => 2.2.x}/2.2.5-verify-loop.patch | 0 bacula/src/dird/next_vol.c | 2 +- bacula/technotes-2.1 | 9 ++++++ 19 files changed, 39 insertions(+), 1 deletion(-) create mode 100644 bacula/patches/2.2.6-scratch.patch rename bacula/patches/{ => 2.2.x}/2.2.4-ansi-label.patch (100%) rename bacula/patches/{ => 2.2.x}/2.2.4-lost-block.patch (100%) rename bacula/patches/{ => 2.2.x}/2.2.4-parse-command.patch (100%) rename bacula/patches/{ => 2.2.x}/2.2.4-poll-mount.patch (100%) rename bacula/patches/{ => 2.2.x}/2.2.4-replace.patch (100%) rename bacula/patches/{ => 2.2.x}/2.2.4-restore.patch (100%) rename bacula/patches/{ => 2.2.x}/2.2.4-sd-auth-fail.patch (100%) rename bacula/patches/{ => 2.2.x}/2.2.4-sql.patch (100%) rename bacula/patches/{ => 2.2.x}/2.2.4-verify.patch (100%) rename bacula/patches/{ => 2.2.x}/2.2.5-deamon.patch (100%) rename bacula/patches/{ => 2.2.x}/2.2.5-hb.patch (100%) rename bacula/patches/{ => 2.2.x}/2.2.5-lastwritten.patch (100%) rename bacula/patches/{ => 2.2.x}/2.2.5-nextvol.patch (100%) rename bacula/patches/{ => 2.2.x}/2.2.5-postgresql-errors.patch (100%) rename bacula/patches/{ => 2.2.x}/2.2.5-tray-monitor.patch (100%) rename bacula/patches/{ => 2.2.x}/2.2.5-verify-loop.patch (100%) diff --git a/bacula/patches/2.2.6-scratch.patch b/bacula/patches/2.2.6-scratch.patch new file mode 100644 index 0000000000..d6da1cd01e --- /dev/null +++ b/bacula/patches/2.2.6-scratch.patch @@ -0,0 +1,29 @@ + + This patch prevents the "status dir" command from trying to use a scratch + volume and possibly moving it from one pool to another. This patch fixes + bug #1019. + + Apply the patch to 2.2.6 (and possibly any 2.2.x version with): + + cd + patch -p0 <2.2.6-scratch.patch + ./configure + make + ... + make install + + + +Index: src/dird/next_vol.c +=================================================================== +--- src/dird/next_vol.c (revision 5999) ++++ src/dird/next_vol.c (working copy) +@@ -97,7 +97,7 @@ + prune_volumes(jcr, InChanger, mr); + } + ok = recycle_oldest_purged_volume(jcr, InChanger, mr); +- if (!ok) { ++ if (!ok && create) { + Dmsg4(050, "after prune volumes_vol ok=%d index=%d InChanger=%d Vstat=%s\n", + ok, index, InChanger, mr->VolStatus); + /* diff --git a/bacula/patches/2.2.4-ansi-label.patch b/bacula/patches/2.2.x/2.2.4-ansi-label.patch similarity index 100% rename from bacula/patches/2.2.4-ansi-label.patch rename to bacula/patches/2.2.x/2.2.4-ansi-label.patch diff --git a/bacula/patches/2.2.4-lost-block.patch b/bacula/patches/2.2.x/2.2.4-lost-block.patch similarity index 100% rename from bacula/patches/2.2.4-lost-block.patch rename to bacula/patches/2.2.x/2.2.4-lost-block.patch diff --git a/bacula/patches/2.2.4-parse-command.patch b/bacula/patches/2.2.x/2.2.4-parse-command.patch similarity index 100% rename from bacula/patches/2.2.4-parse-command.patch rename to bacula/patches/2.2.x/2.2.4-parse-command.patch diff --git a/bacula/patches/2.2.4-poll-mount.patch b/bacula/patches/2.2.x/2.2.4-poll-mount.patch similarity index 100% rename from bacula/patches/2.2.4-poll-mount.patch rename to bacula/patches/2.2.x/2.2.4-poll-mount.patch diff --git a/bacula/patches/2.2.4-replace.patch b/bacula/patches/2.2.x/2.2.4-replace.patch similarity index 100% rename from bacula/patches/2.2.4-replace.patch rename to bacula/patches/2.2.x/2.2.4-replace.patch diff --git a/bacula/patches/2.2.4-restore.patch b/bacula/patches/2.2.x/2.2.4-restore.patch similarity index 100% rename from bacula/patches/2.2.4-restore.patch rename to bacula/patches/2.2.x/2.2.4-restore.patch diff --git a/bacula/patches/2.2.4-sd-auth-fail.patch b/bacula/patches/2.2.x/2.2.4-sd-auth-fail.patch similarity index 100% rename from bacula/patches/2.2.4-sd-auth-fail.patch rename to bacula/patches/2.2.x/2.2.4-sd-auth-fail.patch diff --git a/bacula/patches/2.2.4-sql.patch b/bacula/patches/2.2.x/2.2.4-sql.patch similarity index 100% rename from bacula/patches/2.2.4-sql.patch rename to bacula/patches/2.2.x/2.2.4-sql.patch diff --git a/bacula/patches/2.2.4-verify.patch b/bacula/patches/2.2.x/2.2.4-verify.patch similarity index 100% rename from bacula/patches/2.2.4-verify.patch rename to bacula/patches/2.2.x/2.2.4-verify.patch diff --git a/bacula/patches/2.2.5-deamon.patch b/bacula/patches/2.2.x/2.2.5-deamon.patch similarity index 100% rename from bacula/patches/2.2.5-deamon.patch rename to bacula/patches/2.2.x/2.2.5-deamon.patch diff --git a/bacula/patches/2.2.5-hb.patch b/bacula/patches/2.2.x/2.2.5-hb.patch similarity index 100% rename from bacula/patches/2.2.5-hb.patch rename to bacula/patches/2.2.x/2.2.5-hb.patch diff --git a/bacula/patches/2.2.5-lastwritten.patch b/bacula/patches/2.2.x/2.2.5-lastwritten.patch similarity index 100% rename from bacula/patches/2.2.5-lastwritten.patch rename to bacula/patches/2.2.x/2.2.5-lastwritten.patch diff --git a/bacula/patches/2.2.5-nextvol.patch b/bacula/patches/2.2.x/2.2.5-nextvol.patch similarity index 100% rename from bacula/patches/2.2.5-nextvol.patch rename to bacula/patches/2.2.x/2.2.5-nextvol.patch diff --git a/bacula/patches/2.2.5-postgresql-errors.patch b/bacula/patches/2.2.x/2.2.5-postgresql-errors.patch similarity index 100% rename from bacula/patches/2.2.5-postgresql-errors.patch rename to bacula/patches/2.2.x/2.2.5-postgresql-errors.patch diff --git a/bacula/patches/2.2.5-tray-monitor.patch b/bacula/patches/2.2.x/2.2.5-tray-monitor.patch similarity index 100% rename from bacula/patches/2.2.5-tray-monitor.patch rename to bacula/patches/2.2.x/2.2.5-tray-monitor.patch diff --git a/bacula/patches/2.2.5-verify-loop.patch b/bacula/patches/2.2.x/2.2.5-verify-loop.patch similarity index 100% rename from bacula/patches/2.2.5-verify-loop.patch rename to bacula/patches/2.2.x/2.2.5-verify-loop.patch diff --git a/bacula/src/dird/next_vol.c b/bacula/src/dird/next_vol.c index 6aecf5331d..29a92541b6 100644 --- a/bacula/src/dird/next_vol.c +++ b/bacula/src/dird/next_vol.c @@ -97,7 +97,7 @@ int find_next_volume_for_append(JCR *jcr, MEDIA_DBR *mr, int index, prune_volumes(jcr, InChanger, mr); } ok = recycle_oldest_purged_volume(jcr, InChanger, mr); - if (!ok) { + if (!ok && create) { Dmsg4(050, "after prune volumes_vol ok=%d index=%d InChanger=%d Vstat=%s\n", ok, index, InChanger, mr->VolStatus); /* diff --git a/bacula/technotes-2.1 b/bacula/technotes-2.1 index bf3cae6566..0e27fe47c2 100644 --- a/bacula/technotes-2.1 +++ b/bacula/technotes-2.1 @@ -1,12 +1,21 @@ Technical notes on version 2.2 General: +02Dec07 +kes This patch prevents the 'status dir' command from trying to use a scratch + volume and possibly moving it from one pool to another. This patch fixes + bug #1019. 30Nov07 kes Fix --archivedir addition to configure. Replace it with --with-archivedir in configure.in This fixes the regression test builds. kes This patch fixes bug #1012 where the job is canceled because of Max Run Time exceeded when the job has not yet started. +29Nov07 +ebl Apply Richard Mortimer patch that fixes #1016 when there are more than + one 'part' to write. Instead of each part being stored on disk, + written to DVD, then deleted from disk, all parts are written to disk, + and only the last is written and deleted from disk. 27Nov07 kes Correct typos in disk-changer.in 25Nov07 -- 2.39.5