From: Kern Sibbald <kern@sibbald.com>
Date: Sat, 14 Apr 2012 09:24:30 +0000 (+0200)
Subject: More definitive fix for update slots bug
X-Git-Tag: Release-7.0.0~264
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=11596babd47b01a7dfc1b2f2ac7b954d58d8a974;p=bacula%2Fbacula

More definitive fix for update slots bug
---

diff --git a/bacula/src/dird/ua_label.c b/bacula/src/dird/ua_label.c
index ad2ecd5fb0..a87af4b869 100644
--- a/bacula/src/dird/ua_label.c
+++ b/bacula/src/dird/ua_label.c
@@ -245,17 +245,17 @@ void update_slots(UAContext *ua)
       slot_list[vl->Slot] = 0;        /* clear Slot */
       mr.Slot = vl->Slot;
       mr.InChanger = 1;
-      mr.MediaId = 0;                 /* Get by VolumeName */
+      mr.MediaId = 0;                 /* Force using VolumeName */
       if (vl->VolName) {
          bstrncpy(mr.VolumeName, vl->VolName, sizeof(mr.VolumeName));
       } else {
          mr.VolumeName[0] = 0;
       }
       set_storageid_in_mr(store.store, &mr);
-      /* Set InChanger to zero for this Slot */
       Dmsg4(100, "Before make unique: Vol=%s slot=%d inchanger=%d sid=%d\n",
             mr.VolumeName, mr.Slot, mr.InChanger, mr.StorageId);
       db_lock(ua->db);
+      /* Set InChanger to zero for this Slot */
       db_make_inchanger_unique(ua->jcr, ua->db, &mr);
       db_unlock(ua->db);
       Dmsg4(100, "After make unique: Vol=%s slot=%d inchanger=%d sid=%d\n",
@@ -271,6 +271,7 @@ void update_slots(UAContext *ua)
       if (db_get_media_record(ua->jcr, ua->db, &mr)) {
          Dmsg4(100, "After get MR: Vol=%s slot=%d inchanger=%d sid=%d\n",
             mr.VolumeName, mr.Slot, mr.InChanger, mr.StorageId);
+         /* If Slot, Inchanger, and StorageId have changed, update the Media record */
          if (mr.Slot != vl->Slot || !mr.InChanger || mr.StorageId != store.store->StorageId) {
             mr.Slot = vl->Slot;
             mr.InChanger = 1;