Fix for reused thread ids by FreeBSD + qfill command

[bacula/bacula] / bacula / src / stored / read_record.c

diff --git a/bacula/src/stored/read_record.c b/bacula/src/stored/read_record.c
index c376f84fd46bf3f012e4280c831bbf9a0fde5810..273be3d2d9f4ea7de2e9a2d6fe35d4bed80aebb9 100644 (file)
--- a/bacula/src/stored/read_record.c
+++ b/bacula/src/stored/read_record.c
@@ -51,7 +51,7 @@ int read_records(JCR *jcr,  DEVICE *dev,
 
    block = new_block(dev);
    rec = new_record();
-   for ( ;ok && !done; ) {
+   for ( ; ok && !done; ) {
       if (job_canceled(jcr)) {
         ok = FALSE;
         break;
@@ -61,7 +61,7 @@ int read_records(JCR *jcr,  DEVICE *dev,
         if (dev->state & ST_EOT) {
            DEV_RECORD *trec = new_record();
 
-            Pmsg3(000, "EOT. stat=%s blk=%d rem=%d\n", rec_state_to_str(rec), 
+            Dmsg3(100, "EOT. stat=%s blk=%d rem=%d\n", rec_state_to_str(rec), 
                  block->BlockNumber, rec->remainder);
            if (!mount_cb(jcr, dev, block)) {
                Dmsg3(100, "After mount next vol. stat=%s blk=%d rem=%d\n", rec_state_to_str(rec), 
@@ -91,21 +91,22 @@ int read_records(JCR *jcr,  DEVICE *dev,
            get_session_record(dev, trec, &sessrec);
            record_cb(jcr, dev, block, trec);
            free_record(trec);
-           goto next_record;
-        }
-        if (dev->state & ST_EOF) {
-            Emsg2(M_INFO, 0, "Got EOF on device %s, Volume \"%s\"\n", 
-                 dev_name(dev), jcr->VolumeName);
+           goto next_record;         /* go read new tape */
+
+        } else if (dev->state & ST_EOF) {
+            Jmsg(jcr, M_INFO, 0, "Got EOF at file %u  on device %s, Volume \"%s\"\n", 
+                 dev->file, dev_name(dev), jcr->VolumeName);
             Dmsg0(20, "read_record got eof. try again\n");
            continue;
-        }
-        if (dev->state & ST_SHORT) {
-           Emsg0(M_INFO, 0, dev->errmsg);
+        } else if (dev->state & ST_SHORT) {
+            Jmsg(jcr, M_INFO, 0, "%s", dev->errmsg);
            continue;
+        } else {
+           /* I/O error or strange end of tape */
+           display_tape_error_status(jcr, dev);
+           ok = FALSE;
+           break;
         }
-        display_error_status(dev);
-        ok = FALSE;
-        break;
       }
       if (verbose) {
          Dmsg2(10, "Block: %d blen=%d\n", block->BlockNumber, block->block_len);