From: Eric Bollengier <eric@eb.homelinux.org>
Date: Tue, 19 Dec 2006 21:08:32 +0000 (+0000)
Subject: ebl  it build against bacula-1.39.30
X-Git-Tag: Release-2.0.0~102
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=7f1802e92d4468be56fef23b71774f9c4e253230;p=bacula%2Fbacula

ebl  it build against bacula-1.39.30


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

diff --git a/bacula/patches/ebl/README.scratch b/bacula/patches/ebl/README.scratch
new file mode 100644
index 0000000000..d266991aa4
--- /dev/null
+++ b/bacula/patches/ebl/README.scratch
@@ -0,0 +1,8 @@
+This patch allow you to :
+ - use Purged media in Scratch (not only on Append mode)
+ - move Purged media to there RecyclePool
+
+$Log$
+Revision 1.1  2006/12/19 21:08:32  ricozz
+ebl  it build against bacula-1.39.30
+
diff --git a/bacula/patches/ebl/scratch.patch b/bacula/patches/ebl/scratch.patch
new file mode 100644
index 0000000000..7dd9f8c88a
--- /dev/null
+++ b/bacula/patches/ebl/scratch.patch
@@ -0,0 +1,90 @@
+diff -Naur cvs/src/dird/next_vol.c my/src/dird/next_vol.c
+--- cvs/src/dird/next_vol.c	2006-11-15 22:16:02.000000000 +0100
++++ my/src/dird/next_vol.c	2006-11-15 23:47:43.000000000 +0100
+@@ -313,6 +313,7 @@
+    MEDIA_DBR smr;
+    POOL_DBR spr, pr;
+    bool ok = false;
++   bool found = false;
+    char ed1[50], ed2[50];
+ 
+    /* Only one thread at a time can pull from the scratch pool */
+@@ -328,9 +329,20 @@
+       if (InChanger) {       
+          smr.StorageId = mr->StorageId;  /* want only Scratch Volumes in changer */
+       }
+-      bstrncpy(smr.VolStatus, "Append", sizeof(smr.VolStatus));  /* want only appendable volumes */
+       bstrncpy(smr.MediaType, mr->MediaType, sizeof(smr.MediaType));
++      
++      /* first, try to get Append volume */
++      bstrncpy(smr.VolStatus, "Append", sizeof(smr.VolStatus));
+       if (db_find_next_volume(jcr, jcr->db, 1, InChanger, &smr)) {
++          found = true;
++      /* next, we can try to find an Recycled volume */
++      } else if (find_recycled_volume(jcr, InChanger, &smr)) {
++          found = true;
++      /* finaly, we take a Purged volume */
++      } else if (recycle_oldest_purged_volume(jcr, InChanger, &smr)) {
++          found = true;
++      }
++      if (found) {
+          POOL_MEM query(PM_MESSAGE);
+ 
+          /*   
+@@ -369,6 +381,9 @@
+          memcpy(mr, &smr, sizeof(MEDIA_DBR));
+          /* Set default parameters from current pool */
+          set_pool_dbr_defaults_in_media_dbr(mr, &pr);
++         /* set_pool_dbr_defaults_in_media_dbr set VolStatus to Append,
++          * we could have Recycled media */
++         bstrncpy(mr->VolStatus, smr.VolStatus, sizeof(smr.VolStatus));
+          if (!db_update_media_record(jcr, jcr->db, mr)) {
+             Jmsg(jcr, M_WARNING, 0, _("Unable to update Volume record: ERR=%s"), 
+                  db_strerror(jcr->db));
+diff -Naur cvs/src/dird/protos.h my/src/dird/protos.h
+--- cvs/src/dird/protos.h	2006-11-15 22:16:02.000000000 +0100
++++ my/src/dird/protos.h	2006-11-15 23:26:50.000000000 +0100
+@@ -178,6 +178,9 @@
+ int get_num_drives_from_SD(UAContext *ua);
+ void update_slots(UAContext *ua);
+ 
++/* ua_update.c */
++void update_vol_pool(UAContext *ua, char *val, MEDIA_DBR *mr, POOL_DBR *opr);
++
+ /* ua_output.c */
+ void prtit(void *ctx, const char *msg);
+ int complete_jcr_for_job(JCR *jcr, JOB *job, POOL *pool);
+diff -Naur cvs/src/dird/ua_purge.c my/src/dird/ua_purge.c
+--- cvs/src/dird/ua_purge.c	2006-11-15 22:16:03.000000000 +0100
++++ my/src/dird/ua_purge.c	2006-11-15 23:55:14.000000000 +0100
+@@ -569,6 +569,18 @@
+       }
+       pm_strcpy(jcr->VolumeName, mr->VolumeName);
+       generate_job_event(jcr, "VolumePurged");
++      if (mr->RecyclePoolId && mr->RecyclePoolId != mr->PoolId) {
++         POOL_DBR oldpr, newpr;
++         memset(&oldpr, 0, sizeof(POOL_DBR));
++         memset(&newpr, 0, sizeof(POOL_DBR));
++         newpr.PoolId = mr->RecyclePoolId;
++         oldpr.PoolId = mr->PoolId;
++         if (db_get_pool_record(jcr, ua->db, &oldpr) && db_get_pool_record(jcr, ua->db, &newpr)) {
++            update_vol_pool(ua, newpr.Name, mr, &oldpr);
++         } else {
++            bsendmsg(ua, "%s", db_strerror(ua->db));
++         }
++      }
+       /* Send message to Job report, if it is a *real* job */           
+       if (jcr && jcr->JobId > 0) {
+          Jmsg1(jcr, M_INFO, 0, _("All records pruned from Volume \"%s\"; marking it \"Purged\"\n"),
+diff -Naur cvs/src/dird/ua_update.c my/src/dird/ua_update.c
+--- cvs/src/dird/ua_update.c	2006-11-15 23:30:10.000000000 +0100
++++ my/src/dird/ua_update.c	2006-11-15 23:56:30.000000000 +0100
+@@ -276,7 +276,7 @@
+ }
+ 
+ /* Modify the Pool in which this Volume is located */
+-static void update_vol_pool(UAContext *ua, char *val, MEDIA_DBR *mr, POOL_DBR *opr)
++void update_vol_pool(UAContext *ua, char *val, MEDIA_DBR *mr, POOL_DBR *opr)
+ {
+    POOL_DBR pr;
+    POOLMEM *query;