* Version $Id$
*/
/*
- Copyright (C) 2002-2005 Kern Sibbald
+ Copyright (C) 2002-2006 Kern Sibbald
This program is free software; you can redistribute it and/or
modify it under the terms of the GNU General Public License
#include "dird.h"
/* Imported functions */
-int mark_media_purged(UAContext *ua, MEDIA_DBR *mr);
/* Forward referenced functions */
-#define MAX_DEL_LIST_LEN 1000000
+#define MAX_DEL_LIST_LEN 2000000
/* Imported variables */
extern char *select_job;
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;
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;
}
int kw;
static const char *keywords[] = {
- N_("Files"),
- N_("Jobs"),
- N_("Volume"),
+ NT_("Files"),
+ NT_("Jobs"),
+ NT_("Volume"),
NULL};
if (!open_db(ua)) {
- return 01;
+ return false;
}
/* First search args */
case 0: /* prune files */
client = get_client_resource(ua);
if (!client || !confirm_retention(ua, &client->FileRetention, "File")) {
- return 0;
+ return false;
}
prune_files(ua, client);
- return 1;
+ return true;
case 1: /* prune jobs */
client = get_client_resource(ua);
if (!client || !confirm_retention(ua, &client->JobRetention, "Job")) {
- return 0;
+ return false;
}
/* ****FIXME**** allow user to select JobType */
prune_jobs(ua, client, JT_BACKUP);
return 1;
case 2: /* prune volume */
if (!select_pool_and_media_dbr(ua, &pr, &mr)) {
- return 0;
+ return false;
}
if (!confirm_retention(ua, &mr.VolRetention, "Volume")) {
- return 0;
+ return false;
}
prune_volume(ua, &mr);
- return 1;
+ return true;
default:
break;
}
- return 1;
+ return true;
}
/*
/* Select Jobs -- for counting */
Mmsg(query, select_job, edit_uint64(now - period, ed1),
edit_int64(cr.ClientId, ed2));
- Dmsg1(050, "select sql=%s\n", query);
+ Dmsg3(050, "select now=%u period=%u sql=%s\n", (uint32_t)now, (uint32_t)period, query);
if (!db_sql_query(ua->db, query, file_count_handler, (void *)&del)) {
if (ua->verbose) {
bsendmsg(ua, "%s", db_strerror(ua->db));
for (i=0; i < del.num_ids; i++) {
Mmsg(query, del_File, edit_int64(del.JobId[i], ed1));
- Dmsg1(050, "Delete 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
*/
Mmsg(query, upd_Purged, edit_int64(del.JobId[i], ed1));
db_sql_query(ua->db, query, NULL, (void *)NULL);
- Dmsg1(050, "Del 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"),
}
}
-static int create_temp_tables(UAContext *ua)
+static bool create_temp_tables(UAContext *ua)
{
int i;
/* Create temp tables and indicies */
if (!db_sql_query(ua->db, create_deltabs[i], NULL, (void *)NULL)) {
bsendmsg(ua, "%s", db_strerror(ua->db));
Dmsg0(050, "create DelTables table failed\n");
- return 0;
+ return false;
}
}
- return 1;
+ return true;
}
{
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;
/*
* 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));
}
if (cnt.count == 0) {
+ /* Don't mark appendable volume as purged */
+ if (strcmp(mr->VolStatus, "Append") == 0 && verbose) {
+ bsendmsg(ua, _("There are no Jobs associated with Volume \"%s\". Prune not needed.\n"),
+ mr->VolumeName);
+ ok = true;
+ goto bail_out;
+ }
+ /* If volume not already purged, do so */
if (strcmp(mr->VolStatus, "Purged") != 0 && verbose) {
- bsendmsg(ua, "There are no Jobs associated with Volume \"%s\". Marking it purged.\n",
+ 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;
}
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++;
}
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;
}