From ae220a98e4f1eb8a553669f3d51d06d363fa2dc9 Mon Sep 17 00:00:00 2001 From: Eric Bollengier Date: Wed, 8 Sep 2021 17:39:35 +0200 Subject: [PATCH] Move the delete volume event just before the actual deletion --- bacula/src/dird/ua_cmds.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/bacula/src/dird/ua_cmds.c b/bacula/src/dird/ua_cmds.c index 2731def16..d9851a9fe 100644 --- a/bacula/src/dird/ua_cmds.c +++ b/bacula/src/dird/ua_cmds.c @@ -2229,9 +2229,6 @@ static int delete_a_volume(UAContext *ua, MEDIA_DBR *mr) return 1; } - /* Keep track of this important event */ - ua->send_events("DC0010", EVENTS_TYPE_COMMAND, "delete volume=%s", mr->VolumeName); - /* If not purged, do it */ if (strcmp(mr->VolStatus, "Purged") != 0) { if (!db_get_volume_jobids(ua->jcr, ua->db, mr, &lst)) { @@ -2242,6 +2239,10 @@ static int delete_a_volume(UAContext *ua, MEDIA_DBR *mr) purge_jobs_from_catalog(ua, lst.list); } } + + /* Keep track of this important event */ + ua->send_events("DC0010", EVENTS_TYPE_COMMAND, "delete volume=%s", mr->VolumeName); + db_delete_media_record(ua->jcr, ua->db, mr); return 1; } -- 2.47.3