kes Make WritePartAfterJob the default so that the last DVD part

[bacula/bacula] / bacula / src / dird / next_vol.c

diff --git a/bacula/src/dird/next_vol.c b/bacula/src/dird/next_vol.c
index e2bcfe616df6b211d530d0d4261388831a3a1504..ac4bb9ce96154e6cfa50a8c1b96aba881733c14a 100644 (file)
--- a/bacula/src/dird/next_vol.c
+++ b/bacula/src/dird/next_vol.c
@@ -32,7 +32,7 @@ static bool get_scratch_volume(JCR *jcr, MEDIA_DBR *mr, bool InChanger);
 /*
  *  Items needed:
  *   mr.PoolId must be set
- *   jcr->store
+ *   jcr->wstore
  *   jcr->db
  *   jcr->pool
  *   MEDIA_DBR mr (zeroed out)
@@ -43,7 +43,7 @@ int find_next_volume_for_append(JCR *jcr, MEDIA_DBR *mr, int index, bool create)
    int retry = 0;
    bool ok;
    bool InChanger;
-   STORE *store = jcr->store;
+   STORE *store = jcr->wstore;
 
    bstrncpy(mr->MediaType, store->media_type, sizeof(mr->MediaType));
    Dmsg2(100, "CatReq FindMedia: PoolId=%d, MediaType=%s\n", (int)mr->PoolId, mr->MediaType);
@@ -62,13 +62,15 @@ int find_next_volume_for_append(JCR *jcr, MEDIA_DBR *mr, int index, bool create)
        *  1. Look for volume with "Append" status.
        */
       ok = db_find_next_volume(jcr, jcr->db, index, InChanger, mr);
-      Dmsg2(100, "catreq after find_next_vol ok=%d FW=%d\n", ok, mr->FirstWritten);
+      Dmsg4(100, "after find_next_vol index=%d ok=%d InChanger=%d Vstat=%s\n",
+            index, ok, InChanger, mr->VolStatus);
+
       if (!ok) {
          /*
           * 2. Try finding a recycled volume
           */
          ok = find_recycled_volume(jcr, InChanger, mr);
-         Dmsg2(100, "find_recycled_volume %d FW=%d\n", ok, mr->FirstWritten);
+         Dmsg2(100, "find_recycled_volume ok=%d FW=%d\n", ok, mr->FirstWritten);
          if (!ok) {
             /*
              * 3. Try recycling any purged volume
@@ -80,6 +82,16 @@ int find_next_volume_for_append(JCR *jcr, MEDIA_DBR *mr, int index, bool create)
                 */
                prune_volumes(jcr);
                ok = recycle_oldest_purged_volume(jcr, InChanger, mr);
+               if (!ok) {
+                  /*
+                   * 5. Try pulling a volume from the Scratch pool
+                   */ 
+                  ok = get_scratch_volume(jcr, mr, InChanger);
+               }
+               /*
+                * If we are using an Autochanger and have not found
+                * a volume, retry looking for any volume. 
+                */
                if (InChanger) {
                   InChanger = false;
                   if (!ok) {
@@ -89,12 +101,6 @@ int find_next_volume_for_append(JCR *jcr, MEDIA_DBR *mr, int index, bool create)
             }
          }
 
-         if (!ok) {
-            /*
-             * 5. Try pulling a volume from the Scratch pool
-             */ 
-            ok = get_scratch_volume(jcr, mr, InChanger);
-         }
 
          if (!ok && create) {
             /*
@@ -294,7 +300,8 @@ void check_if_volume_valid_or_recyclable(JCR *jcr, MEDIA_DBR *mr, const char **r
          }
       } else {
          *reason = _("but should be Append, Purged or Recycle (cannot automatically "
-            "recycle current volume, as it still contains unpruned data)");
+            "recycle current volume, as it still contains unpruned data "
+            "or the Volume Retention time has not expired.)");
       }
    }
 }
@@ -310,21 +317,6 @@ static bool get_scratch_volume(JCR *jcr, MEDIA_DBR *mr, bool InChanger)
 
    /* Only one thread at a time can pull from the scratch pool */
    P(mutex);
-   /*   
-    * Get pool record where the Scratch Volume will go
-    */
-   memset(&pr, 0, sizeof(pr));
-   bstrncpy(pr.Name, jcr->pool->hdr.name, sizeof(pr.Name));
-   if (!db_get_pool_record(jcr, jcr->db, &pr)) {
-      Jmsg(jcr, M_WARNING, 0, _("Unable to get Pool record: ERR=%s"), 
-           db_strerror(jcr->db));
-      goto bail_out;
-   }
-   if (pr.MaxVols > 0 && pr.NumVols >= pr.MaxVols) {
-      Jmsg(jcr, M_WARNING, 0, _("Unable to use Scratch Volume, Pool full MaxVols=%d\n"),
-         pr.MaxVols);
-      goto bail_out;
-   }
    /* 
     * Get Pool record for Scratch Pool
     */
@@ -333,10 +325,32 @@ static bool get_scratch_volume(JCR *jcr, MEDIA_DBR *mr, bool InChanger)
    if (db_get_pool_record(jcr, jcr->db, &spr)) {
       memset(&smr, 0, sizeof(smr));
       smr.PoolId = spr.PoolId;
+      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));
       if (db_find_next_volume(jcr, jcr->db, 1, InChanger, &smr)) {
          POOL_MEM query(PM_MESSAGE);
+
+         /*   
+          * Get pool record where the Scratch Volume will go to ensure
+          * that we can add a Volume.
+          */
+         memset(&pr, 0, sizeof(pr));
+         bstrncpy(pr.Name, jcr->pool->hdr.name, sizeof(pr.Name));
+         if (!db_get_pool_record(jcr, jcr->db, &pr)) {
+            Jmsg(jcr, M_WARNING, 0, _("Unable to get Pool record: ERR=%s"), 
+                 db_strerror(jcr->db));
+            goto bail_out;
+         }
+         if (pr.MaxVols > 0 && pr.NumVols >= pr.MaxVols) {
+            Jmsg(jcr, M_WARNING, 0, _("Unable add Scratch Volume, Pool \"%s\" full MaxVols=%d\n"),
+               jcr->pool->hdr.name, pr.MaxVols);
+            goto bail_out;
+         }
+
+         /* OK, now move Scratch Volume */
          db_lock(jcr->db);
          Mmsg(query, "UPDATE Media SET PoolId=%s WHERE MediaId=%s",
               edit_int64(mr->PoolId, ed1),