Correct pool source setting

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

diff --git a/bacula/src/dird/ua_prune.c b/bacula/src/dird/ua_prune.c
index 137462ddb0473c35a8f5cf992d5aef7b7afd2d3f..e6d65dd51225cc011e7216ae57787e5e5dd5d00b 100644 (file)
--- a/bacula/src/dird/ua_prune.c
+++ b/bacula/src/dird/ua_prune.c
@@ -30,7 +30,7 @@
 /* Forward referenced functions */
 
 
-#define MAX_DEL_LIST_LEN 1000000
+#define MAX_DEL_LIST_LEN 2000000
 
 /* Imported variables */
 extern char *select_job;
@@ -46,6 +46,7 @@ extern char *del_File;
 extern char *upd_Purged;
 extern char *cnt_DelCand;
 extern char *del_Job;
+extern char *del_MAC;
 extern char *del_JobMedia;
 extern char *cnt_JobMedia;
 extern char *sel_JobMedia;
@@ -122,7 +123,7 @@ static int job_delete_handler(void *ctx, int num_fields, char **row)
       del->PurgedFiles = (char *)brealloc(del->PurgedFiles, del->max_ids);
    }
    del->JobId[del->num_ids] = (JobId_t)str_to_int64(row[0]);
-   del->PurgedFiles[del->num_ids++] = (char)str_to_int64(row[0]);
+   del->PurgedFiles[del->num_ids++] = (char)str_to_int64(row[1]);
    return 0;
 }
 
@@ -157,9 +158,9 @@ int prunecmd(UAContext *ua, const char *cmd)
    int kw;
 
    static const char *keywords[] = {
-      N_("Files"),
-      N_("Jobs"),
-      N_("Volume"),
+      NT_("Files"),
+      NT_("Jobs"),
+      NT_("Volume"),
       NULL};
 
    if (!open_db(ua)) {
@@ -270,7 +271,7 @@ int prune_files(UAContext *ua, CLIENT *client)
 
    for (i=0; i < del.num_ids; i++) {
       Mmsg(query, del_File, edit_int64(del.JobId[i], ed1));
-      Dmsg1(000, "Delete Files JobId=%s\n", ed1);
+      Dmsg1(200, "Delete Files JobId=%s\n", ed1);
       db_sql_query(ua->db, query, NULL, (void *)NULL);
       /*
        * Now mark Job as having files purged. This is necessary to
@@ -280,7 +281,7 @@ int prune_files(UAContext *ua, CLIENT *client)
        */
       Mmsg(query, upd_Purged, edit_int64(del.JobId[i], ed1));
       db_sql_query(ua->db, query, NULL, (void *)NULL);
-      Dmsg1(000, "Update Purged sql=%s\n", query);
+      Dmsg1(200, "Update Purged sql=%s\n", query);
    }
    edit_uint64_with_commas(del.num_ids, ed1);
    bsendmsg(ua, _("Pruned Files from %s Jobs for client %s from catalog.\n"),
@@ -336,7 +337,7 @@ int prune_jobs(UAContext *ua, CLIENT *client, int JobType)
 {
    struct s_job_del_ctx del;
    struct s_count_ctx cnt;
-   POOLMEM *query = (char *)get_pool_memory(PM_MESSAGE);
+   POOLMEM *query = get_pool_memory(PM_MESSAGE);
    int i;
    utime_t now, period;
    CLIENT_DBR cr;
@@ -469,16 +470,21 @@ bail_out:
 /*
  * Prune a given Volume
  */
-int prune_volume(UAContext *ua, MEDIA_DBR *mr)
+bool prune_volume(UAContext *ua, MEDIA_DBR *mr)
 {
-   POOLMEM *query = (char *)get_pool_memory(PM_MESSAGE);
+   POOLMEM *query = get_pool_memory(PM_MESSAGE);
    struct s_count_ctx cnt;
    struct s_file_del_ctx del;
-   int i, stat = 0;
+   int i;          
+   bool ok = false;
    JOB_DBR jr;
    utime_t now, period;
    char ed1[50];
 
+   if (mr->Enabled == 2) {
+      return false;                   /* Cannot prune archived volumes */
+   }
+
    db_lock(ua->db);
    memset(&jr, 0, sizeof(jr));
    memset(&del, 0, sizeof(del));
@@ -500,7 +506,7 @@ int prune_volume(UAContext *ua, MEDIA_DBR *mr)
       if (strcmp(mr->VolStatus, "Append") == 0 && verbose) {
          bsendmsg(ua, _("There are no Jobs associated with Volume \"%s\". Prune not needed.\n"),
             mr->VolumeName);
-         stat = 1;
+         ok = true;
          goto bail_out;
       }
       /* If volume not already purged, do so */
@@ -508,7 +514,7 @@ int prune_volume(UAContext *ua, MEDIA_DBR *mr)
          bsendmsg(ua, _("There are no Jobs associated with Volume \"%s\". Marking it purged.\n"),
             mr->VolumeName);
       }
-      stat = mark_media_purged(ua, mr);
+      ok = mark_media_purged(ua, mr);
       goto bail_out;
    }
 
@@ -556,6 +562,8 @@ int prune_volume(UAContext *ua, MEDIA_DBR *mr)
       db_sql_query(ua->db, query, NULL, (void *)NULL);
       Mmsg(query, del_JobMedia, ed1);
       db_sql_query(ua->db, query, NULL, (void *)NULL);
+      Mmsg(query, del_MAC, ed1);
+      db_sql_query(ua->db, query, NULL, (void *)NULL);
       Dmsg1(050, "Del sql=%s\n", query);
       del.num_del++;
    }
@@ -567,14 +575,24 @@ int prune_volume(UAContext *ua, MEDIA_DBR *mr)
          del.num_del == 1 ? "Job" : "Jobs", mr->VolumeName);
    }
 
-   /* If purged, mark it so */
-   if (del.num_ids == del.num_del) {
+   /*
+    * Find out how many Jobs remain on this Volume by
+    *  counting the JobMedia records.
+    */
+   cnt.count = 0;
+   Mmsg(query, cnt_JobMedia, edit_int64(mr->MediaId, ed1));
+   if (!db_sql_query(ua->db, query, count_handler, (void *)&cnt)) {
+      bsendmsg(ua, "%s", db_strerror(ua->db));
+      Dmsg0(050, "Count failed\n");
+      goto bail_out;
+   }
+   if (cnt.count == 0) {
       Dmsg0(200, "Volume is purged.\n");
-      stat = mark_media_purged(ua, mr);
+      ok = mark_media_purged(ua, mr);
    }
 
 bail_out:
    db_unlock(ua->db);
    free_pool_memory(query);
-   return stat;
+   return ok;
 }