+/*
+ Bacula® - The Network Backup Solution
+
+ Copyright (C) 2002-2007 Free Software Foundation Europe e.V.
+
+ The main author of Bacula is Kern Sibbald, with contributions from
+ many others, a complete list can be found in the file AUTHORS.
+ This program is Free Software; you can redistribute it and/or
+ modify it under the terms of version two of the GNU General Public
+ License as published by the Free Software Foundation plus additions
+ that are listed in the file LICENSE.
+
+ This program is distributed in the hope that it will be useful, but
+ WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ General Public License for more details.
+
+ You should have received a copy of the GNU General Public License
+ along with this program; if not, write to the Free Software
+ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
+ 02110-1301, USA.
+
+ Bacula® is a registered trademark of John Walker.
+ The licensor of Bacula is the Free Software Foundation Europe
+ (FSFE), Fiduciary Program, Sumatrastrasse 25, 8006 Zürich,
+ Switzerland, email:ftf@fsfeurope.org.
+*/
/*
*
* Bacula Director -- User Agent Database prune Command
*
* Version $Id$
*/
-/*
- 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
- version 2 as amended with additional clauses defined in the
- file LICENSE in the main source directory.
-
- This program is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- the file LICENSE for additional details.
-
- */
#include "bacula.h"
#include "dird.h"
NT_("Volume"),
NULL};
- if (!open_db(ua)) {
+ if (!open_client_db(ua)) {
return false;
}
if (!select_pool_and_media_dbr(ua, &pr, &mr)) {
return false;
}
+ if (mr.Enabled == 2) {
+ bsendmsg(ua, _("Cannot prune Volume \"%s\" because it is archived.\n"),
+ mr.VolumeName);
+ }
if (!confirm_retention(ua, &mr.VolRetention, "Volume")) {
return false;
}
db_sql_query(ua->db, query, file_delete_handler, (void *)&del);
for (i=0; i < del.num_ids; i++) {
- purge_files_from_job(ua, del.JobId[i]);
+ /* Don't prune current job */
+ if (ua->jcr->JobId != del.JobId[i]) {
+ purge_files_from_job(ua, del.JobId[i]);
+ del.num_del++;
+ }
}
- edit_uint64_with_commas(del.num_ids, ed1);
+ edit_uint64_with_commas(del.num_del, ed1);
bsendmsg(ua, _("Pruned Files from %s Jobs for client %s from catalog.\n"),
- ed1, client->hdr.name);
+ ed1, client->name());
bail_out:
db_unlock(ua->db);
edit_int64(cr.ClientId, ed2);
switch (JobType) {
case JT_BACKUP:
- Mmsg(query, select_backup_del, ed1, ed1, ed2);
+ Mmsg(query, select_backup_del, ed1, ed2);
break;
case JT_RESTORE:
- Mmsg(query, select_restore_del, ed1, ed1, ed2);
+ Mmsg(query, select_restore_del, ed1, ed2);
break;
case JT_VERIFY:
- Mmsg(query, select_verify_del, ed1, ed1, ed2);
+ Mmsg(query, select_verify_del, ed1, ed2);
break;
case JT_ADMIN:
- Mmsg(query, select_admin_del, ed1, ed1, ed2);
+ Mmsg(query, select_admin_del, ed1, ed2);
break;
case JT_MIGRATE:
- Mmsg(query, select_migrate_del, ed1, ed1, ed2);
+ Mmsg(query, select_migrate_del, ed1, ed2);
break;
}
if (!db_sql_query(ua->db, query, job_delete_handler, (void *)&del)) {
* Then delete the Job entry, and finally and JobMedia records.
*/
for (i=0; i < del.num_ids; i++) {
- if (!del.PurgedFiles[i]) {
- purge_files_from_job(ua, del.JobId[i]);
+ /* Don't prune current job */
+ if (ua->jcr->JobId != del.JobId[i]) {
+ if (!del.PurgedFiles[i]) {
+ purge_files_from_job(ua, del.JobId[i]);
+ }
+ purge_job_from_catalog(ua, del.JobId[i]);
+ del.num_del++;
}
- purge_job_from_catalog(ua, del.JobId[i]);
}
- bsendmsg(ua, _("Pruned %d %s for client %s from catalog.\n"), del.num_ids,
- del.num_ids==1?_("Job"):_("Jobs"), client->hdr.name);
+ bsendmsg(ua, _("Pruned %d %s for client %s from catalog.\n"), del.num_del,
+ del.num_del==1?_("Job"):_("Jobs"), client->name());
bail_out:
drop_temp_tables(ua);
continue;
}
Dmsg2(200, "Looking at %s JobTdate=%d\n", jr.Job, (int)jr.JobTDate);
- if (jr.JobTDate >= (now - period)) {
+ if (jr.JobTDate >= (now - period) || ua->jcr->JobId == del.JobId[i]) {
continue;
}
purge_files_from_job(ua, del.JobId[i]);