* 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 "bacula.h"
#include "dird.h"
+extern const char *del_File;
+extern const char *upd_Purged;
+
/* Forward referenced functions */
static int purge_files_from_client(UAContext *ua, CLIENT *client);
static int purge_jobs_from_client(UAContext *ua, CLIENT *client);
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;
}
MEDIA_DBR mr;
JOB_DBR jr;
static const char *keywords[] = {
- N_("files"),
- N_("jobs"),
- N_("volume"),
+ NT_("files"),
+ NT_("jobs"),
+ NT_("volume"),
NULL};
static const char *files_keywords[] = {
- N_("Job"),
- N_("JobId"),
- N_("Client"),
- N_("Volume"),
+ NT_("Job"),
+ NT_("JobId"),
+ NT_("Client"),
+ NT_("Volume"),
NULL};
static const char *jobs_keywords[] = {
- N_("Client"),
- N_("Volume"),
+ NT_("Client"),
+ NT_("Volume"),
NULL};
bsendmsg(ua, _(
case 0: /* Job */
case 1: /* JobId */
if (get_job_dbr(ua, &jr)) {
- purge_files_from_job(ua, &jr);
+ purge_files_from_job(ua, jr.JobId);
}
return 1;
case 2: /* client */
}
/* Volume */
case 2:
- while ((i=find_arg(ua, N_("volume"))) >= 0) {
+ while ((i=find_arg(ua, NT_("volume"))) >= 0) {
if (select_media_dbr(ua, &mr)) {
purge_jobs_from_volume(ua, &mr);
}
static int purge_files_from_client(UAContext *ua, CLIENT *client)
{
struct s_file_del_ctx del;
- char *query = (char *)get_pool_memory(PM_MESSAGE);
+ POOLMEM *query = get_pool_memory(PM_MESSAGE);
int i;
CLIENT_DBR cr;
char ed1[50];
db_sql_query(ua->db, query, file_delete_handler, (void *)&del);
for (i=0; i < del.num_ids; i++) {
- edit_int64(del.JobId[i], ed1);
- Dmsg1(050, "Delete JobId=%s\n", ed1);
- Mmsg(query, "DELETE FROM File WHERE JobId=%s", ed1);
- 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.
- */
- Mmsg(query, "UPDATE Job Set PurgedFiles=1 WHERE JobId=%s", ed1);
- db_sql_query(ua->db, query, NULL, (void *)NULL);
- Dmsg1(050, "Del sql=%s\n", query);
+ purge_files_from_job(ua, del.JobId[i]);
}
bsendmsg(ua, _("%d Files for client \"%s\" purged from %s catalog.\n"), del.num_ids,
client->hdr.name, client->catalog->hdr.name);
* is older than the retention period, we unconditionally delete
* it and all File records for that Job. This is simple enough that no
* temporary tables are needed. We simply make an in memory list of
- * the JobIds meeting the prune conditions, then delete the Job,
- * Files, and JobMedia records in that list.
+ * the JobIds then delete the Job, Files, and JobMedia records in that list.
*/
static int purge_jobs_from_client(UAContext *ua, CLIENT *client)
{
struct s_job_del_ctx del;
- char *query = (char *)get_pool_memory(PM_MESSAGE);
+ POOLMEM *query = get_pool_memory(PM_MESSAGE);
int i;
CLIENT_DBR cr;
char ed1[50];
* Then delete the Job entry, and finally and JobMedia records.
*/
for (i=0; i < del.num_ids; i++) {
- edit_int64(del.JobId[i], ed1);
- Dmsg1(050, "Delete JobId=%s\n", ed1);
+ Dmsg1(050, "Delete Files JobId=%s\n", ed1);
if (!del.PurgedFiles[i]) {
- Mmsg(query, "DELETE FROM File WHERE JobId=%s", ed1);
- db_sql_query(ua->db, query, NULL, (void *)NULL);
- Dmsg1(050, "Del sql=%s\n", query);
+ purge_files_from_job(ua, del.JobId[i]);
}
-
- Mmsg(query, "DELETE FROM Job WHERE JobId=%s", ed1);
- db_sql_query(ua->db, query, NULL, (void *)NULL);
- Dmsg1(050, "Del sql=%s\n", query);
-
- Mmsg(query, "DELETE FROM JobMedia WHERE JobId=%s", ed1);
- db_sql_query(ua->db, query, NULL, (void *)NULL);
- Dmsg1(050, "Del sql=%s\n", query);
+ purge_job_from_catalog(ua, del.JobId[i]);
}
bsendmsg(ua, _("%d Jobs for client %s purged from %s catalog.\n"), del.num_ids,
client->hdr.name, client->catalog->hdr.name);
return 1;
}
-void purge_files_from_job(UAContext *ua, JOB_DBR *jr)
+void purge_job_from_catalog(UAContext *ua, JobId_t JobId)
{
- char *query = (char *)get_pool_memory(PM_MESSAGE);
+ POOL_MEM query(PM_MESSAGE);
char ed1[50];
- edit_int64(jr->JobId,ed1);
- Mmsg(query, "DELETE FROM File WHERE JobId=%s", ed1);
- db_sql_query(ua->db, query, NULL, (void *)NULL);
+ edit_int64(JobId, ed1);
+ Mmsg(query, "DELETE FROM Job WHERE JobId=%s", ed1);
+ db_sql_query(ua->db, query.c_str(), NULL, (void *)NULL);
+ Dmsg1(050, "Delete Job sql=%s\n", query.c_str());
- Mmsg(query, "UPDATE Job Set PurgedFiles=1 WHERE JobId=%s", ed1);
- db_sql_query(ua->db, query, NULL, (void *)NULL);
+ Mmsg(query, "DELETE FROM JobMedia WHERE JobId=%s", ed1);
+ db_sql_query(ua->db, query.c_str(), NULL, (void *)NULL);
+ Dmsg1(050, "Delete JobMedia sql=%s\n", query.c_str());
- free_pool_memory(query);
+ Mmsg(query, "DELETE FROM Log WHERE JobId=%s", ed1);
+ db_sql_query(ua->db, query.c_str(), NULL, (void *)NULL);
+ Dmsg1(050, "Delete Log sql=%s\n", query.c_str());
+
+}
+
+void purge_files_from_job(UAContext *ua, JobId_t JobId)
+{
+ POOL_MEM query(PM_MESSAGE);
+ char ed1[50];
+
+ edit_int64(JobId, ed1);
+ Mmsg(query, del_File, ed1);
+ db_sql_query(ua->db, query.c_str(), 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
+ * could grow very large.
+ */
+ Mmsg(query, upd_Purged, ed1);
}
void purge_files_from_volume(UAContext *ua, MEDIA_DBR *mr )
*/
int purge_jobs_from_volume(UAContext *ua, MEDIA_DBR *mr)
{
- char *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;
}
for (i=0; i < del.num_ids; i++) {
- edit_int64(del.JobId[i], ed1);
- Dmsg1(050, "Delete JobId=%s\n", ed1);
- Mmsg(query, "DELETE FROM File WHERE JobId=%s", ed1);
- db_sql_query(ua->db, query, NULL, (void *)NULL);
- Mmsg(query, "DELETE FROM Job WHERE JobId=%s", ed1);
- db_sql_query(ua->db, query, NULL, (void *)NULL);
- Mmsg(query, "DELETE FROM JobMedia WHERE JobId=%s", ed1);
- db_sql_query(ua->db, query, NULL, (void *)NULL);
- Dmsg1(050, "Del sql=%s\n", query);
+ purge_files_from_job(ua, del.JobId[i]);
+ purge_job_from_catalog(ua, del.JobId[i]);
del.num_del++;
}
if (del.JobId) {
} else {
bsendmsg(ua, _("Cannot purge Volume with VolStatus=%s\n"), mr->VolStatus);
}
- return strcpy(mr->VolStatus, "Purged") == 0;
+ return strcmp(mr->VolStatus, "Purged") == 0;
}
projects / bacula / bacula / blobdiff