From: Kern Sibbald Date: Fri, 12 Jan 2007 09:59:05 +0000 (+0000) Subject: Update copyrights + Do not release source pointers when restarting a failed job. X-Git-Tag: Release-2.0.1~10 X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=8a12968b29f035af329592b2386eca2187c789e8;p=bacula%2Fbacula Update copyrights + Do not release source pointers when restarting a failed job. git-svn-id: https://bacula.svn.sourceforge.net/svnroot/bacula/trunk@3975 91ce42f0-d328-0410-95d8-f526ca767f89 --- diff --git a/bacula/kernstodo b/bacula/kernstodo index db38cc0395..221fc137c4 100644 --- a/bacula/kernstodo +++ b/bacula/kernstodo @@ -42,6 +42,9 @@ Document: Priority: - Add the OS version back to the Win32 client info. +- Restarted jobs have a NULL in the from field. + + - Look at the possibility of adding "SET NAMES UTF8" for MySQL, and possibly changing the blobs into varchar. - Check if gnome-console works with TLS. diff --git a/bacula/projects b/bacula/projects index 8be12a4433..b357a3be11 100644 --- a/bacula/projects +++ b/bacula/projects @@ -1,7 +1,7 @@ Projects: Bacula Projects Roadmap - Status updated 3 January 2007 + Status updated 11 January 2007 Summary: Item 1: Accurate restoration of renamed/deleted files @@ -10,40 +10,40 @@ Item 3: Implement Base jobs. Item 4: Implement from-client and to-client on restore command line. Item 5: Implement creation and maintenance of copy pools Item 6: Merge multiple backups (Synthetic Backup or Consolidation). -Item 8: Deletion of Disk-Based Bacula Volumes -Item 9: Implement a Python interface to the Bacula catalog. -Item 10: Archival (removal) of User Files to Tape -Item 11: Add Plug-ins to the FileSet Include statements. -Item 12: Implement more Python events in Bacula. -Item 13: Quick release of FD-SD connection after backup. -Item 14: Implement huge exclude list support using hashing. -Item 15: Allow skipping execution of Jobs -Item 16: Tray monitor window cleanups -Item 17: Split documentation -Item 18: Automatic promotion of backup levels -Item 19: Add an override in Schedule for Pools based on backup types. -Item 20: An option to operate on all pools with update vol parameters -Item 21: Include JobID in spool file name -Item 22: Include timestamp of job launch in "stat clients" output -Item 23: Message mailing based on backup types -Item 24: Allow inclusion/exclusion of files in a fileset by creation/mod times -Item 25: Add a scheduling syntax that permits weekly rotations -Item 26: Improve Bacula's tape and drive usage and cleaning management. -Item 27: Implement support for stacking arbitrary stream filters, sinks. -Item 28: Allow FD to initiate a backup -Item 29: Directive/mode to backup only file changes, not entire file -Item 30: Automatic disabling of devices -Item 31: Incorporation of XACML2/SAML2 parsing -Item 32: Clustered file-daemons -Item 33: Commercial database support -Item 34: Archive data -Item 35: Filesystem watch triggered backup. -Item 36: Implement multiple numeric backup levels as supported by dump -Item 37: Implement a server-side compression feature -Item 38: Cause daemons to use a specific IP address to source communications -Item 39: Multiple threads in file daemon for the same job -Item 40: Restore only file attributes (permissions, ACL, owner, group...) -Item 41: Add an item to the restore option where you can select a pool +Item 7: Deletion of Disk-Based Bacula Volumes +Item 8: Implement a Python interface to the Bacula catalog. +Item 9: Archival (removal) of User Files to Tape +Item 10: Add Plug-ins to the FileSet Include statements. +Item 11: Implement more Python events in Bacula. +Item 12: Quick release of FD-SD connection after backup. +Item 13: Implement huge exclude list support using hashing. +Item 14: Allow skipping execution of Jobs +Item 15: Tray monitor window cleanups +Item 16: Split documentation +Item 17: Automatic promotion of backup levels +Item 18: Add an override in Schedule for Pools based on backup types. +Item 10: An option to operate on all pools with update vol parameters +Item 20: Include JobID in spool file name +Item 21: Include timestamp of job launch in "stat clients" output +Item 22: Message mailing based on backup types +Item 23: Allow inclusion/exclusion of files in a fileset by creation/mod times +Item 24: Add a scheduling syntax that permits weekly rotations +Item 25: Improve Bacula's tape and drive usage and cleaning management. +Item 26: Implement support for stacking arbitrary stream filters, sinks. +Item 27: Allow FD to initiate a backup +Item 28: Directive/mode to backup only file changes, not entire file +Item 29: Automatic disabling of devices +Item 30: Incorporation of XACML2/SAML2 parsing +Item 31: Clustered file-daemons +Item 32: Commercial database support +Item 33: Archive data +Item 34: Filesystem watch triggered backup. +Item 35: Implement multiple numeric backup levels as supported by dump +Item 36: Implement a server-side compression feature +Item 37: Cause daemons to use a specific IP address to source communications +Item 38: Multiple threads in file daemon for the same job +Item 39: Restore only file attributes (permissions, ACL, owner, group...) +Item 40: Add an item to the restore option where you can select a pool Below, you will find more information on future projects: @@ -236,7 +236,7 @@ Item 6: Merge multiple backups (Synthetic Backup or Consolidation). data can then be pruned (or not) from the catalog, possibly allowing older volumes to be recycled -Item 8: Deletion of Disk-Based Bacula Volumes +Item 7: Deletion of Disk-Based Bacula Volumes Date: Nov 25, 2005 Origin: Ross Boylan (edited by Kern) @@ -257,7 +257,7 @@ Item 8: Deletion of Disk-Based Bacula Volumes The migration project should also remove a Volume that is migrated. This might also work for tape Volumes. -Item 9: Implement a Python interface to the Bacula catalog. +Item 8: Implement a Python interface to the Bacula catalog. Date: 28 October 2005 Origin: Kern Status: @@ -268,7 +268,7 @@ Item 9: Implement a Python interface to the Bacula catalog. Why: This will permit users to customize Bacula through Python scripts. -Item 10: Archival (removal) of User Files to Tape +Item 9: Archival (removal) of User Files to Tape Date: Nov. 24/2005 @@ -297,7 +297,7 @@ Item 10: Archival (removal) of User Files to Tape access time. Then after another 6 months (or possibly as one storage pool gets full) data is migrated to Tape. -Item 11: Add Plug-ins to the FileSet Include statements. +Item 10: Add Plug-ins to the FileSet Include statements. Date: 28 October 2005 Origin: Status: Partially coded in 1.37 -- much more to do. @@ -313,7 +313,7 @@ Item 11: Add Plug-ins to the FileSet Include statements. plug-in knows how to backup his Oracle database without stopping/starting it, for example. -Item 12: Implement more Python events in Bacula. +Item 11: Implement more Python events in Bacula. Date: 28 October 2005 Origin: Kern Status: @@ -334,7 +334,7 @@ Item 12: Implement more Python events in Bacula. jobs (possibly also scheduled jobs). -Item 13: Quick release of FD-SD connection after backup. +Item 12: Quick release of FD-SD connection after backup. Origin: Frank Volf (frank at deze dot org) Date: 17 November 2005 Status: @@ -373,7 +373,7 @@ Item 13: Quick release of FD-SD connection after backup. -Item 14: Implement huge exclude list support using hashing. +Item 13: Implement huge exclude list support using hashing. Date: 28 October 2005 Origin: Kern Status: @@ -390,7 +390,7 @@ Item 14: Implement huge exclude list support using hashing. backup set will be *much* smaller. -Item 15: Allow skipping execution of Jobs +Item 14: Allow skipping execution of Jobs Date: 29 November 2005 Origin: Florian Schnabel Status: @@ -402,7 +402,7 @@ Item 15: Allow skipping execution of Jobs and you won't get errors that way. -Item 16: Tray monitor window cleanups +Item 15: Tray monitor window cleanups Origin: Alan Brown ajb2 at mssl dot ucl dot ac dot uk Date: 24 July 2006 Status: @@ -413,7 +413,7 @@ Item 16: Tray monitor window cleanups the trailing items difficult to read. -Item 17: Split documentation +Item 16: Split documentation Origin: Maxx Date: 27th July 2006 Status: @@ -436,7 +436,7 @@ Item 17: Split documentation -Item 18: Automatic promotion of backup levels +Item 17: Automatic promotion of backup levels Date: 19 January 2006 Origin: Adam Thornton Status: @@ -455,7 +455,7 @@ Item 18: Automatic promotion of backup levels Amanda can do and we can't (at least, the one cool thing I know of). -Item 19: Add an override in Schedule for Pools based on backup types. +Item 18: Add an override in Schedule for Pools based on backup types. Date: 19 Jan 2005 Origin: Chad Slater Status: @@ -474,7 +474,7 @@ Status: backups, then the Full job would use the proper Storage device, which has more capacity (i.e. a 8TB tape library. -Item 20: An option to operate on all pools with update vol parameters +Item 19: An option to operate on all pools with update vol parameters Origin: Dmitriy Pinchukov Date: 16 August 2006 Status: @@ -490,7 +490,7 @@ Item 20: An option to operate on all pools with update vol parameters -Item 21: Include JobID in spool file name +Item 20: Include JobID in spool file name Origin: Mark Bergman Date: Tue Aug 22 17:13:39 EDT 2006 Status: Ok (patches/testing/project-include-jobid-in-spool-name.patch) @@ -503,7 +503,7 @@ Item 21: Include JobID in spool file name -Item 22: Include timestamp of job launch in "stat clients" output +Item 21: Include timestamp of job launch in "stat clients" output Origin: Mark Bergman Date: Tue Aug 22 17:13:39 EDT 2006 Status: @@ -523,7 +523,7 @@ Item 22: Include timestamp of job launch in "stat clients" output -Item 23: Message mailing based on backup types +Item 22: Message mailing based on backup types Origin: Evan Kaufman Date: January 6, 2006 Status: @@ -552,7 +552,7 @@ Item 23: Message mailing based on backup types } -Item 24: Allow inclusion/exclusion of files in a fileset by creation/mod times +Item 23: Allow inclusion/exclusion of files in a fileset by creation/mod times Origin: Evan Kaufman Date: January 11, 2006 Status: @@ -602,7 +602,7 @@ Item 24: Allow inclusion/exclusion of files in a fileset by creation/mod times or 'since'. -Item 25: Add a scheduling syntax that permits weekly rotations +Item 24: Add a scheduling syntax that permits weekly rotations Date: 15 December 2006 Origin: Gregory Brauer (greg at wildbrain dot com) Status: @@ -695,7 +695,7 @@ Item 25: Add a scheduling syntax that permits weekly rotations } -Item 26: Improve Bacula's tape and drive usage and cleaning management. +Item 25: Improve Bacula's tape and drive usage and cleaning management. Date: 8 November 2005, November 11, 2005 Origin: Adam Thornton , Arno Lehmann @@ -763,7 +763,7 @@ Item 26: Improve Bacula's tape and drive usage and cleaning management. sub-projects: Measuring Tape and Drive usage, retiring volumes, and handling drive cleaning and TAPEALERTs. -Item 27: Implement support for stacking arbitrary stream filters, sinks. +Item 26: Implement support for stacking arbitrary stream filters, sinks. Date: 23 November 2006 Origin: Landon Fuller Status: Planning. Assigned to landonf. @@ -799,7 +799,7 @@ Status: Planning. Assigned to landonf. Assistance with either code or testing would be fantastic. -Item 28: Allow FD to initiate a backup +Item 27: Allow FD to initiate a backup Origin: Frank Volf (frank at deze dot org) Date: 17 November 2005 Status: @@ -811,7 +811,7 @@ Item 28: Allow FD to initiate a backup Why: Makes backup of laptops much easier. -Item 29: Directive/mode to backup only file changes, not entire file +Item 28: Directive/mode to backup only file changes, not entire file Date: 11 November 2005 Origin: Joshua Kugler Marek Bajon @@ -828,7 +828,7 @@ Item 29: Directive/mode to backup only file changes, not entire file Notes: This would require the usage of disk-based volumes as comparing files would not be feasible using a tape drive. -Item 30: Automatic disabling of devices +Item 29: Automatic disabling of devices Date: 2005-11-11 Origin: Peter Eriksson Status: @@ -854,7 +854,7 @@ Item 30: Automatic disabling of devices further use of that drive and used one of the other ones instead. -Item 31: Incorporation of XACML2/SAML2 parsing +Item 30: Incorporation of XACML2/SAML2 parsing Date: 19 January 2006 Origin: Adam Thornton Status: Blue sky @@ -892,7 +892,7 @@ Item 31: Incorporation of XACML2/SAML2 parsing high, but they're largely both external to Bacula and already sunk. -Item 32: Clustered file-daemons +Item 31: Clustered file-daemons Origin: Alan Brown ajb2 at mssl dot ucl dot ac dot uk Date: 24 July 2006 Status: @@ -924,7 +924,7 @@ Item 32: Clustered file-daemons Notes: -Item 33: Commercial database support +Item 32: Commercial database support Origin: Russell Howe Date: 26 July 2006 Status: @@ -946,7 +946,7 @@ Item 33: Commercial database support than having to run a second DBMS. -Item 34: Archive data +Item 33: Archive data Date: 15/5/2006 Origin: calvin streeting calvin at absentdream dot com Status: @@ -977,7 +977,7 @@ Item 34: Archive data save the catalog with the disk as some kind of menu system -Item 35: Filesystem watch triggered backup. +Item 34: Filesystem watch triggered backup. Date: 31 August 2006 Origin: Jesper Krogh Status: Unimplemented, depends probably on "client initiated backups" @@ -1002,7 +1002,7 @@ Kern Notes: I would rather see this implemented by an external program that monitors the Filesystem changes, then uses the console to start the appropriate job. -Item 36: Implement multiple numeric backup levels as supported by dump +Item 35: Implement multiple numeric backup levels as supported by dump Date: 3 April 2006 Origin: Daniel Rich Status: @@ -1023,7 +1023,7 @@ Why: Support of multiple backup levels would provide for more advanced back Notes: Legato Networker supports a similar system with full, incr, and 1-9 as levels. -Item 37: Implement a server-side compression feature +Item 36: Implement a server-side compression feature Date: 18 December 2006 Origin: Vadim A. Umanski , e-mail umanski@ext.ru Status: @@ -1044,7 +1044,7 @@ Item 37: Implement a server-side compression feature That's why the server-side compression feature is needed! Notes: -Item 38: Cause daemons to use a specific IP address to source communications +Item 37: Cause daemons to use a specific IP address to source communications Origin: Bill Moran Date: 18 Dec 2006 Status: @@ -1073,7 +1073,7 @@ Item 38: Cause daemons to use a specific IP address to source communications 10.0.0.1 and zone transfers will always originate from 10.0.0.2. -Item 39: Multiple threads in file daemon for the same job +Item 38: Multiple threads in file daemon for the same job Date: 27 November 2005 Origin: Ove Risberg (Ove.Risberg at octocode dot com) Status: @@ -1095,7 +1095,7 @@ Item 39: Multiple threads in file daemon for the same job Why: Multiple concurrent backups of a large fileserver with many disks and controllers will be much faster. -Item 40: Restore only file attributes (permissions, ACL, owner, group...) +Item 39: Restore only file attributes (permissions, ACL, owner, group...) Origin: Eric Bollengier Date: 30/12/2006 Status: @@ -1114,7 +1114,7 @@ Item 40: Restore only file attributes (permissions, ACL, owner, group...) If the file isn't here, we can create an empty one and apply rights or do nothing. -Item 41: Add an item to the restore option where you can select a pool +Item 40: Add an item to the restore option where you can select a pool Origin: kshatriyak at gmail dot com Date: 1/1/2006 Status: diff --git a/bacula/src/dird/backup.c b/bacula/src/dird/backup.c index 1927103ffe..8b9dfd8db2 100644 --- a/bacula/src/dird/backup.c +++ b/bacula/src/dird/backup.c @@ -16,7 +16,7 @@ /* Bacula® - The Network Backup Solution - Copyright (C) 2000-2006 Free Software Foundation Europe e.V. + Copyright (C) 2000-2007 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/src/dird/job.c b/bacula/src/dird/job.c index ebcd832ba6..f4eceadeb8 100644 --- a/bacula/src/dird/job.c +++ b/bacula/src/dird/job.c @@ -9,7 +9,7 @@ /* Bacula® - The Network Backup Solution - Copyright (C) 2000-2006 Free Software Foundation Europe e.V. + Copyright (C) 2000-2007 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. @@ -852,22 +852,6 @@ void dird_free_jcr_pointers(JCR *jcr) free_pool_memory(jcr->fname); jcr->fname = NULL; } - if (jcr->pool_source) { - free_pool_memory(jcr->pool_source); - jcr->pool_source = NULL; - } - if (jcr->rpool_source) { - free_pool_memory(jcr->rpool_source); - jcr->rpool_source = NULL; - } - if (jcr->wstore_source) { - free_pool_memory(jcr->wstore_source); - jcr->wstore_source = NULL; - } - if (jcr->rstore_source) { - free_pool_memory(jcr->rstore_source); - jcr->rstore_source = NULL; - } if (jcr->stime) { Dmsg0(200, "Free JCR stime\n"); free_pool_memory(jcr->stime); @@ -905,6 +889,27 @@ void dird_free_jcr(JCR *jcr) pthread_cond_destroy(&jcr->term_wait); jcr->term_wait_inited = false; } + if (jcr->fname) { + Dmsg0(200, "Free JCR fname\n"); + free_pool_memory(jcr->fname); + jcr->fname = NULL; + } + if (jcr->pool_source) { + free_pool_memory(jcr->pool_source); + jcr->pool_source = NULL; + } + if (jcr->rpool_source) { + free_pool_memory(jcr->rpool_source); + jcr->rpool_source = NULL; + } + if (jcr->wstore_source) { + free_pool_memory(jcr->wstore_source); + jcr->wstore_source = NULL; + } + if (jcr->rstore_source) { + free_pool_memory(jcr->rstore_source); + jcr->rstore_source = NULL; + } /* Delete lists setup to hold storage pointers */ free_rwstorage(jcr); @@ -955,6 +960,12 @@ void set_jcr_defaults(JCR *jcr, JOB *job) case JT_RESTORE: jcr->JobLevel = L_NONE; break; + case JT_MIGRATE: + if (!jcr->rpool_source) { + jcr->rpool_source = get_pool_memory(PM_MESSAGE); + pm_strcpy(jcr->rpool_source, _("unknown source")); + } + /* Fall-through wanted */ default: jcr->JobLevel = job->JobLevel; break; @@ -966,6 +977,7 @@ void set_jcr_defaults(JCR *jcr, JOB *job) jcr->pool_source = get_pool_memory(PM_MESSAGE); pm_strcpy(jcr->pool_source, _("unknown source")); } + jcr->JobPriority = job->Priority; /* Copy storage definitions -- deleted in dir_free_jcr above */ if (job->storage) { diff --git a/bacula/src/dird/jobq.c b/bacula/src/dird/jobq.c index 6246fcdb5c..ca52baba6d 100755 --- a/bacula/src/dird/jobq.c +++ b/bacula/src/dird/jobq.c @@ -20,7 +20,7 @@ /* Bacula® - The Network Backup Solution - Copyright (C) 2003-2006 Free Software Foundation Europe e.V. + Copyright (C) 2003-2007 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/src/filed/backup.c b/bacula/src/filed/backup.c index c6e5e49b6c..8b63b528a4 100644 --- a/bacula/src/filed/backup.c +++ b/bacula/src/filed/backup.c @@ -10,7 +10,7 @@ /* Bacula® - The Network Backup Solution - Copyright (C) 2000-2006 Free Software Foundation Europe e.V. + Copyright (C) 2000-2007 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/src/stored/status.c b/bacula/src/stored/status.c index aaf4dcb18d..4744840ce6 100644 --- a/bacula/src/stored/status.c +++ b/bacula/src/stored/status.c @@ -9,7 +9,7 @@ /* Bacula® - The Network Backup Solution - Copyright (C) 2003-2006 Free Software Foundation Europe e.V. + Copyright (C) 2003-2007 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/src/tools/dbcheck.c b/bacula/src/tools/dbcheck.c index 04cadc8251..e51c72c403 100644 --- a/bacula/src/tools/dbcheck.c +++ b/bacula/src/tools/dbcheck.c @@ -11,7 +11,7 @@ /* Bacula® - The Network Backup Solution - Copyright (C) 2002-2006 Free Software Foundation Europe e.V. + Copyright (C) 2002-2007 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/src/win32/compat/compat.cpp b/bacula/src/win32/compat/compat.cpp index e481b6d21b..ca36b0c56f 100644 --- a/bacula/src/win32/compat/compat.cpp +++ b/bacula/src/win32/compat/compat.cpp @@ -11,7 +11,7 @@ /* Bacula® - The Network Backup Solution - Copyright (C) 2004-2006 Free Software Foundation Europe e.V. + Copyright (C) 2004-2007 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/src/win32/compat/winapi.c b/bacula/src/win32/compat/winapi.c index 55ea083788..b713bad443 100644 --- a/bacula/src/win32/compat/winapi.c +++ b/bacula/src/win32/compat/winapi.c @@ -8,7 +8,7 @@ /* Bacula® - The Network Backup Solution - Copyright (C) 2003-2006 Free Software Foundation Europe e.V. + Copyright (C) 2003-2007 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/src/win32/winapi.h b/bacula/src/win32/winapi.h index 94497023a8..50844d6816 100644 --- a/bacula/src/win32/winapi.h +++ b/bacula/src/win32/winapi.h @@ -8,7 +8,7 @@ /* Bacula® - The Network Backup Solution - Copyright (C) 2003-2006 Free Software Foundation Europe e.V. + Copyright (C) 2003-2007 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.1 b/bacula/technotes-2.1 index 6ac62eda69..79f5f5232e 100644 --- a/bacula/technotes-2.1 +++ b/bacula/technotes-2.1 @@ -2,12 +2,14 @@ General: Version 2.0.1 -11Jan06 +12Jan07 +kes Do not release source pointers when restarting a failed job. +11Jan07 kes Add dynamic dll entry point for SHGetFolderPath to Win32 code. This *should* fix bug #747. kes Modify winbacula.nsi to substitute with g bin_dir_cmd. Should fix bug #742. -09Jan06 +09Jan07 kes Modify USTORE constructor to set an empty store_source string, and don't copy the store_source string in a cancel. Hopefully this will fix Arno's seg fault, bug #744.