From 048846892d6f807ce25b8901845685e8047a2725 Mon Sep 17 00:00:00 2001 From: Kern Sibbald Date: Sat, 23 Jul 2005 21:59:10 +0000 Subject: [PATCH] - Complete (almost) documentation of 1.38. - Add error messages for error conditions with VSS. git-svn-id: https://bacula.svn.sourceforge.net/svnroot/bacula/trunk@2239 91ce42f0-d328-0410-95d8-f526ca767f89 --- bacula/kernstodo | 143 ++++++----------------------------- bacula/kes-1.37 | 2 + bacula/src/filed/job.c | 11 ++- bacula/src/findlib/attribs.c | 21 +++-- 4 files changed, 41 insertions(+), 136 deletions(-) diff --git a/bacula/kernstodo b/bacula/kernstodo index 64c5a3105f..1aa2f5ea54 100644 --- a/bacula/kernstodo +++ b/bacula/kernstodo @@ -1,5 +1,5 @@ Kern's ToDo List - 20 July 2005 + 23 July 2005 Major development: Project Developer @@ -11,113 +11,33 @@ Final items for 1.37 before release: 1. Fix bugs - --without-openssl breaks at least on Solaris. 3. Document all the new features (about half done). - - VSS. Shall I write "Include Writer 'WMI Writer", "MSDEWriter" - Let me explain this: An windows application can (no must) - register as VSS writer. This means that the applications opts to - be notified if a backup (or restore) occurs. If it then gets - this message, it will immediately store a consistent state to - disk. Examples for these writers are "MSDE" (Microsoft database - engine), "Event Log Writer", "Registry Writer" plus 3rd - party-writers. If you have a non-vss aware application (e.g. - SQL Anywhere or probably MySQL), a shadow copy is still generated - and the open files can be backed up, but there is no guarantee - that the file is consistent. - - At least the Microsoft example makes a significant effort to - determine which writers may be involved when a drive or file is - to be shadow copied. Of course, every single writer may fail.... - So they offer a user interface to explicitly include or exclude a - writer when creating a VSS shadow copy. I personally would not - like to bother the user with this - at least not right now - (efforts for exchanging lists between fd and director + efforts - for selecting, etc.). - - But I personally would like to have an information message about - the individual writers involved in the backup-process ("vssadmin - list writers" produced 4 entries on my xp-client and 7 on my w2k3 - server, please try this on your machine to understand the system - a little bit better). - - - Multiple drive autochanger support - - Support for ANSI/IBM labels. - - Seven new options keywords in a FileSet resource: - ignorecase, fstype, hfsplussupport, wilddir, wildfile, regexdir, - and regexfile thanks to Pruben Guldberg). See below for details. - Restore of all files for a Job or set of jobs even if the file records have been removed from the catalog. - Restore of a directory (non-recursive, i.e. only one level). - Support for TLS (ssl) between all the daemon connections thanks - to Landon Fuller. - - Any Volume in the Pool named Scratch may be reassigned to any - other Pool when a new Volume is needed. - Unicode filename support for Win32 (thanks to Thorsten Engel) - - Volume Shadow Copy support for Win32 thus the capability to - backup exclusively opened files (thanks to Thorsten Engel). - A VSS enabled Win32 FD is available. You must explicitly - turn on VSS with "Enable VSS = yes" in your FileSet resource. - SQLite3 support, but it seems to run at 1/2 to 1/4 the speed of SQLite2. - - New Job directive "Prefer Mounted Volumes = yes|no" causes the - SD to select either an Autochanger or a drive with a valid - Volume already mounted in preference. If none is available, - it will select the first available drive. - - New Run directive in Job resource of DIR. It permits - cloning of jobs. To clone a copy of the current job, use - Run = "job-name level=%l since=\"%s\"" - Note, job-name is normally the same name as the job that - is running but there is no restriction on what you put. If you - want to start the job by hand and use job overrides such as - storage=xxx, realize that the job will be started with the - default storage values not the overrides. The level=%l guarantees - that the chosen level of the job is the same, and the since=... - ensures that the job uses *exactly* the same time/date for incremental - and differential jobs. The since=... is ignored when level=Full. - A cloned job will not start additional clones, so it is not possible - to recurse. - - New Options keywords in a FileSet directive: - - WildDir xxx - Will do a wild card match against directories (files will not - be matched). - - WildFile xxx - Will do a wild card match against files (directories will not - be matched). - - RegexDir xxx - Will do a regular expression match against directories (files - will not be matched). - - RegexFile xxx - Will do a regular expression match against files( directories - will not be matched). - - IgnoreCase = yes | no - Will ignore case in wild card and regular expression matches. - This is handy for Windows where filename case is not significant. - - FsType = string - where string is a filesystem type: ext2, jfs, ntfs, proc, - reiserfs, xfs, usbdevfs, sysfs, smbfs, iso9660. For ext3 - systems, use ext2. You may have multiple fstype directives - and thus permit multiple filesystem types. If the type - specified on the fstype directive does not match the - filesystem for a particular directive, that directory will - not be backed up. This directive can be used to prevent - backing up non-local filesystems. - - HFS Plus Support = yes | no - If set, Mac OS X resource forks will be saved and restored. - - Label Type = ANSI | IBM | Bacula - Implemented in Director Pool resource and in SD Device resource. - If it is specified in the SD Device resource, it will take - precedence over the value passed from the Director to the SD. - - Check Labels = yes | no - Implemented in the SD Device resource. If you intend to read - ANSI or IBM labels, this *must* be set. Even if the volume - is not ANSI labeled, you can set this to yes, and Bacula will - check the label type. - - Scripts Directory = name. Defines the directory from - which Bacula scripts will be called for events. In fact, Bacula - appends this name to the standard Python list of search directories, - so the script could also be in any of the Python system directories. - - In FileSet, you can exclude backing up of hardlinks (if you have - a lot, it can be very expensive), by using: - HardLinks = no - in the Options section. Patch supplied by David R Bosso. Thanks. + - A pile of new Directives to support TLS. Please see the TLS chapter + of the manual. + + - "python restart" restarts the Python interpreter. Rather brutal, make + sure no Python scripts are running. This permits you to change + a Python script and ge + - With Python 2.3, there are a few compiler warnings. + - You must add --with-openssl to the configure command line if + you want TLS communications encryption support. +7. Write a bacula-web document +9. Run the regression scripts on Solaris and FreeBSD +- Figure out how to package gui, and rescue programs. +- Test TLS. + +Document: +- Document cleaning up the spool files: + db, pid, state, bsr, mail, conmsg, spool +- Document the multiple-drive-changer.txt script. +- Pruning with Admin job. +========= probably not in 1.38 ============= - MaximumPartSize = bytes (SD, Device resource) Defines the maximum part size. - Requires Mount = Yes/No (SD, Device resource) @@ -147,26 +67,7 @@ Final items for 1.37 before release: - Write Part After Job = Yes/No (DIR, Job Resource, and Schedule Resource) If this directive is set to yes (default no), a new part file will be created after the job is finished. - - A pile of new Directives to support TLS. Please see the TLS chapter - of the manual. - - - "python restart" restarts the Python interpreter. Rather brutal, make - sure no Python scripts are running. This permits you to change - a Python script and ge - - With Python 2.3, there are a few compiler warnings. - - You must add --with-openssl to the configure command line if - you want TLS communications encryption support. -7. Write a bacula-web document -9. Run the regression scripts on Solaris and FreeBSD -- Figure out how to package gui, and rescue programs. -- Test TLS. - -Document: -- Document cleaning up the spool files: - db, pid, state, bsr, mail, conmsg, spool -- Document the multiple-drive-changer.txt script. -- Pruning with Admin job. - +======= For 1.39: - Fix bpipe.c so that it does not modify results pointer. diff --git a/bacula/kes-1.37 b/bacula/kes-1.37 index 690a3262e7..4da52fd059 100644 --- a/bacula/kes-1.37 +++ b/bacula/kes-1.37 @@ -5,6 +5,8 @@ General: Changes to 1.37.32: 23Jul05 +- Complete (almost) documentation of 1.38. +- Add error messages for error conditions with VSS. - Fix additional problems with VSS backup that I introduced. Changes to 1.37.31: 22Jul05 diff --git a/bacula/src/filed/job.c b/bacula/src/filed/job.c index c7683b1020..39518d1f43 100644 --- a/bacula/src/filed/job.c +++ b/bacula/src/filed/job.c @@ -23,7 +23,6 @@ #include "bacula.h" #include "filed.h" - #ifdef WIN32_VSS #include "vss.h" #endif @@ -1219,19 +1218,23 @@ static int backup_cmd(JCR *jcr) if (get_win32_driveletters(jcr->ff, szWinDriveLetters)) { Jmsg(jcr, M_INFO, 0, _("Generate VSS snapshots. Driver=\"%s\", Drive(s)=\"%s\"\n"), g_pVSSClient->GetDriverName(), szWinDriveLetters); if (!g_pVSSClient->CreateSnapshots(szWinDriveLetters)) { - Jmsg(jcr, M_WARNING, 0, _("Generate VSS snapshots failed\n")); + berrno be; + Jmsg(jcr, M_WARNING, 0, _("Generate VSS snapshots failed. ERR=%s\n"), + be.strerror()); } else { /* tell user if snapshot creation of a specific drive failed */ size_t i; for (i=0; iGetWriterCount(); i++) { int msg_type = M_INFO; - if (g_pVSSClient->GetWriterState(i) < 0) + if (g_pVSSClient->GetWriterState(i) < 0) { msg_type = M_WARNING; + } Jmsg(jcr, msg_type, 0, _("VSS Writer: %s\n"), g_pVSSClient->GetWriterInfo(i)); } } diff --git a/bacula/src/findlib/attribs.c b/bacula/src/findlib/attribs.c index 79e910e32e..38c0b1920e 100755 --- a/bacula/src/findlib/attribs.c +++ b/bacula/src/findlib/attribs.c @@ -604,17 +604,17 @@ static bool set_win32_attributes(JCR *jcr, ATTR *attr, BFILE *ofd) if (!(atts.dwFileAttributes & FILE_ATTRIBUTE_DIRECTORY)) { if (p_SetFileAttributesW) { - POOLMEM* pwszBuf = get_pool_memory (PM_FNAME); - UTF8_2_wchar(&pwszBuf, win32_ofile); + POOLMEM* pwszBuf = get_pool_memory (PM_FNAME); + UTF8_2_wchar(&pwszBuf, win32_ofile); - BOOL b=SetFileAttributesW((LPCWSTR)pwszBuf, atts.dwFileAttributes & SET_ATTRS); - free_pool_memory(pwszBuf); + BOOL b=SetFileAttributesW((LPCWSTR)pwszBuf, atts.dwFileAttributes & SET_ATTRS); + free_pool_memory(pwszBuf); - if (!b) - win_error(jcr, "SetFileAttributesW:", win32_ofile); + if (!b) + win_error(jcr, "SetFileAttributesW:", win32_ofile); } else { - if (!SetFileAttributes(win32_ofile, atts.dwFileAttributes & SET_ATTRS)) { + if (!SetFileAttributes(win32_ofile, atts.dwFileAttributes & SET_ATTRS)) { win_error(jcr, "SetFileAttributesA:", win32_ofile); } } @@ -662,16 +662,15 @@ void win_error(JCR *jcr, char *prefix, DWORD lerror) } -/* Cygwin API definition */ -extern "C" void cygwin_conv_to_win32_path(const char *path, char *win32_path, DWORD dwSize); - +/* Conversion of a Unix filename to a Win32 filename */ +extern void conv_unix_to_win32_path(const char *path, char *win32_path, DWORD dwSize); void unix_name_to_win32(POOLMEM **win32_name, char *name) { /* One extra byte should suffice, but we double it */ /* add MAX_PATH bytes for VSS shadow copy name */ DWORD dwSize = 2*strlen(name)+MAX_PATH; *win32_name = check_pool_memory_size(*win32_name, dwSize); - cygwin_conv_to_win32_path(name, *win32_name, dwSize); + conv_unix_to_win32_path(name, *win32_name, dwSize); } #endif /* HAVE_CYGWIN */ -- 2.39.2