Update technotes and kernstodo

git-svn-id: https://bacula.svn.sourceforge.net/svnroot/bacula/trunk@7593 91ce42f0-d328-0410-95d8-f526ca767f89

diff --git a/bacula/kernstodo b/bacula/kernstodo
index 975c2c7a46b8ae1f46d1021def40328d33683508..0b290f351db8baa1179d4964a2ee81af64f284dc 100644 (file)
--- a/bacula/kernstodo
+++ b/bacula/kernstodo
@@ -71,6 +71,9 @@ Professional Needs:
 
 Priority:
 ================
+- Deadlock detection, watchdog sees if counter advances when jobs are
+  running.  With debug on, can do a "status" command.
+- User options for plugins.
 - Autolabel only if Volume catalog information indicates tape not
   written. This will avoid overwriting a tape that gets an I/O
   error on reading the volume label.

diff --git a/bacula/src/dird/dird_conf.c b/bacula/src/dird/dird_conf.c
index f7c0a27e64cd06319a10f160a7c76611cebb1557..5f4a570a13f537ad5ce2d2a5a56cd498043cf0f8 100644 (file)
--- a/bacula/src/dird/dird_conf.c
+++ b/bacula/src/dird/dird_conf.c
@@ -309,7 +309,6 @@ RES_ITEM job_items[] = {
    {"prunefiles",  store_bool, ITEM(res_job.PruneFiles), 0, ITEM_DEFAULT, false},
    {"prunevolumes",store_bool, ITEM(res_job.PruneVolumes), 0, ITEM_DEFAULT, false},
    {"enabled",     store_bool, ITEM(res_job.enabled), 0, ITEM_DEFAULT, true},
-   {"optimizejobscheduling",store_bool, ITEM(res_job.OptimizeJobScheduling), 0, ITEM_DEFAULT, false},
    {"spoolattributes",store_bool, ITEM(res_job.SpoolAttributes), 0, ITEM_DEFAULT, false},
    {"spooldata",   store_bool, ITEM(res_job.spool_data), 0, ITEM_DEFAULT, false},
    {"spoolsize",   store_size, ITEM(res_job.spool_size), 0, 0, 0},

diff --git a/bacula/src/dird/dird_conf.h b/bacula/src/dird/dird_conf.h
index 9f9dfef8f137a9496d1a7c0c92f0c4a9befde1a1..d33a1156f454967850a577c5e6596e87edd6025d 100644 (file)
--- a/bacula/src/dird/dird_conf.h
+++ b/bacula/src/dird/dird_conf.h
@@ -427,7 +427,6 @@ public:
    bool PreferMountedVolumes;         /* Prefer vols mounted rather than new one */
    bool write_part_after_job;         /* Set to write part after job in SD */
    bool enabled;                      /* Set if job enabled */
-   bool OptimizeJobScheduling;        /* Set if we should optimize Job scheduling */
    bool accurate;                     /* Set if it is an accurate backup job */
    bool AllowDuplicateJobs;           /* Allow duplicate jobs */
    bool AllowHigherDuplicates;        /* Permit Higher Level */

diff --git a/bacula/src/filed/restore.c b/bacula/src/filed/restore.c
index 4d0a541dc447c2e8a369033c2f1fbcbbc81ddb98..52b304f3d0556314e283a14164d9a32353992afb 100644 (file)
--- a/bacula/src/filed/restore.c
+++ b/bacula/src/filed/restore.c
@@ -366,6 +366,10 @@ void do_restore(JCR *jcr)
          } else {
             stat = create_file(jcr, attr, &rctx.bfd, jcr->replace);
          }
+         jcr->lock();  
+         pm_strcpy(jcr->last_fname, attr->ofname);
+         jcr->last_type = attr->type;
+         jcr->unlock();
          Dmsg2(130, "Outfile=%s create_file stat=%d\n", attr->ofname, stat);
          switch (stat) {
          case CF_ERROR:
@@ -375,11 +379,7 @@ void do_restore(JCR *jcr)
             extract = true;
             /* FALLTHROUGH */
          case CF_CREATED:        /* File created, but there is no content */
-            jcr->lock();  
-            pm_strcpy(jcr->last_fname, attr->ofname);
-            jcr->last_type = attr->type;
             jcr->JobFiles++;
-            jcr->unlock();
             rctx.fileAddr = 0;
             print_ls_output(jcr, attr);
 

diff --git a/bacula/technotes-2.5 b/bacula/technotes-2.5
index 8b756a91ff260a213d0bfc5c0b7eb60f04fbd678..a9615fa64dd02e965a63af4f387b5645ee984033 100644 (file)
--- a/bacula/technotes-2.5
+++ b/bacula/technotes-2.5
@@ -2,35 +2,18 @@
 
           
 New features:
-*Bat API
 Plugin API
-PluginOptions
-FD Version
-Implement ftruncate for NFS devices
-separator in console (!$%&'()*+,-/:;<>?[]^`{|}~)
+command separator in console (!$%&'()*+,-/:;<>?[]^`{|}~)
 examples/database/dbcheck.sql
 dbi database driver
   --enable-libdb
   dbdriver in bacula-dir.conf
 --with-db-port
-support for Ubuntu
 recyclepool in dird/ua_select.co???
 enhancement to wait command: wait mount  ...
 parse config
-plugindirectory
 dbport
 dbdriver
-maxrunschedtime???
-fullmaxwaittime???
-incrementalmaxwaittime???
-differentialmaxwaittime???
-fullmaxruntime???
-differentialmaxruntime???
-incrementalmaxruntime???
-optimizejobscheduling???
-pluginoptions
-plugin
-checkfilechanges default = yes.
 
 remove reader/writer in FOPTS????
 
@@ -464,7 +447,8 @@ kes  Replace released flag in VOLRES with reserved and add access
      methods for the VOLRES class.
 kes  Prevent volume from being released while being swapped.
 kes  Apply Bastian Friedrich's edit codes patch for the bpipe-fd
-     plugin.
+     plugin that add %w (where) and %r (replace flag) editing to
+     the plugin line.
 kes  Apply Bastial Friedrich's edit pool=%p patch for run clone
      jobs.
 kes  Refactor parts of stored/mount.c