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.
+ License as published by the Free Software Foundation and included
+ 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
return false;
}
if (mr.Enabled == 2) {
- bsendmsg(ua, _("Cannot prune Volume \"%s\" because it is archived.\n"),
+ ua->error_msg(_("Cannot prune Volume \"%s\" because it is archived.\n"),
mr.VolumeName);
+ return false;
}
if (!confirm_retention(ua, &mr.VolRetention, "Volume")) {
return false;
(uint32_t)period, query.c_str());
cnt.count = 0;
if (!db_sql_query(ua->db, query.c_str(), del_count_handler, (void *)&cnt)) {
- bsendmsg(ua, "%s", db_strerror(ua->db));
+ ua->error_msg("%s", db_strerror(ua->db));
Dmsg0(050, "Count failed\n");
goto bail_out;
}
if (cnt.count == 0) {
if (ua->verbose) {
- bsendmsg(ua, _("No Files found to prune.\n"));
+ ua->warning_msg(_("No Files found to prune.\n"));
}
goto bail_out;
}
purge_files_from_job_list(ua, del);
edit_uint64_with_commas(del.num_del, ed1);
- bsendmsg(ua, _("Pruned Files from %s Jobs for client %s from catalog.\n"),
+ ua->info_msg(_("Pruned Files from %s Jobs for client %s from catalog.\n"),
ed1, client->name());
bail_out:
/* Create temp tables and indicies */
for (i=0; create_deltabs[i]; i++) {
if (!db_sql_query(ua->db, create_deltabs[i], NULL, (void *)NULL)) {
- bsendmsg(ua, "%s", db_strerror(ua->db));
+ ua->error_msg("%s", db_strerror(ua->db));
Dmsg0(050, "create DelTables table failed\n");
return false;
}
memset(&cr, 0, sizeof(cr));
memset(&del, 0, sizeof(del));
- bstrncpy(cr.Name, client->hdr.name, sizeof(cr.Name));
+ bstrncpy(cr.Name, client->name(), sizeof(cr.Name));
if (!db_create_client_record(ua->jcr, ua->db, &cr)) {
db_unlock(ua->db);
return 0;
edit_int64(cr.ClientId, ed2));
if (!db_sql_query(ua->db, query.c_str(), NULL, (void *)NULL)) {
if (ua->verbose) {
- bsendmsg(ua, "%s", db_strerror(ua->db));
+ ua->error_msg("%s", db_strerror(ua->db));
}
Dmsg0(050, "insert delcand failed\n");
goto bail_out;
Dmsg1(150, "Query=%s\n", query.c_str());
if (!db_sql_query(ua->db, query.c_str(), job_delete_handler, (void *)&del)) {
- bsendmsg(ua, "%s", db_strerror(ua->db));
+ ua->error_msg("%s", db_strerror(ua->db));
}
purge_job_list_from_catalog(ua, del);
if (del.num_del > 0) {
- bsendmsg(ua, _("Pruned %d %s for client %s from catalog.\n"), del.num_del,
+ ua->info_msg(_("Pruned %d %s for client %s from catalog.\n"), del.num_del,
del.num_del==1?_("Job"):_("Jobs"), client->name());
} else if (ua->verbose) {
- bsendmsg(ua, _("No Jobs found to prune.\n"));
+ ua->info_msg(_("No Jobs found to prune.\n"));
}
bail_out:
bool prune_volume(UAContext *ua, MEDIA_DBR *mr)
{
POOL_MEM query(PM_MESSAGE);
- struct s_count_ctx cnt;
struct del_ctx del;
- int i;
bool ok = false;
- JOB_DBR jr;
- utime_t now, period;
- char ed1[50], ed2[50];
+ int count;
if (mr->Enabled == 2) {
return false; /* Cannot prune archived volumes */
}
- 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, edit_int64(mr->MediaId, ed1));
- Dmsg1(150, "Query=%s\n", query.c_str());
- if (!db_sql_query(ua->db, query.c_str(), del_count_handler, (void *)&cnt)) {
- bsendmsg(ua, "%s", db_strerror(ua->db));
- Dmsg0(050, "Count failed\n");
- goto bail_out;
- }
-
- 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"),
- mr->VolumeName);
- }
- ok = mark_media_purged(ua, mr);
- goto bail_out;
- }
-
- if (cnt.count < MAX_DEL_LIST_LEN) {
- del.max_ids = cnt.count + 1;
- } else {
- del.max_ids = MAX_DEL_LIST_LEN;
- }
-
- /*
- * Now get a list of JobIds for Jobs written to this Volume
- */
+ del.max_ids = 10000;
del.JobId = (JobId_t *)malloc(sizeof(JobId_t) * del.max_ids);
- /* Use Volume Retention to prune Jobs and their Files */
- period = mr->VolRetention;
- now = (utime_t)time(NULL);
- Mmsg(query, sel_JobMedia, edit_int64(mr->MediaId, ed1),
- edit_uint64(now-period, ed2));
- Dmsg3(250, "Now=%d period=%d now-period=%d\n", (int)now, (int)period,
- (int)(now-period));
-
- Dmsg1(150, "Query=%s\n", query.c_str());
- if (!db_sql_query(ua->db, query.c_str(), file_delete_handler, (void *)&del)) {
- if (ua->verbose) {
- bsendmsg(ua, "%s", db_strerror(ua->db));
- }
- Dmsg0(050, "Count failed\n");
- goto bail_out;
- }
-
+ db_lock(ua->db);
- cnt.count = 0;
- for (i=0; i < del.num_ids; i++) {
- if (ua->jcr->JobId == del.JobId[i]) {
- Dmsg2(250, "skip same job JobId[%d]=%d\n", i, (int)del.JobId[i]);
- del.JobId[i] = 0;
- continue;
+ /* Prune only Volumes with status "Full", or "Used" */
+ if (strcmp(mr->VolStatus, "Full") == 0 ||
+ strcmp(mr->VolStatus, "Used") == 0) {
+ Dmsg2(050, "get prune list MediaId=%d Volume %s\n", (int)mr->MediaId, mr->VolumeName);
+ count = get_prune_list_for_volume(ua, mr, &del);
+ Dmsg1(050, "Num pruned = %d\n", count);
+ if (count != 0) {
+ purge_job_list_from_catalog(ua, del);
}
- Dmsg2(250, "accept JobId[%d]=%d\n", i, (int)del.JobId[i]);
- cnt.count++;
- }
- if (cnt.count != 0) {
- purge_job_list_from_catalog(ua, del);
- } else {
- Dmsg0(050, "No jobs to prune.\n");
- goto bail_out;
- }
-
- if (ua->verbose && del.num_del != 0) {
- bsendmsg(ua, _("Pruned %d %s on Volume \"%s\" from catalog.\n"), del.num_del,
- del.num_del == 1 ? "Job" : "Jobs", mr->VolumeName);
- }
-
- /*
- * 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));
- Dmsg1(150, "Query=%s\n", query.c_str());
- if (!db_sql_query(ua->db, query.c_str(), del_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");
- ok = mark_media_purged(ua, mr);
+ ok = is_volume_purged(ua, mr);
}
-bail_out:
db_unlock(ua->db);
if (del.JobId) {
free(del.JobId);
Dmsg1(050, "Query=%s\n", query.c_str());
if (!db_sql_query(ua->db, query.c_str(), file_delete_handler, (void *)del)) {
if (ua->verbose) {
- bsendmsg(ua, "%s", db_strerror(ua->db));
+ ua->error_msg("%s", db_strerror(ua->db));
}
Dmsg0(050, "Count failed\n");
goto bail_out;
}
+ /* Do not prune any job currently running */
for (i=0; i < del->num_ids; i++) {
- if (ua->jcr->JobId == del->JobId[i]) {
- Dmsg2(150, "skip same job JobId[%d]=%d\n", i, (int)del->JobId[i]);
- del->JobId[i] = 0;
+ skip = false;
+ foreach_jcr(jcr) {
+ if (jcr->JobId == del->JobId[i]) {
+ Dmsg2(150, "skip same job JobId[%d]=%d\n", i, (int)del->JobId[i]);
+ del->JobId[i] = 0;
+ skip = true;
+ break;
+ }
+ }
+ if (skip) {
continue;
}
Dmsg2(150, "accept JobId[%d]=%d\n", i, (int)del->JobId[i]);