*/
/*
- 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
#include "bacula.h"
#include "dird.h"
-#include "ua.h"
/* Imported functions */
int mark_media_purged(UAContext *ua, MEDIA_DBR *mr);
/* Forward referenced functions */
-int prune_files(UAContext *ua, CLIENT *client);
-int prune_jobs(UAContext *ua, CLIENT *client, int JobType);
-int prune_volume(UAContext *ua, POOL_DBR *pr, MEDIA_DBR *mr);
#define MAX_DEL_LIST_LEN 1000000
del->JobId = (JobId_t *)brealloc(del->JobId, sizeof(JobId_t) * del->max_ids);
del->PurgedFiles = (char *)brealloc(del->PurgedFiles, del->max_ids);
}
- del->JobId[del->num_ids] = (JobId_t)strtod(row[0], NULL);
- del->PurgedFiles[del->num_ids++] = (char)atoi(row[0]);
+ del->JobId[del->num_ids] = (JobId_t)str_to_int64(row[0]);
+ del->PurgedFiles[del->num_ids++] = (char)str_to_int64(row[0]);
return 0;
}
del->JobId = (JobId_t *)brealloc(del->JobId, sizeof(JobId_t) *
del->max_ids);
}
- del->JobId[del->num_ids++] = (JobId_t)strtod(row[0], NULL);
+ del->JobId[del->num_ids++] = (JobId_t)str_to_int64(row[0]);
return 0;
}
* prune jobs (from) client=xxx
* prune volume=xxx
*/
-int prunecmd(UAContext *ua, char *cmd)
+int prunecmd(UAContext *ua, const char *cmd)
{
CLIENT *client;
POOL_DBR pr;
MEDIA_DBR mr;
+ int kw;
- static char *keywords[] = {
+ static const char *keywords[] = {
N_("Files"),
N_("Jobs"),
N_("Volume"),
NULL};
+
if (!open_db(ua)) {
return 01;
}
- switch (find_arg_keyword(ua, keywords)) {
- case 0:
- client = select_client_resource(ua);
+
+ /* First search args */
+ kw = find_arg_keyword(ua, keywords);
+ if (kw < 0 || kw > 2) {
+ /* no args, so ask user */
+ kw = do_keyword_prompt(ua, _("Choose item to prune"), keywords);
+ }
+
+ switch (kw) {
+ case 0: /* prune files */
+ client = get_client_resource(ua);
if (!client || !confirm_retention(ua, &client->FileRetention, "File")) {
return 0;
}
prune_files(ua, client);
return 1;
- case 1:
- client = select_client_resource(ua);
+ case 1: /* prune jobs */
+ client = get_client_resource(ua);
if (!client || !confirm_retention(ua, &client->JobRetention, "Job")) {
return 0;
}
/* ****FIXME**** allow user to select JobType */
prune_jobs(ua, client, JT_BACKUP);
return 1;
- case 2:
+ case 2: /* prune volume */
if (!select_pool_and_media_dbr(ua, &pr, &mr)) {
return 0;
}
if (!confirm_retention(ua, &mr.VolRetention, "Volume")) {
return 0;
}
- prune_volume(ua, &pr, &mr);
+ prune_volume(ua, &mr);
return 1;
default:
break;
}
- switch (do_keyword_prompt(ua, _("Choose item to prune"), keywords)) {
- case 0:
- client = select_client_resource(ua);
- if (!client || !confirm_retention(ua, &client->FileRetention, "File")) {
- return 0;
- }
- prune_files(ua, client);
- break;
- case 1:
- client = select_client_resource(ua);
- if (!client || !confirm_retention(ua, &client->JobRetention, "Job")) {
- return 0;
- }
- /* ****FIXME**** allow user to select JobType */
- prune_jobs(ua, client, JT_BACKUP);
- break;
- case 2:
- if (!select_pool_and_media_dbr(ua, &pr, &mr)) {
- return 0;
- }
- if (!confirm_retention(ua, &mr.VolRetention, "Volume")) {
- return 0;
- }
- prune_volume(ua, &pr, &mr);
- return 1;
- }
+
return 1;
}
db_lock(ua->db);
memset(&cr, 0, sizeof(cr));
memset(&del, 0, sizeof(del));
- strcpy(cr.Name, client->hdr.name);
- if (!db_create_client_record(ua->db, &cr)) {
+ bstrncpy(cr.Name, client->hdr.name, sizeof(cr.Name));
+ if (!db_create_client_record(ua->jcr, ua->db, &cr)) {
db_unlock(ua->db);
return 0;
}
del.JobId = (JobId_t *)malloc(sizeof(JobId_t) * del.max_ids);
- /* Now process same set but making delete list */
+ /* Now process same set but making a delete list */
db_sql_query(ua->db, query, file_delete_handler, (void *)&del);
for (i=0; i < del.num_ids; i++) {
* Now mark Job as having files purged. This is necessary to
* avoid having too many Jobs to process in future prunings. If
* we don't do this, the number of JobId's in our in memory list
- * will grow very large.
+ * could grow very large.
*/
Mmsg(&query, upd_Purged, del.JobId[i]);
db_sql_query(ua->db, query, NULL, (void *)NULL);
db_lock(ua->db);
memset(&cr, 0, sizeof(cr));
memset(&del, 0, sizeof(del));
- strcpy(cr.Name, client->hdr.name);
- if (!db_create_client_record(ua->db, &cr)) {
+ bstrncpy(cr.Name, client->hdr.name, sizeof(cr.Name));
+ if (!db_create_client_record(ua->jcr, ua->db, &cr)) {
db_unlock(ua->db);
return 0;
}
* and stuff them into the "DeletionCandidates" table.
*/
edit_uint64(now - period, ed1);
- Mmsg(&query, insert_delcand, ed1, cr.ClientId);
+ Mmsg(&query, insert_delcand, (char)JobType, ed1, cr.ClientId);
if (!db_sql_query(ua->db, query, NULL, (void *)NULL)) {
if (ua->verbose) {
bsendmsg(ua, "%s", db_strerror(ua->db));
}
/* Count Files to be deleted */
- strcpy(query, cnt_DelCand);
+ pm_strcpy(&query, cnt_DelCand);
Dmsg1(100, "select sql=%s\n", query);
+ cnt.count = 0;
if (!db_sql_query(ua->db, query, count_handler, (void *)&cnt)) {
- if (ua->verbose) {
- bsendmsg(ua, "%s", db_strerror(ua->db));
- }
+ bsendmsg(ua, "%s", db_strerror(ua->db));
Dmsg0(050, "Count failed\n");
goto bail_out;
}
switch (JobType) {
case JT_ADMIN:
case JT_BACKUP:
- Mmsg(&query, select_backup_del, ed1, cr.ClientId);
+ Mmsg(&query, select_backup_del, ed1, ed1, cr.ClientId);
break;
case JT_RESTORE:
Mmsg(&query, select_restore_del, ed1, cr.ClientId);
Mmsg(&query, select_verify_del, ed1, cr.ClientId);
break;
}
- db_sql_query(ua->db, query, job_delete_handler, (void *)&del);
+ if (!db_sql_query(ua->db, query, job_delete_handler, (void *)&del)) {
+ bsendmsg(ua, "%s", db_strerror(ua->db));
+ }
/*
* OK, now we have the list of JobId's to be pruned, first check
Dmsg1(050, "Delete JobId=%d\n", del.JobId[i]);
if (!del.PurgedFiles[i]) {
Mmsg(&query, del_File, del.JobId[i]);
- db_sql_query(ua->db, query, NULL, (void *)NULL);
+ if (!db_sql_query(ua->db, query, NULL, (void *)NULL)) {
+ bsendmsg(ua, "%s", db_strerror(ua->db));
+ }
Dmsg1(050, "Del sql=%s\n", query);
}
Mmsg(&query, del_Job, del.JobId[i]);
- db_sql_query(ua->db, query, NULL, (void *)NULL);
+ if (!db_sql_query(ua->db, query, NULL, (void *)NULL)) {
+ bsendmsg(ua, "%s", db_strerror(ua->db));
+ }
Dmsg1(050, "Del sql=%s\n", query);
Mmsg(&query, del_JobMedia, del.JobId[i]);
- db_sql_query(ua->db, query, NULL, (void *)NULL);
+ if (!db_sql_query(ua->db, query, NULL, (void *)NULL)) {
+ bsendmsg(ua, "%s", db_strerror(ua->db));
+ }
Dmsg1(050, "Del sql=%s\n", query);
}
bsendmsg(ua, _("Pruned %d %s for client %s from catalog.\n"), del.num_ids,
/*
* Prune a given Volume
*/
-int prune_volume(UAContext *ua, POOL_DBR *pr, MEDIA_DBR *mr)
+int prune_volume(UAContext *ua, MEDIA_DBR *mr)
{
char *query = (char *)get_pool_memory(PM_MESSAGE);
struct s_count_ctx cnt;
db_lock(ua->db);
memset(&jr, 0, sizeof(jr));
memset(&del, 0, sizeof(del));
+
+ /*
+ * Find out how many Jobs remain on this Volume by
+ * counting the JobMedia records.
+ */
cnt.count = 0;
Mmsg(&query, cnt_JobMedia, mr->MediaId);
if (!db_sql_query(ua->db, query, count_handler, (void *)&cnt)) {
}
if (cnt.count == 0) {
- if (ua->verbose) {
- bsendmsg(ua, "There are no Jobs associated with Volume %s. Marking it purged.\n",
+ if (strcmp(mr->VolStatus, "Purged") != 0 && verbose) {
+ bsendmsg(ua, "There are no Jobs associated with Volume \"%s\". Marking it purged.\n",
mr->VolumeName);
}
stat = mark_media_purged(ua, mr);
del.max_ids = MAX_DEL_LIST_LEN;
}
+ /*
+ * Now get a list of JobIds for Jobs written to this Volume
+ * Could optimize here by adding JobTDate > (now - period).
+ */
del.JobId = (JobId_t *)malloc(sizeof(JobId_t) * del.max_ids);
-
- /* ***FIXME*** could make this do JobTDate check too */
Mmsg(&query, sel_JobMedia, mr->MediaId);
if (!db_sql_query(ua->db, query, file_delete_handler, (void *)&del)) {
if (ua->verbose) {
goto bail_out;
}
- /* Use Volume Retention to prune Jobs and Files */
+ /* Use Volume Retention to prune Jobs and their Files */
period = mr->VolRetention;
now = (utime_t)time(NULL);
Dmsg3(200, "Now=%d period=%d now-period=%d\n", (int)now, (int)period,
(int)(now-period));
+
for (i=0; i < del.num_ids; i++) {
jr.JobId = del.JobId[i];
- if (!db_get_job_record(ua->db, &jr)) {
+ if (!db_get_job_record(ua->jcr, ua->db, &jr)) {
continue;
}
Dmsg2(200, "Looking at %s JobTdate=%d\n", jr.Job, (int)jr.JobTDate);
free(del.JobId);
}
if (ua->verbose && del.num_del != 0) {
- bsendmsg(ua, _("Pruned %d %s on Volume %s from catalog.\n"), del.num_del,
+ bsendmsg(ua, _("Pruned %d %s on Volume \"%s\" from catalog.\n"), del.num_del,
del.num_del == 1 ? "Job" : "Jobs", mr->VolumeName);
}
projects / bacula / bacula / blobdiff