From: Eric Bollengier <eric@baculasystems.com>
Date: Wed, 8 Sep 2021 15:39:35 +0000 (+0200)
Subject: Move the delete volume event just before the actual deletion
X-Git-Tag: Release-11.3.2~337
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=ae220a98e4f1eb8a553669f3d51d06d363fa2dc9;p=thirdparty%2Fbacula.git

Move the delete volume event just before the actual deletion
---

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;
 }