/*
- Bacula® - The Network Backup Solution
-
- Copyright (C) 2002-2010 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 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
- 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 Kern Sibbald.
- The licensor of Bacula is the Free Software Foundation Europe
- (FSFE), Fiduciary Program, Sumatrastrasse 25, 8006 Zürich,
- Switzerland, email:ftf@fsfeurope.org.
+ Bacula(R) - The Network Backup Solution
+
+ Copyright (C) 2000-2017 Kern Sibbald
+
+ The original author of Bacula is Kern Sibbald, with contributions
+ from many others, a complete list can be found in the file AUTHORS.
+
+ You may use this file and others of this release according to the
+ license defined in the LICENSE file, which includes the Affero General
+ Public License, v3.0 ("AGPLv3") and some additional permissions and
+ terms pursuant to its AGPLv3 Section 7.
+
+ This notice must be preserved when any source code is
+ conveyed and/or propagated.
+
+ Bacula(R) is a registered trademark of Kern Sibbald.
*/
/*
*
/* Forward referenced functions */
static int purge_files_from_client(UAContext *ua, CLIENT *client);
static int purge_jobs_from_client(UAContext *ua, CLIENT *client);
-static int action_on_purge_cmd(UAContext *ua, const char *cmd);
+int truncate_cmd(UAContext *ua, const char *cmd);
static const char *select_jobsfiles_from_client =
"SELECT JobId FROM Job "
*
* Purge Files (from) [Job|JobId|Client|Volume]
* Purge Jobs (from) [Client|Volume]
+ * Purge Volumes
*
* N.B. Not all above is implemented yet.
*/
-int purgecmd(UAContext *ua, const char *cmd)
+int purge_cmd(UAContext *ua, const char *cmd)
{
int i;
CLIENT *client;
MEDIA_DBR mr;
JOB_DBR jr;
+ memset(&jr, 0, sizeof(jr));
+
static const char *keywords[] = {
NT_("files"),
NT_("jobs"),
NT_("Volume"),
NULL};
- ua->warning_msg(_(
- "\nThis command can be DANGEROUS!!!\n\n"
- "It purges (deletes) all Files from a Job,\n"
- "JobId, Client or Volume; or it purges (deletes)\n"
- "all Jobs from a Client or Volume without regard\n"
- "to retention periods. Normally you should use the\n"
- "PRUNE command, which respects retention periods.\n"));
+ /* Special case for the "Action On Purge", this option is working only on
+ * Purged volume, so no jobs or files will be purged.
+ * We are skipping this message if "purge volume action=xxx"
+ */
+ if (!(find_arg(ua, "volume") >= 0 && find_arg(ua, "action") >= 0)) {
+ ua->warning_msg(_(
+ "\nThis command can be DANGEROUS!!!\n\n"
+ "It purges (deletes) all Files from a Job,\n"
+ "JobId, Client or Volume; or it purges (deletes)\n"
+ "all Jobs from a Client or Volume without regard\n"
+ "to retention periods. Normally you should use the\n"
+ "PRUNE command, which respects retention periods.\n"));
+ }
- if (!open_db(ua)) {
+ if (!open_new_client_db(ua)) {
return 1;
}
switch (find_arg_keyword(ua, keywords)) {
}
return 1;
case 2: /* client */
- client = get_client_resource(ua);
+ /* We restrict the client list to ClientAcl, maybe something to change later */
+ client = get_client_resource(ua, JT_SYSTEM);
if (client) {
purge_files_from_client(ua, client);
}
case 1:
switch(find_arg_keyword(ua, jobs_keywords)) {
case 0: /* client */
- client = get_client_resource(ua);
+ /* We restrict the client list to ClientAcl, maybe something to change later */
+ client = get_client_resource(ua, JT_SYSTEM);
if (client) {
purge_jobs_from_client(ua, client);
}
case 2:
/* Perform ActionOnPurge (action=truncate) */
if (find_arg(ua, "action") >= 0) {
- return action_on_purge_cmd(ua, ua->cmd);
+ return truncate_cmd(ua, ua->cmd);
}
while ((i=find_arg(ua, NT_("volume"))) >= 0) {
}
switch (do_keyword_prompt(ua, _("Choose item to purge"), keywords)) {
case 0: /* files */
- client = get_client_resource(ua);
+ /* We restrict the client list to ClientAcl, maybe something to change later */
+ client = get_client_resource(ua, JT_SYSTEM);
if (client) {
purge_files_from_client(ua, client);
}
break;
case 1: /* jobs */
- client = get_client_resource(ua);
+ /* We restrict the client list to ClientAcl, maybe something to change later */
+ client = get_client_resource(ua, JT_SYSTEM);
if (client) {
purge_jobs_from_client(ua, client);
}
purge_files_from_job_list(ua, del);
- if (del.num_ids == 0) {
+ if (del.num_del == 0) {
ua->warning_msg(_("No Files found for client %s to purge from %s catalog.\n"),
client->name(), client->catalog->name());
} else {
- ua->info_msg(_("Files for %d Jobs for client \"%s\" purged from %s catalog.\n"), del.num_ids,
+ ua->info_msg(_("Files for %d Jobs for client \"%s\" purged from %s catalog.\n"), del.num_del,
client->name(), client->catalog->name());
}
del.max_ids = 1000;
del.JobId = (JobId_t *)malloc(sizeof(JobId_t) * del.max_ids);
del.PurgedFiles = (char *)malloc(del.max_ids);
-
+
ua->info_msg(_("Begin purging jobs from Client \"%s\"\n"), cr.Name);
Mmsg(query, select_jobs_from_client, edit_int64(cr.ClientId, ed1));
purge_job_list_from_catalog(ua, del);
- if (del.num_ids == 0) {
- ua->warning_msg(_("No Files found for client %s to purge from %s catalog.\n"),
+ if (del.num_del == 0) {
+ ua->warning_msg(_("No Jobs found for client %s to purge from %s catalog.\n"),
client->name(), client->catalog->name());
} else {
- ua->info_msg(_("%d Jobs for client %s purged from %s catalog.\n"), del.num_ids,
+ ua->info_msg(_("%d Jobs for client %s purged from %s catalog.\n"), del.num_del,
client->name(), client->catalog->name());
}
db_sql_query(ua->db, query.c_str(), NULL, (void *)NULL);
Dmsg1(050, "Delete BaseFiles sql=%s\n", query.c_str());
+ Mmsg(query, "DELETE FROM PathVisibility WHERE JobId IN (%s)", jobs);
+ db_sql_query(ua->db, query.c_str(), NULL, (void *)NULL);
+ Dmsg1(050, "Delete PathVisibility sql=%s\n", query.c_str());
+
/*
* Now mark Job as having files purged. This is necessary to
* avoid having too many Jobs to process in future prunings. If
void upgrade_copies(UAContext *ua, char *jobs)
{
POOL_MEM query(PM_MESSAGE);
-
+ int dbtype = ua->db->bdb_get_type_index();
+
db_lock(ua->db);
- /* Do it in two times for mysql */
- Mmsg(query, "CREATE TEMPORARY TABLE cpy_tmp AS "
- "SELECT MIN(JobId) AS JobId FROM Job " /* Choose the oldest job */
- "WHERE Type='%c' "
- "AND ( PriorJobId IN (%s) "
- "OR "
- " PriorJobId IN ( "
- "SELECT PriorJobId "
- "FROM Job "
- "WHERE JobId IN (%s) "
- " AND Type='B' "
- ") "
- ") "
- "GROUP BY PriorJobId ", /* one result per copy */
- JT_JOB_COPY, jobs, jobs);
+
+ Mmsg(query, uap_upgrade_copies_oldest_job[dbtype], JT_JOB_COPY, jobs, jobs);
db_sql_query(ua->db, query.c_str(), NULL, (void *)NULL);
Dmsg1(050, "Upgrade copies Log sql=%s\n", query.c_str());
/* Now upgrade first copy to Backup */
- Mmsg(query, "UPDATE Job SET Type='B' " /* JT_JOB_COPY => JT_BACKUP */
+ Mmsg(query, "UPDATE Job SET Type='B' " /* JT_JOB_COPY => JT_BACKUP */
"WHERE JobId IN ( SELECT JobId FROM cpy_tmp )");
db_sql_query(ua->db, query.c_str(), NULL, (void *)NULL);
db_sql_query(ua->db, query.c_str(), NULL, (void *)NULL);
Dmsg1(050, "Delete Log sql=%s\n", query.c_str());
+ Mmsg(query, "DELETE FROM RestoreObject WHERE JobId IN (%s)", jobs);
+ db_sql_query(ua->db, query.c_str(), NULL, (void *)NULL);
+ Dmsg1(050, "Delete RestoreObject sql=%s\n", query.c_str());
+
+ /* The JobId of the Snapshot record is no longer usable
+ * TODO: Migth want to use a copy for the jobid?
+ */
+ Mmsg(query, "UPDATE Snapshot SET JobId=0 WHERE JobId IN (%s)", jobs);
+ db_sql_query(ua->db, query.c_str(), NULL, (void *)NULL);
+
upgrade_copies(ua, jobs);
/* Now remove the Job record itself */
bool purge_jobs_from_volume(UAContext *ua, MEDIA_DBR *mr, bool force)
{
POOL_MEM query(PM_MESSAGE);
- struct del_ctx del;
+ db_list_ctx lst_all, lst;
+ char *jobids=NULL;
int i;
bool purged = false;
bool stat;
- JOB_DBR jr;
- char ed1[50];
stat = strcmp(mr->VolStatus, "Append") == 0 ||
strcmp(mr->VolStatus, "Full") == 0 ||
return 0;
}
- memset(&jr, 0, sizeof(jr));
- memset(&del, 0, sizeof(del));
- del.max_ids = 1000;
- del.JobId = (JobId_t *)malloc(sizeof(JobId_t) * del.max_ids);
-
/*
* Check if he wants to purge a single jobid
*/
i = find_arg_with_value(ua, "jobid");
- if (i >= 0) {
- del.num_ids = 1;
- del.JobId[0] = str_to_int64(ua->argv[i]);
+ if (i >= 0 && is_a_number_list(ua->argv[i])) {
+ jobids = ua->argv[i];
+
} else {
+ POOL_MEM query;
/*
* Purge ALL JobIds
*/
- Mmsg(query, "SELECT DISTINCT JobId FROM JobMedia WHERE MediaId=%s",
- edit_int64(mr->MediaId, ed1));
- if (!db_sql_query(ua->db, query.c_str(), file_delete_handler, (void *)&del)) {
+ if (!db_get_volume_jobids(ua->jcr, ua->db, mr, &lst_all)) {
ua->error_msg("%s", db_strerror(ua->db));
Dmsg0(050, "Count failed\n");
goto bail_out;
}
- }
-
- purge_job_list_from_catalog(ua, del);
- ua->info_msg(_("%d File%s on Volume \"%s\" purged from catalog.\n"), del.num_del,
- del.num_del==1?"":"s", mr->VolumeName);
+ if (lst_all.count > 0) {
+ Mmsg(query, "SELECT JobId FROM Job WHERE JobId IN (%s) AND JobStatus NOT IN ('R', 'C')",
+ lst_all.list);
+ if (!db_sql_query(ua->db, query.c_str(), db_list_handler, &lst)) {
+ ua->error_msg("%s", db_strerror(ua->db));
+ goto bail_out;
+ }
+ }
+ jobids = lst.list;
+ }
- purged = is_volume_purged(ua, mr, force);
+ if (*jobids) {
+ purge_jobs_from_catalog(ua, jobids);
+ ua->info_msg(_("%d Job%s on Volume \"%s\" purged from catalog.\n"),
+ lst.count, lst.count<=1?"":"s", mr->VolumeName);
+ }
+ purged = is_volume_purged(ua, mr, force);
bail_out:
- if (del.JobId) {
- free(del.JobId);
- }
return purged;
}
}
if (strcmp(mr->VolStatus, "Purged") == 0) {
+ Dmsg1(100, "Volume=%s already purged.\n", mr->VolumeName);
purged = true;
goto bail_out;
}
/* If purged, mark it so */
cnt.count = 0;
- Mmsg(query, "SELECT count(*) FROM JobMedia WHERE MediaId=%s",
+ Mmsg(query, "SELECT 1 FROM JobMedia WHERE MediaId=%s LIMIT 1",
edit_int64(mr->MediaId, ed1));
if (!db_sql_query(ua->db, query.c_str(), del_count_handler, (void *)&cnt)) {
ua->error_msg("%s", db_strerror(ua->db));
if (cnt.count == 0) {
ua->warning_msg(_("There are no more Jobs associated with Volume \"%s\". Marking it purged.\n"),
mr->VolumeName);
+ Dmsg1(100, "There are no more Jobs associated with Volume \"%s\". Marking it purged.\n",
+ mr->VolumeName);
if (!(purged = mark_media_purged(ua, mr))) {
ua->error_msg("%s", db_strerror(ua->db));
}
return purged;
}
-static BSOCK *open_sd_bsock(UAContext *ua)
-{
- STORE *store = ua->jcr->wstore;
-
- if (!ua->jcr->store_bsock) {
- ua->send_msg(_("Connecting to Storage daemon %s at %s:%d ...\n"),
- store->name(), store->address, store->SDport);
- if (!connect_to_storage_daemon(ua->jcr, 10, SDConnectTimeout, 1)) {
- ua->error_msg(_("Failed to connect to Storage daemon.\n"));
- return NULL;
- }
- }
- return ua->jcr->store_bsock;
-}
-
-static void do_truncate_on_purge(UAContext *ua, MEDIA_DBR *mr,
- char *pool, char *storage,
- int drive, BSOCK *sd)
+/*
+ * Called here to send the appropriate commands to the SD
+ * to do truncate on purge.
+ */
+static void truncate_volume(UAContext *ua, MEDIA_DBR *mr,
+ char *pool, char *storage,
+ int drive, BSOCK *sd)
{
- int dvd;
- bool ok=false;
+ bool ok = false;
uint64_t VolBytes = 0;
-
- /* TODO: Return if not mr->Recyle ? */
+ uint64_t VolABytes = 0;
+ uint32_t VolType = 0;
+
if (!mr->Recycle) {
return;
}
- if (mr->ActionOnPurge & AOP_TRUNCATE) {
- /* Send the command to truncate the volume after purge. If this feature
- * is disabled for the specific device, this will be a no-op.
- */
+ /* Do it only if action on purge = truncate is set */
+ if (!(mr->ActionOnPurge & ON_PURGE_TRUNCATE)) {
+ ua->error_msg(_("\nThe option \"Action On Purge = Truncate\" was not defined in the Pool resource.\n"
+ "Unable to truncate volume \"%s\"\n"), mr->VolumeName);
+ return;
+ }
- /* Protect us from spaces */
- bash_spaces(mr->VolumeName);
- bash_spaces(mr->MediaType);
- bash_spaces(pool);
- bash_spaces(storage);
-
- sd->fsend("relabel %s OldName=%s NewName=%s PoolName=%s "
- "MediaType=%s Slot=%d drive=%d\n",
- storage,
- mr->VolumeName, mr->VolumeName,
- pool, mr->MediaType, mr->Slot, drive);
-
- unbash_spaces(mr->VolumeName);
- unbash_spaces(mr->MediaType);
- unbash_spaces(pool);
- unbash_spaces(storage);
-
- while (sd->recv() >= 0) {
- ua->send_msg("%s", sd->msg);
- if (sscanf(sd->msg, "3000 OK label. VolBytes=%llu DVD=%d ",
- &VolBytes, &dvd) == 2)
- {
- ok = true;
- }
- }
+ /*
+ * Send the command to truncate the volume after purge. If this feature
+ * is disabled for the specific device, this will be a no-op.
+ */
+
+ /* Protect us from spaces */
+ bash_spaces(mr->VolumeName);
+ bash_spaces(mr->MediaType);
+ bash_spaces(pool);
+ bash_spaces(storage);
+
+ /* Do it by relabeling the Volume, which truncates it */
+ sd->fsend("relabel %s OldName=%s NewName=%s PoolName=%s "
+ "MediaType=%s Slot=%d drive=%d\n",
+ storage,
+ mr->VolumeName, mr->VolumeName,
+ pool, mr->MediaType, mr->Slot, drive);
+
+ unbash_spaces(mr->VolumeName);
+ unbash_spaces(mr->MediaType);
+ unbash_spaces(pool);
+ unbash_spaces(storage);
+
+ /* Check for valid response. With cloud volumes, the upload of the part.1 can
+ * generate a dir_update_volume_info() message that is handled by bget_dirmsg()
+ */
+ while (bget_dirmsg(sd) >= 0) {
+ ua->send_msg("%s", sd->msg);
+ if (sscanf(sd->msg, "3000 OK label. VolBytes=%llu VolABytes=%lld VolType=%d ",
+ &VolBytes, &VolABytes, &VolType) == 3) {
- if (ok) {
+ ok=true;
mr->VolBytes = VolBytes;
+ mr->VolABytes = VolABytes;
+ mr->VolType = VolType;
mr->VolFiles = 0;
+ mr->VolParts = 1;
+ mr->VolCloudParts = 0;
+ mr->LastPartBytes = VolBytes;
+
+ set_storageid_in_mr(NULL, mr);
if (!db_update_media_record(ua->jcr, ua->db, mr)) {
ua->error_msg(_("Can't update volume size in the catalog\n"));
}
ua->send_msg(_("The volume \"%s\" has been truncated\n"), mr->VolumeName);
- } else {
- ua->warning_msg(_("Unable to truncate volume \"%s\"\n"), mr->VolumeName);
}
}
+ if (!ok) {
+ ua->warning_msg(_("Unable to truncate volume \"%s\"\n"), mr->VolumeName);
+ }
}
-/* purge action= pool= volume= storage= devicetype= */
-static int action_on_purge_cmd(UAContext *ua, const char *cmd)
+/*
+ * Implement Bacula bconsole command purge action
+ * purge action=truncate pool= volume= storage= mediatype=
+ * or
+ * truncate [cache] pool= volume= storage= mediatype=
+ *
+ * If the keyword "cache: is present, then we use the truncate
+ * command rather than relabel so that the driver can decide
+ * whether or not it wants to truncate. Note: only the
+ * Cloud driver permits truncating the cache.
+ *
+ * Note, later we might want to rename this action_on_purge_cmd() as
+ * was the original, but only if we add additional actions such as
+ * erase, ... For the moment, we only do a truncate.
+ *
+ */
+int truncate_cmd(UAContext *ua, const char *cmd)
{
- bool allpools=false;
- int drive=-1;
- int nb=0;
-
- uint32_t *results=NULL;
- const char *action="all";
- STORE *store=NULL;
- POOL *pool=NULL;
+ int drive = -1;
+ int nb = 0;
+ uint32_t *results = NULL;
+ const char *action = "truncate";
MEDIA_DBR mr;
POOL_DBR pr;
+ BSOCK *sd;
+ char storage[MAX_NAME_LENGTH];
- BSOCK *sd=NULL;
-
- memset(&pr, 0, sizeof(pr));
- memset(&mr, 0, sizeof(mr));
-
- /* Look arguments */
- for (int i=1; i<ua->argc; i++) {
- if (strcasecmp(ua->argk[i], NT_("allpools")) == 0) {
- allpools = true;
-
- } else if (strcasecmp(ua->argk[i], NT_("volume")) == 0 && ua->argv[i]) {
- bstrncpy(mr.VolumeName, ua->argv[i], sizeof(mr.VolumeName));
-
- } else if (strcasecmp(ua->argk[i], NT_("devicetype")) == 0 && ua->argv[i]) {
- bstrncpy(mr.MediaType, ua->argv[i], sizeof(mr.MediaType));
-
- } else if (strcasecmp(ua->argk[i], NT_("drive")) == 0 && ua->argv[i]) {
- drive = atoi(ua->argv[i]);
-
- } else if (strcasecmp(ua->argk[i], NT_("action")) == 0 && ua->argv[i]) {
- action=ua->argv[i];
- }
- }
-
- /* Choose storage */
- ua->jcr->wstore = store = get_storage_resource(ua, false);
- if (!store) {
- goto bail_out;
+ if (find_arg(ua, "cache") > 0) {
+ return cloud_volumes_cmd(ua, cmd, "truncate cache");
}
- mr.StorageId = store->StorageId;
- if (!open_db(ua)) {
- Dmsg0(100, "Can't open db\n");
- goto bail_out;
- }
-
- if (!allpools) {
- /* force pool selection */
- pool = get_pool_resource(ua);
- if (!pool) {
- Dmsg0(100, "Can't get pool resource\n");
- goto bail_out;
- }
- bstrncpy(pr.Name, pool->name(), sizeof(pr.Name));
- if (!db_get_pool_record(ua->jcr, ua->db, &pr)) {
- Dmsg0(100, "Can't get pool record\n");
- goto bail_out;
- }
- mr.PoolId = pr.PoolId;
- }
+ memset(&pr, 0, sizeof(pr));
+ /*
+ * Look for all Purged volumes that can be recycled, are enabled and
+ * have more than 1,000 bytes (i.e. actually have data).
+ */
mr.Recycle = 1;
mr.Enabled = 1;
- mr.VolBytes = 10000;
+ mr.VolBytes = 1000;
bstrncpy(mr.VolStatus, "Purged", sizeof(mr.VolStatus));
-
- if (!db_get_media_ids(ua->jcr, ua->db, &mr, &nb, &results)) {
- Dmsg0(100, "No results from db_get_media_ids\n");
- goto bail_out;
- }
-
- if (!nb) {
- ua->send_msg(_("No volume founds to perform %s action(s)\n"), action);
+ /* Get list of volumes to truncate */
+ if (!scan_storage_cmd(ua, cmd, true, /* allfrompool */
+ &drive, &mr, &pr, &action, storage, &nb, &results)) {
goto bail_out;
}
goto bail_out;
}
+ /*
+ * Loop over the candidate Volumes and actually truncate them
+ */
for (int i=0; i < nb; i++) {
- memset(&mr, 0, sizeof(mr));
+ mr.clear();
mr.MediaId = results[i];
- if (db_get_media_record(ua->jcr, ua->db, &mr)) {
- /* TODO: ask for drive and change Pool */
- if (!strcasecmp("truncate", action) || !strcasecmp("all", action)) {
- do_truncate_on_purge(ua, &mr, pr.Name, store->dev_name(), drive, sd);
+ if (db_get_media_record(ua->jcr, ua->db, &mr)) {
+ if (strcasecmp(mr.VolStatus, "Purged") != 0) {
+ ua->send_msg(_("Truncate Volume \"%s\" skipped. Status is \"%s\", but must be \"Purged\".\n"),
+ mr.VolumeName, mr.VolStatus);
+ continue;
+ }
+ if (drive < 0) {
+ STORE *store = (STORE*)GetResWithName(R_STORAGE, storage);
+ drive = get_storage_drive(ua, store);
+ }
+
+ /* Must select Pool if not already done */
+ if (pr.PoolId == 0) {
+ pr.PoolId = mr.PoolId;
+ if (!db_get_pool_record(ua->jcr, ua->db, &pr)) {
+ goto bail_out; /* free allocated memory */
+ }
+ }
+ if (strcasecmp("truncate", action) == 0) {
+ truncate_volume(ua, &mr, pr.Name, storage,
+ drive, sd);
}
} else {
- Dmsg1(0, "Can't find MediaId=%lld\n", (uint64_t) mr.MediaId);
+ Dmsg1(0, "Can't find MediaId=%lu\n", mr.MediaId);
}
}
bail_out:
close_db(ua);
- if (sd) {
- sd->signal(BNET_TERMINATE);
- sd->close();
- ua->jcr->store_bsock = NULL;
- }
+ close_sd_bsock(ua);
ua->jcr->wstore = NULL;
if (results) {
free(results);
strcmp(mr->VolStatus, "Used") == 0 ||
strcmp(mr->VolStatus, "Error") == 0) {
bstrncpy(mr->VolStatus, "Purged", sizeof(mr->VolStatus));
+ set_storageid_in_mr(NULL, mr);
if (!db_update_media_record(jcr, ua->db, mr)) {
return false;
}
pm_strcpy(jcr->VolumeName, mr->VolumeName);
- generate_job_event(jcr, "VolumePurged");
- generate_plugin_event(jcr, bEventVolumePurged);
+ generate_plugin_event(jcr, bDirEventVolumePurged);
/*
* If the RecyclePool is defined, move the volume there
*/
memset(&newpr, 0, sizeof(POOL_DBR));
newpr.PoolId = mr->RecyclePoolId;
oldpr.PoolId = mr->PoolId;
- if ( db_get_pool_record(jcr, ua->db, &oldpr)
- && db_get_pool_record(jcr, ua->db, &newpr))
- {
+ if ( db_get_pool_numvols(jcr, ua->db, &oldpr)
+ && db_get_pool_numvols(jcr, ua->db, &newpr)) {
/* check if destination pool size is ok */
if (newpr.MaxVols > 0 && newpr.NumVols >= newpr.MaxVols) {
- ua->error_msg(_("Unable move recycled Volume in full "
+ ua->error_msg(_("Unable move recycled Volume in full "
"Pool \"%s\" MaxVols=%d\n"),
newpr.Name, newpr.MaxVols);
}
}
- /* Send message to Job report, if it is a *real* job */
+ /* Send message to Job report, if it is a *real* job */
if (jcr && jcr->JobId > 0) {
Jmsg(jcr, M_INFO, 0, _("All records pruned from Volume \"%s\"; marking it \"Purged\"\n"),
- mr->VolumeName);
+ mr->VolumeName);
}
return true;
} else {