*/
/*
- Copyright (C) 2002-2003 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
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
extern char *select_backup_del;
extern char *select_verify_del;
extern char *select_restore_del;
+extern char *select_admin_del;
extern char *cnt_File;
extern char *del_File;
extern char *upd_Purged;
* 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"),
switch (kw) {
case 0: /* prune files */
- client = select_client_resource(ua);
+ client = get_client_resource(ua);
if (!client || !confirm_retention(ua, &client->FileRetention, "File")) {
return 0;
}
prune_files(ua, client);
return 1;
case 1: /* prune jobs */
- client = select_client_resource(ua);
+ client = get_client_resource(ua);
if (!client || !confirm_retention(ua, &client->JobRetention, "Job")) {
return 0;
}
if (!confirm_retention(ua, &mr.VolRetention, "Volume")) {
return 0;
}
- prune_volume(ua, &pr, &mr);
+ prune_volume(ua, &mr);
return 1;
default:
break;
db_lock(ua->db);
memset(&cr, 0, sizeof(cr));
memset(&del, 0, sizeof(del));
- strcpy(cr.Name, client->hdr.name);
+ 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;
now = (utime_t)time(NULL);
/* Select Jobs -- for counting */
- Mmsg(&query, select_job, edit_uint64(now - period, ed1), cr.ClientId);
+ Mmsg(query, select_job, edit_uint64(now - period, ed1), cr.ClientId);
Dmsg1(050, "select sql=%s\n", query);
if (!db_sql_query(ua->db, query, file_count_handler, (void *)&del)) {
if (ua->verbose) {
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++) {
struct s_count_ctx cnt;
Dmsg1(050, "Delete JobId=%d\n", del.JobId[i]);
- Mmsg(&query, cnt_File, del.JobId[i]);
+ Mmsg(query, cnt_File, del.JobId[i]);
cnt.count = 0;
db_sql_query(ua->db, query, count_handler, (void *)&cnt);
del.tot_ids += cnt.count;
- Mmsg(&query, del_File, del.JobId[i]);
+ Mmsg(query, del_File, del.JobId[i]);
db_sql_query(ua->db, query, NULL, (void *)NULL);
/*
* 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]);
+ Mmsg(query, upd_Purged, del.JobId[i]);
db_sql_query(ua->db, query, NULL, (void *)NULL);
Dmsg1(050, "Del sql=%s\n", query);
}
{
struct s_job_del_ctx del;
struct s_count_ctx cnt;
- char *query = (char *)get_pool_memory(PM_MESSAGE);
+ POOLMEM *query = (char *)get_pool_memory(PM_MESSAGE);
int i;
utime_t now, period;
CLIENT_DBR cr;
db_lock(ua->db);
memset(&cr, 0, sizeof(cr));
memset(&del, 0, sizeof(del));
- strcpy(cr.Name, client->hdr.name);
+ 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, (char)JobType, 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)) {
del.PurgedFiles = (char *)malloc(del.max_ids);
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_restore_del, ed1, ed1, cr.ClientId);
break;
case JT_VERIFY:
- Mmsg(&query, select_verify_del, ed1, cr.ClientId);
+ Mmsg(query, select_verify_del, ed1, ed1, cr.ClientId);
+ break;
+ case JT_ADMIN:
+ Mmsg(query, select_admin_del, ed1, ed1, cr.ClientId);
break;
}
if (!db_sql_query(ua->db, query, job_delete_handler, (void *)&del)) {
for (i=0; i < del.num_ids; i++) {
Dmsg1(050, "Delete JobId=%d\n", del.JobId[i]);
if (!del.PurgedFiles[i]) {
- Mmsg(&query, del_File, del.JobId[i]);
+ Mmsg(query, del_File, del.JobId[i]);
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]);
+ Mmsg(query, del_Job, del.JobId[i]);
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]);
+ Mmsg(query, del_JobMedia, del.JobId[i]);
if (!db_sql_query(ua->db, query, NULL, (void *)NULL)) {
bsendmsg(ua, "%s", db_strerror(ua->db));
}
/*
* 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);
+ POOLMEM *query = (char *)get_pool_memory(PM_MESSAGE);
struct s_count_ctx cnt;
struct s_file_del_ctx del;
int i, stat = 0;
* counting the JobMedia records.
*/
cnt.count = 0;
- Mmsg(&query, cnt_JobMedia, mr->MediaId);
+ Mmsg(query, cnt_JobMedia, mr->MediaId);
if (!db_sql_query(ua->db, query, count_handler, (void *)&cnt)) {
bsendmsg(ua, "%s", db_strerror(ua->db));
Dmsg0(050, "Count failed\n");
}
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);
* Could optimize here by adding JobTDate > (now - period).
*/
del.JobId = (JobId_t *)malloc(sizeof(JobId_t) * del.max_ids);
- Mmsg(&query, sel_JobMedia, mr->MediaId);
+ Mmsg(query, sel_JobMedia, mr->MediaId);
if (!db_sql_query(ua->db, query, file_delete_handler, (void *)&del)) {
if (ua->verbose) {
bsendmsg(ua, "%s", db_strerror(ua->db));
continue;
}
Dmsg2(200, "Delete JobId=%d Job=%s\n", del.JobId[i], jr.Job);
- Mmsg(&query, del_File, del.JobId[i]);
+ Mmsg(query, del_File, del.JobId[i]);
db_sql_query(ua->db, query, NULL, (void *)NULL);
- Mmsg(&query, del_Job, del.JobId[i]);
+ Mmsg(query, del_Job, del.JobId[i]);
db_sql_query(ua->db, query, NULL, (void *)NULL);
- Mmsg(&query, del_JobMedia, del.JobId[i]);
+ Mmsg(query, del_JobMedia, del.JobId[i]);
db_sql_query(ua->db, query, NULL, (void *)NULL);
Dmsg1(050, "Del sql=%s\n", query);
del.num_del++;
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