Minor tweaks to Migration

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

diff --git a/bacula/src/dird/autoprune.c b/bacula/src/dird/autoprune.c
index 46107d742611372351a3a34c74793e04d4dbcfdd..0fea7f8a7608e6dd4e2e4eb2558fb1f332844250 100644 (file)
--- a/bacula/src/dird/autoprune.c
+++ b/bacula/src/dird/autoprune.c
@@ -1,7 +1,7 @@
 /*
  *
- *   Bacula Director -- Automatic Pruning 
- *     Applies retention periods
+ *   Bacula Director -- Automatic Pruning
+ *      Applies retention periods
  *
  *     Kern Sibbald, May MMII
  *
@@ -9,7 +9,7 @@
  */
 
 /*
-   Copyright (C) 2002 Kern Sibbald and John Walker
+   Copyright (C) 2002-2004 Kern Sibbald and John Walker
 
    This program is free software; you can redistribute it and/or
    modify it under the terms of the GNU General Public License as
@@ -39,14 +39,14 @@
  * Auto Prune Jobs and Files. This is called at the end of every
  *   Job.  We do not prune volumes here.
  */
-int do_autoprune(JCR *jcr)
+void do_autoprune(JCR *jcr)
 {
    UAContext *ua;
    CLIENT *client;
    bool pruned;
 
-   if (!jcr->client) {               /* temp -- remove me */
-      return 1;
+   if (!jcr->client) {                /* temp -- remove me */
+      return;
    }
 
    ua = new_ua_context(jcr);
@@ -60,7 +60,7 @@ int do_autoprune(JCR *jcr)
    } else {
       pruned = false;
    }
-  
+
    if (jcr->job->PruneFiles || jcr->client->AutoPrune) {
       Jmsg(jcr, M_INFO, 0, _("Begin pruning Files.\n"));
       prune_files(ua, client);
@@ -71,7 +71,7 @@ int do_autoprune(JCR *jcr)
    }
 
    free_ua_context(ua);
-   return 1;   
+   return;
 }
 
 /*
@@ -80,7 +80,7 @@ int do_autoprune(JCR *jcr)
  *   volume and no appendable volumes are available.
  *
  *  Return 0: on error
- *        number of Volumes Purged
+ *         number of Volumes Purged
  */
 int prune_volumes(JCR *jcr)
 {
@@ -89,7 +89,6 @@ int prune_volumes(JCR *jcr)
    uint32_t *ids = NULL;
    int num_ids = 0;
    MEDIA_DBR mr;
-   POOL_DBR pr;
    UAContext *ua;
 
    if (!jcr->job->PruneVolumes && !jcr->pool->AutoPrune) {
@@ -97,14 +96,12 @@ int prune_volumes(JCR *jcr)
       return 0;
    }
    memset(&mr, 0, sizeof(mr));
-   memset(&pr, 0, sizeof(pr));
    ua = new_ua_context(jcr);
 
    db_lock(jcr->db);
 
-   /* Get the Pool Record and a list of Media Id's in the Pool */
-   pr.PoolId = jcr->PoolId;
-   if (!db_get_pool_record(jcr, jcr->db, &pr) || !db_get_media_ids(jcr, jcr->db, &num_ids, &ids)) {
+   /* Get the List of all media ids in the current Pool */
+   if (!db_get_media_ids(jcr, jcr->db, jcr->jr.PoolId, &num_ids, &ids)) {
       Jmsg(jcr, M_ERROR, 0, "%s", db_strerror(jcr->db));
       goto bail_out;
    }
@@ -114,21 +111,24 @@ int prune_volumes(JCR *jcr)
       mr.MediaId = ids[i];
       if (!db_get_media_record(jcr, jcr->db, &mr)) {
          Jmsg(jcr, M_ERROR, 0, "%s", db_strerror(jcr->db));
-        continue;
+         continue;
       }
       /* Prune only Volumes from current Pool */
-      if (pr.PoolId != mr.PoolId) {
-        continue;
+      if (jcr->jr.PoolId != mr.PoolId) {
+         continue;
+      }
+      /* Don't prune archived volumes */
+      if (mr.Enabled == 2) {
+         continue;
       }
-      /* Prune only Volumes with status "Full", "Used", or "Append" */
-      if (strcmp(mr.VolStatus, "Full")   == 0 || 
-          strcmp(mr.VolStatus, "Append") == 0 ||
+      /* Prune only Volumes with status "Full", or "Used" */
+      if (strcmp(mr.VolStatus, "Full")   == 0 ||
           strcmp(mr.VolStatus, "Used")   == 0) {
          Dmsg1(200, "Prune Volume %s\n", mr.VolumeName);
-        stat += prune_volume(ua, &pr, &mr); 
+         stat += prune_volume(ua, &mr);
          Dmsg1(200, "Num pruned = %d\n", stat);
       }
-   }   
+   }
 
 bail_out:
    db_unlock(jcr->db);