From: Kern Sibbald <kern@sibbald.com>
Date: Mon, 20 Nov 2006 13:30:22 +0000 (+0000)
Subject: Add additional error messages in acquiring a drive for read.
X-Git-Tag: Release-2.0.0~255
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=4cc2463173ba9b96b8e7c4b9dbe0b187c8ed621f;p=bacula%2Fbacula

Add additional error messages in acquiring a drive for read.


git-svn-id: https://bacula.svn.sourceforge.net/svnroot/bacula/trunk@3662 91ce42f0-d328-0410-95d8-f526ca767f89
---

diff --git a/bacula/src/stored/acquire.c b/bacula/src/stored/acquire.c
index fd9e53fb38..877acb405c 100644
--- a/bacula/src/stored/acquire.c
+++ b/bacula/src/stored/acquire.c
@@ -61,7 +61,9 @@ bool acquire_device_for_read(DCR *dcr)
    /* Find next Volume, if any */
    vol = jcr->VolList;
    if (!vol) {
-      Jmsg(jcr, M_FATAL, 0, _("No volumes specified. Job %d canceled.\n"), jcr->JobId);
+      char ed1[50];
+      Jmsg(jcr, M_FATAL, 0, _("No volumes specified. Job %s canceled.\n"), 
+         edit_int64(jcr->JobId, ed1));
       goto get_out;
    }
    jcr->CurVolume++;
@@ -69,6 +71,8 @@ bool acquire_device_for_read(DCR *dcr)
       vol = vol->next;
    }
    if (!vol) {
+      Jmsg(jcr, M_FATAL, 0, _("Logic error: no next volume. Numvol=%d Curvol=%d\n"),
+         jcr->NumVolumes, jcr->CurVolume);
       goto get_out;                   /* should not happen */   
    }
    bstrncpy(dcr->VolumeName, vol->VolumeName, sizeof(dcr->VolumeName));
@@ -164,7 +168,9 @@ bool acquire_device_for_read(DCR *dcr)
       }
       dev->clear_labeled();              /* force reread of label */
       if (job_canceled(jcr)) {
-         Mmsg1(dev->errmsg, _("Job %d canceled.\n"), jcr->JobId);
+         char ed1[50];
+         Mmsg1(dev->errmsg, _("Job %s canceled.\n"), edit_int64(jcr->JobId, ed1));
+         Jmsg(jcr, M_INFO, 0, dev->errmsg);
          goto get_out;                /* error return */
       }
 
diff --git a/bacula/technotes-1.39 b/bacula/technotes-1.39
index 71b8a06119..1a8aee955f 100644
--- a/bacula/technotes-1.39
+++ b/bacula/technotes-1.39
@@ -2,6 +2,7 @@
 
 General:
 20Nov06
+kes  Add additional error messages in acquiring a drive for read.   
 kes  Make WritePartAfterJob the default so that the last DVD part 
      always gets written to the DVD by default.
 kes  Add additional error messages in migration.