ebl Fix small bug about RecyclePool that is not updated at

     the first start.

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

diff --git a/bacula/src/dird/dird.c b/bacula/src/dird/dird.c
index 48fe7487f08d797d9d40c4d74f5a11f9b5625861..da5361b75308c15911f1ee07b438394bdbf4cdc6 100644 (file)
--- a/bacula/src/dird/dird.c
+++ b/bacula/src/dird/dird.c
@@ -945,6 +945,18 @@ static bool check_catalog()
           */
          if (!pool->catalog || pool->catalog == catalog) {
             create_pool(NULL, db, pool, POOL_OP_UPDATE);  /* update request */
+         }
+      }
+
+      /* Once they are created, we can loop over them again, updating
+       * references (RecyclePool)
+       */
+      foreach_res(pool, R_POOL) {
+         /*
+          * If the Pool has a catalog resource update the pool only
+          *   in that catalog.
+          */
+         if (!pool->catalog || pool->catalog == catalog) {
             update_pool_recyclepool(NULL, db, pool);
          }
       }

diff --git a/bacula/technotes-2.5 b/bacula/technotes-2.5
index 63aecf50d35172231e81cb782e665923d41b24e4..21b1145152f853c4a2aa59e52ddfdf4f87f8b305 100644 (file)
--- a/bacula/technotes-2.5
+++ b/bacula/technotes-2.5
@@ -10,6 +10,9 @@ filepattern (restore with regex in bsr)
 mixed priorities
 
 General:
+27Jan09
+ebl  Fix a bug that doesn't update RecyclePool all the time 
+     during the first startup.
 25Jan09
 kes  Turn off db_get_file_list() giant SQL because if fails on
      my production machine.