From: Eric Bollengier Date: Thu, 20 Nov 2008 16:09:52 +0000 (+0000) Subject: ebl Apply patch for bug #1182 about Recycle flag X-Git-Tag: Release-3.0.0~557 X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=58d6f13c489792ef0203a32381ebf1f71dff35c4;p=bacula%2Fbacula ebl Apply patch for bug #1182 about Recycle flag that is not updated after a pool change. git-svn-id: https://bacula.svn.sourceforge.net/svnroot/bacula/trunk@8073 91ce42f0-d328-0410-95d8-f526ca767f89 --- diff --git a/bacula/Patchnotes-2.5 b/bacula/Patchnotes-2.5 index f505f3424d..e72624f94d 100644 --- a/bacula/Patchnotes-2.5 +++ b/bacula/Patchnotes-2.5 @@ -4,12 +4,9 @@ Patches Committed: 20Nov08 patches/testing/1175-unique-inchanger.patch - -Patches being Tested: -12Nov08 patches/testing/1182-recycle-flag.patch -ebl Update Recycle flag during a db_media_update_record() +Patches being Tested: patches/testing/fileid64.patch ebl Update the FileId_t to 64bit, update catalog creation and upgrade scripts. diff --git a/bacula/patches/testing/1182-recycle-flag.patch b/bacula/patches/testing/1182-recycle-flag.patch deleted file mode 100644 index 56e8faed55..0000000000 --- a/bacula/patches/testing/1182-recycle-flag.patch +++ /dev/null @@ -1,34 +0,0 @@ - - This patch should fix the bug #1182 about Recycle flag - that is not updated after a pool change. - Should work for 2.4.3. - - cd - patch -p0 <1182-prune.patch - ./configure - make - ... - make install - -Index: src/cats/sql_update.c -=================================================================== ---- src/cats/sql_update.c (révision 7981) -+++ src/cats/sql_update.c (copie de travail) -@@ -384,7 +384,7 @@ - "Slot=%d,InChanger=%d,VolReadTime=%s,VolWriteTime=%s,VolParts=%d," - "LabelType=%d,StorageId=%s,PoolId=%s,VolRetention=%s,VolUseDuration=%s," - "MaxVolJobs=%d,MaxVolFiles=%d,Enabled=%d,LocationId=%s," -- "ScratchPoolId=%s,RecyclePoolId=%s,RecycleCount=%d" -+ "ScratchPoolId=%s,RecyclePoolId=%s,RecycleCount=%d,Recycle=%d" - " WHERE VolumeName='%s'", - mr->VolJobs, mr->VolFiles, mr->VolBlocks, edit_uint64(mr->VolBytes, ed1), - mr->VolMounts, mr->VolErrors, mr->VolWrites, -@@ -402,7 +402,7 @@ - mr->Enabled, edit_uint64(mr->LocationId, ed9), - edit_uint64(mr->ScratchPoolId, ed10), - edit_uint64(mr->RecyclePoolId, ed11), -- mr->RecycleCount, -+ mr->RecycleCount,mr->Recycle, - mr->VolumeName); - - Dmsg1(400, "%s\n", mdb->cmd); diff --git a/bacula/src/cats/sql_update.c b/bacula/src/cats/sql_update.c index 5e11a278f5..d567fbff0f 100644 --- a/bacula/src/cats/sql_update.c +++ b/bacula/src/cats/sql_update.c @@ -384,7 +384,7 @@ db_update_media_record(JCR *jcr, B_DB *mdb, MEDIA_DBR *mr) "Slot=%d,InChanger=%d,VolReadTime=%s,VolWriteTime=%s,VolParts=%d," "LabelType=%d,StorageId=%s,PoolId=%s,VolRetention=%s,VolUseDuration=%s," "MaxVolJobs=%d,MaxVolFiles=%d,Enabled=%d,LocationId=%s," - "ScratchPoolId=%s,RecyclePoolId=%s,RecycleCount=%d" + "ScratchPoolId=%s,RecyclePoolId=%s,RecycleCount=%d,Recycle=%d" " WHERE VolumeName='%s'", mr->VolJobs, mr->VolFiles, mr->VolBlocks, edit_uint64(mr->VolBytes, ed1), mr->VolMounts, mr->VolErrors, mr->VolWrites, @@ -402,7 +402,7 @@ db_update_media_record(JCR *jcr, B_DB *mdb, MEDIA_DBR *mr) mr->Enabled, edit_uint64(mr->LocationId, ed9), edit_uint64(mr->ScratchPoolId, ed10), edit_uint64(mr->RecyclePoolId, ed11), - mr->RecycleCount, + mr->RecycleCount,mr->Recycle, mr->VolumeName); Dmsg1(400, "%s\n", mdb->cmd); diff --git a/bacula/technotes-2.5 b/bacula/technotes-2.5 index 9991d9cddf..c68d17a92d 100644 --- a/bacula/technotes-2.5 +++ b/bacula/technotes-2.5 @@ -11,6 +11,8 @@ mixed priorities General: 20Nov08 +ebl Apply patch for bug #1182 about Recycle flag + that is not updated after a pool change. kes Since the user has been warned, allow console purge command to purge volumes that are in use. kes Fix Win32 build to add new sd_plugins.c