- Make clean remove old CVS files

[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 687d85cdf872b5b9ba18d4dabff1280a6e7e91f0..bf44fc84427889ab333047055d289af2fc6032bb 100644 (file)
--- a/bacula/src/dird/next_vol.c
+++ b/bacula/src/dird/next_vol.c
@@ -9,7 +9,7 @@
  *   Version $Id$
  */
 /*
-   Copyright (C) 2001-2004 Kern Sibbald and John Walker
+   Copyright (C) 2001-2005 Kern Sibbald
 
    This program is free software; you can redistribute it and/or
    modify it under the terms of the GNU General Public License as
@@ -45,15 +45,16 @@ int find_next_volume_for_append(JCR *jcr, MEDIA_DBR *mr, bool create)
    int retry = 0;
    bool ok;
    bool InChanger;
+   STORE *store = jcr->store;
 
    mr->PoolId = jcr->PoolId;
-   bstrncpy(mr->MediaType, jcr->store->media_type, sizeof(mr->MediaType));
+   bstrncpy(mr->MediaType, store->media_type, sizeof(mr->MediaType));
    Dmsg2(120, "CatReq FindMedia: Id=%d, MediaType=%s\n", mr->PoolId, mr->MediaType);
    /*
-    * If we are using an Autochanger, restrict Volume 
-    *  search to the Autochanger on the first pass 
+    * If we are using an Autochanger, restrict Volume
+    *  search to the Autochanger on the first pass
     */
-   InChanger = jcr->store->autochanger;
+   InChanger = store->autochanger;
    /*
     * Find the Next Volume for Append
     */
@@ -63,7 +64,7 @@ int find_next_volume_for_append(JCR *jcr, MEDIA_DBR *mr, bool create)
       /*
        *  1. Look for volume with "Append" status.
        */
-      ok = db_find_next_volume(jcr, jcr->db, 1, InChanger, mr);  
+      ok = db_find_next_volume(jcr, jcr->db, 1, InChanger, mr);
       Dmsg2(100, "catreq after find_next_vol ok=%d FW=%d\n", ok, mr->FirstWritten);
       if (!ok) {
         /*
@@ -73,28 +74,34 @@ int find_next_volume_for_append(JCR *jcr, MEDIA_DBR *mr, bool create)
          Dmsg2(100, "find_recycled_volume %d FW=%d\n", ok, mr->FirstWritten);
         if (!ok) {
            /*
-            * 3. Try pruning Volumes
+            * 3. Try recycling any purged volume
             */
-           prune_volumes(jcr);  
            ok = recycle_oldest_purged_volume(jcr, InChanger, mr);
-           if (InChanger) {
-              InChanger = false;
-              if (!ok) {
-                 continue;           /* retry again accepting any volume */
-              }
-           }
-            Dmsg2(200, "find_recycled_volume2 %d FW=%d\n", ok, mr->FirstWritten);
-           if (!ok && create) {
+           if (!ok) {
               /*
-                * 4. Try "creating" a new Volume
+               * 4. Try pruning Volumes
                */
-              ok = newVolume(jcr, mr);
+              prune_volumes(jcr);
+              ok = recycle_oldest_purged_volume(jcr, InChanger, mr);
+              if (InChanger) {
+                 InChanger = false;
+                 if (!ok) {
+                    continue;           /* retry again accepting any volume */
+                 }
+              }
+               Dmsg2(200, "find_recycled_volume2 %d FW=%d\n", ok, mr->FirstWritten);
+              if (!ok && create) {
+                 /*
+                   * 5. Try "creating" a new Volume
+                  */
+                 ok = newVolume(jcr, mr);
+              }
            }
         }
 
-        /* 
+        /*
          *  Look at more drastic ways to find an Appendable Volume
-         */ 
+         */
         if (!ok && (jcr->pool->purge_oldest_volume ||
                     jcr->pool->recycle_oldest_volume)) {
             Dmsg2(200, "No next volume found. PurgeOldest=%d\n RecyleOldest=%d",
@@ -105,7 +112,7 @@ int find_next_volume_for_append(JCR *jcr, MEDIA_DBR *mr, bool create)
            if (ok) {
               UAContext *ua;
                Dmsg0(400, "Try purge.\n");
-              /* 
+              /*
                * 5.  Try to purging oldest volume only if not UA calling us.
                */
               ua = new_ua_context(jcr);
@@ -160,28 +167,28 @@ bool has_volume_expired(JCR *jcr, MEDIA_DBR *mr)
    if (strcmp(mr->VolStatus, "Append") == 0 && mr->VolJobs > 0) {
       /* First handle Max Volume Bytes */
       if ((mr->MaxVolBytes > 0 && mr->VolBytes >= mr->MaxVolBytes)) {
-         Jmsg(jcr, M_INFO, 0, _("Max Volume bytes exceeded. "             
+         Jmsg(jcr, M_INFO, 0, _("Max Volume bytes exceeded. "
              "Marking Volume \"%s\" as Full.\n"), mr->VolumeName);
          bstrncpy(mr->VolStatus, "Full", sizeof(mr->VolStatus));
         expired = true;
 
       /* Now see if Volume should only be used once */
       } else if (mr->VolBytes > 0 && jcr->pool->use_volume_once) {
-         Jmsg(jcr, M_INFO, 0, _("Volume used once. "             
+         Jmsg(jcr, M_INFO, 0, _("Volume used once. "
              "Marking Volume \"%s\" as Used.\n"), mr->VolumeName);
          bstrncpy(mr->VolStatus, "Used", sizeof(mr->VolStatus));
         expired = true;
 
       /* Now see if Max Jobs written to volume */
       } else if (mr->MaxVolJobs > 0 && mr->MaxVolJobs <= mr->VolJobs) {
-         Jmsg(jcr, M_INFO, 0, _("Max Volume jobs exceeded. "       
+         Jmsg(jcr, M_INFO, 0, _("Max Volume jobs exceeded. "
              "Marking Volume \"%s\" as Used.\n"), mr->VolumeName);
          bstrncpy(mr->VolStatus, "Used", sizeof(mr->VolStatus));
         expired = true;
 
       /* Now see if Max Files written to volume */
       } else if (mr->MaxVolFiles > 0 && mr->MaxVolFiles <= mr->VolFiles) {
-         Jmsg(jcr, M_INFO, 0, _("Max Volume files exceeded. "       
+         Jmsg(jcr, M_INFO, 0, _("Max Volume files exceeded. "
              "Marking Volume \"%s\" as Used.\n"), mr->VolumeName);
          bstrncpy(mr->VolStatus, "Used", sizeof(mr->VolStatus));
         expired = true;
@@ -191,7 +198,7 @@ bool has_volume_expired(JCR *jcr, MEDIA_DBR *mr)
         utime_t now = time(NULL);
         /* See if Vol Use has expired */
         if (mr->VolUseDuration <= (now - mr->FirstWritten)) {
-            Jmsg(jcr, M_INFO, 0, _("Max configured use duration exceeded. "       
+            Jmsg(jcr, M_INFO, 0, _("Max configured use duration exceeded. "
                "Marking Volume \"%s\" as Used.\n"), mr->VolumeName);
             bstrncpy(mr->VolStatus, "Used", sizeof(mr->VolStatus));
            expired = true;
@@ -203,8 +210,8 @@ bool has_volume_expired(JCR *jcr, MEDIA_DBR *mr)
       if (!db_update_media_record(jcr, jcr->db, mr)) {
          Jmsg(jcr, M_ERROR, 0, _("Catalog error updating volume \"%s\". ERR=%s"),
              mr->VolumeName, db_strerror(jcr->db));
-      }          
-   }  
+      }
+   }
    return expired;
 }
 
@@ -234,7 +241,7 @@ void check_if_volume_valid_or_recyclable(JCR *jcr, MEDIA_DBR *mr, const char **r
       *reason = NULL;
       return;
    }
-                                                                                       
+
    /*
     * Check if the Volume is already marked for recycling
     */
@@ -249,10 +256,10 @@ void check_if_volume_valid_or_recyclable(JCR *jcr, MEDIA_DBR *mr, const char **r
         return;
       }
    }
-                                                                                       
+
    /* At this point, the volume is not valid for writing */
    *reason = "but should be Append, Purged or Recycle";
-                                                                                       
+
    /*
     * What we're trying to do here is see if the current volume is
     * "recyclable" - ie. if we prune all expired jobs off it, is
@@ -268,11 +275,11 @@ void check_if_volume_valid_or_recyclable(JCR *jcr, MEDIA_DBR *mr, const char **r
        * recycle it for use.
        */
       UAContext *ua;
-                                                                                       
+
       ua = new_ua_context(jcr);
       ok = prune_volume(ua, mr);
       free_ua_context(ua);
-                                                                                       
+
       if (ok) {
         /* If fully purged, recycle current volume */
         if (recycle_volume(jcr, mr)) {