kes Remove double quotes from ChangeLog and ReleaseNotes

kes  Remove StorageId test when pruning and recycling (Eric's changes).
kes  Remove old form of locking when getting volumes -- causes deadlock.
kes  Fix buffer overruns detected by Coverity.

git-svn-id: https://bacula.svn.sourceforge.net/svnroot/bacula/branches/Branch-2.2@6999 91ce42f0-d328-0410-95d8-f526ca767f89

diff --git a/bacula/ChangeLog b/bacula/ChangeLog
index 57bc9a52a9c54b0c468efa6ef3bae8faf1529c83..b34a8d9a0a87f4d9bac31da62f6eec0771240db2 100644 (file)
--- a/bacula/ChangeLog
+++ b/bacula/ChangeLog
@@ -217,7 +217,7 @@ kes  Fix existing switch drive SD code to call autochanger to release
 kes  Apply big backport of current SVN SD code that corrects a number
      of race conditions. This is a first step in fixing bug #1018.
 29Dec07
-ebl  Fixes bug #1028 where "Selection Type" option was not usable 
+ebl  Fixes bug #1028 where 'Selection Type' option was not usable 
      with JobDefs.
 
 
@@ -436,10 +436,10 @@ kes  Note, you need GTK >= 2.10 to be able to link the Tray Monitor
      program.
 kes  Move patches into patches directory.
 11Sep07 
-ebl  Fix bug #946 about "bacula-dir -t" which doesn't works
+ebl  Fix bug #946 about 'bacula-dir -t' which doesn't works
      as expected.
 09Sep07 
-ebl  Using "m" in bconsole will show messages like before,
+ebl  Using 'm' in bconsole will show messages like before,
      and not memory usage.
 
 Release Version 2.2.3

diff --git a/bacula/ReleaseNotes b/bacula/ReleaseNotes
index 8a5d2051221b7e18ceeedd35f8d5c7e82c634a22..acbf0e5c263e384aafea66e0424e9aeb69a71198 100644 (file)
--- a/bacula/ReleaseNotes
+++ b/bacula/ReleaseNotes
@@ -200,9 +200,9 @@ Version 2.2.4 is a minor bug fix release to version 2.2.3
   by skipping |.  Fixes bug #936.
 - Implement patch supplied by Landon to fix bug #944 where using
   TLS with bconsole uses 99+% of the CPU.
-- Fix bug #946 about "bacula-dir -t" which doesn't works
+- Fix bug #946 about 'bacula-dir -t' which doesn't works
   as expected.
-- Using "m" in bconsole will show messages as in prior versions
+- Using 'm' in bconsole will show messages as in prior versions
   and not memory usage.
 
 - Note, you need GTK >= 2.10 to be able to link the Tray Monitor

diff --git a/bacula/src/dird/autoprune.c b/bacula/src/dird/autoprune.c
index df4cb5542db2150b1a15cf77cc5269423a87f35a..2b8e8cb91fa671da6d739da91ce8dac75b5ef48d 100644 (file)
--- a/bacula/src/dird/autoprune.c
+++ b/bacula/src/dird/autoprune.c
@@ -138,18 +138,10 @@ bool prune_volumes(JCR *jcr, bool InChanger, MEDIA_DBR *mr)
     *  RecyclePoolId is the current pool or the scratch pool
     */
    const char *select = "SELECT DISTINCT MediaId,LastWritten FROM Media WHERE "
-        "(PoolId=%s OR RecyclePoolId IN (%s)) AND MediaType='%s' %s"
+        "(PoolId=%s OR RecyclePoolId IN (%s)) AND MediaType='%s' "
         "ORDER BY LastWritten ASC,MediaId";
 
-   if (InChanger) {
-      char changer[100];
-      /* Ensure it is in this autochanger */
-      bsnprintf(changer, sizeof(changer), "AND InChanger=1 AND StorageId=%s ",
-         edit_int64(mr->StorageId, ed3));
-      Mmsg(query, select, ed1, ed2, mr->MediaType, changer);
-   } else {
-      Mmsg(query, select, ed1, ed2, mr->MediaType, "");
-   }
+   Mmsg(query, select, ed1, ed2, mr->MediaType);
 
    Dmsg1(050, "query=%s\n", query.c_str());
    if (!db_get_query_dbids(ua->jcr, ua->db, query, ids)) {

diff --git a/bacula/src/dird/recycle.c b/bacula/src/dird/recycle.c
index d960643db66078a78784ea598c37a4836195434e..fdabb4d6009da41a6ba545ac782c25ae9810b021 100644 (file)
--- a/bacula/src/dird/recycle.c
+++ b/bacula/src/dird/recycle.c
@@ -83,19 +83,12 @@ bool recycle_oldest_purged_volume(JCR *jcr, bool InChanger, MEDIA_DBR *mr)
    const char *select =
           "SELECT MediaId,LastWritten FROM Media "
           "WHERE PoolId=%s AND Recycle=1 AND VolStatus='Purged' "
-          "AND Enabled=1 AND MediaType='%s' %s"
+          "AND Enabled=1 AND MediaType='%s' "
           "ORDER BY LastWritten ASC,MediaId LIMIT 1";
 
    Dmsg0(100, "Enter recycle_oldest_purged_volume\n");
    oldest.MediaId = 0;
-   if (InChanger) {
-      char changer[100];
-      bsnprintf(changer, sizeof(changer), "AND InChanger=1 AND StorageId=%s ",
-         edit_int64(mr->StorageId, ed1));
-      Mmsg(query, select, edit_int64(mr->PoolId, ed1), mr->MediaType, changer);
-   } else {
-      Mmsg(query, select, edit_int64(mr->PoolId, ed1), mr->MediaType, "");
-   }
+   Mmsg(query, select, edit_int64(mr->PoolId, ed1), mr->MediaType);
 
    if (!db_sql_query(jcr->db, query, oldest_handler, (void *)&oldest)) {
       Jmsg(jcr, M_ERROR, 0, "%s", db_strerror(jcr->db));

diff --git a/bacula/src/stored/askdir.c b/bacula/src/stored/askdir.c
index d67cd328ebaf68cd0ba1602637895196d095949d..e71d74c76b7993537fd0706c268fa39173de8ef4 100644 (file)
--- a/bacula/src/stored/askdir.c
+++ b/bacula/src/stored/askdir.c
@@ -491,9 +491,7 @@ bool dir_ask_sysop_to_create_appendable_volume(DCR *dcr)
          Jmsg(jcr, M_INFO, 0, "%s", dev->errmsg);
          return false;
       }
-      dev->dlock();  
       got_vol = dir_find_next_appendable_volume(dcr);   /* get suggested volume */
-      dev->dunlock();
       if (got_vol) {
          return true;
       } else {

diff --git a/bacula/src/version.h b/bacula/src/version.h
index 49260476dea8315a38d70629ab6ada9bb7e23344..d40560bdd0e3fc879d64acc89ec31f592d70d2ae 100644 (file)
--- a/bacula/src/version.h
+++ b/bacula/src/version.h
@@ -4,8 +4,8 @@
 
 #undef  VERSION
 #define VERSION "2.2.10-b3"
-#define BDATE   "12 May 2008"
-#define LSMDATE "12May08"
+#define BDATE   "20 May 2008"
+#define LSMDATE "20May08"
 
 #define PROG_COPYRIGHT "Copyright (C) %d-2008 Free Software Foundation Europe e.V.\n"
 #define BYEAR "2008"       /* year for copyright messages in progs */

diff --git a/bacula/technotes-2.1 b/bacula/technotes-2.1
index 9ec0d0081255bab5bea4a6c4954a05b29dc6864a..ff1cf72bcdfc03073fa9bed1bfbc9bf39841c923 100644 (file)
--- a/bacula/technotes-2.1
+++ b/bacula/technotes-2.1
@@ -1,6 +1,11 @@
               Technical notes on version 2.2
 
 General:
+
+20May08
+kes  Remove double quotes from ChangeLog and ReleaseNotes
+kes  Remove StorageId test when pruning and recycling (Eric's changes).
+kes  Remove old form of locking when getting volumes -- causes deadlock.
 17May08
 kes  Fix buffer overruns detected by Coverity.