X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=bacula%2Fsrc%2Fstored%2Flabel.c;h=32a65297bfd00756a23effb430fa252c59cec531;hb=b22b260eaa7fb9f122523fff0e324dca5904b97f;hp=ee0d4fbd74392773cd0db984bf0d88b5e96d3a7b;hpb=8597190cb7d59d08ea317e28145b74f1d21b8fd5;p=bacula%2Fbacula

diff --git a/bacula/src/stored/label.c b/bacula/src/stored/label.c
index ee0d4fbd74..32a65297bf 100644
--- a/bacula/src/stored/label.c
+++ b/bacula/src/stored/label.c
@@ -8,7 +8,7 @@
  *   Version $Id$
  */
 /*
-   Copyright (C) 2000-2005 Kern Sibbald
+   Copyright (C) 2000-2006 Kern Sibbald
 
    This program is free software; you can redistribute it and/or
    modify it under the terms of the GNU General Public License
@@ -28,9 +28,6 @@
 /* Forward referenced functions */
 static void create_volume_label_record(DCR *dcr, DEV_RECORD *rec);
 
-extern char my_name[];
-extern int debug_level;
-
 /*
  * Read the volume label
  *
@@ -71,7 +68,9 @@ int read_dev_volume_label(DCR *dcr)
       dev->VolHdr.VolumeName[0]?dev->VolHdr.VolumeName:"*NULL*");
 
    if (!dev->is_open()) {
-      Emsg0(M_ABORT, 0, _("BAD call to read_dev_volume_label\n"));
+      if (dev->open(dcr, OPEN_READ_ONLY) < 0) {
+         return VOL_IO_ERROR;
+      }
    }
    if (dev->is_labeled()) {              /* did we already read label? */
       /* Compare Volume Names allow special wild card */
@@ -100,7 +99,7 @@ int read_dev_volume_label(DCR *dcr)
 
    if (!dev->rewind(dcr)) {
       Mmsg(jcr->errmsg, _("Couldn't rewind device %s: ERR=%s\n"), 
-         dev->print_name(), strerror_dev(dev));
+         dev->print_name(), dev->bstrerror());
       Dmsg1(30, "return VOL_NO_MEDIA: %s", jcr->errmsg);
       return VOL_NO_MEDIA;
    }
@@ -139,14 +138,14 @@ int read_dev_volume_label(DCR *dcr)
    if (!read_block_from_dev(dcr, NO_BLOCK_NUMBER_CHECK)) {
       Mmsg(jcr->errmsg, _("Requested Volume \"%s\" on %s is not a Bacula "
            "labeled Volume, because: ERR=%s"), NPRT(VolName), 
-           dev->print_name(), strerror_dev(dev));
+           dev->print_name(), dev->bstrerror());
       Dmsg1(30, "%s", jcr->errmsg);
    } else if (!read_record_from_block(block, record)) {
       Mmsg(jcr->errmsg, _("Could not read Volume label from block.\n"));
       Dmsg1(30, "%s", jcr->errmsg);
    } else if (!unser_volume_label(dev, record)) {
       Mmsg(jcr->errmsg, _("Could not unserialize Volume label: ERR=%s\n"),
-         strerror_dev(dev));
+         dev->bstrerror());
       Dmsg1(30, "%s", jcr->errmsg);
    } else if (strcmp(dev->VolHdr.Id, BaculaId) != 0 &&
               strcmp(dev->VolHdr.Id, OldBaculaId) != 0) {
@@ -164,6 +163,7 @@ int read_dev_volume_label(DCR *dcr)
          empty_block(block);
          return VOL_OK;
       }
+      Dmsg0(100, "No volume label - bailing out\n");
       stat = VOL_NO_LABEL;
       goto bail_out;
    }
@@ -287,11 +287,10 @@ bool write_volume_label_to_block(DCR *dcr)
  *            after the label will be destroyed,
  *            in fact, we write the label 5 times !!!!
  *
- *  This routine expects that open_device() was previously called.
- *
  *  This routine should be used only when labeling a blank tape.
  */
-bool write_new_volume_label_to_dev(DCR *dcr, const char *VolName, const char *PoolName)
+bool write_new_volume_label_to_dev(DCR *dcr, const char *VolName, 
+                                   const char *PoolName, bool dvdnow)
 {
    DEVICE *dev = dcr->dev;
 
@@ -300,20 +299,23 @@ bool write_new_volume_label_to_dev(DCR *dcr, const char *VolName, const char *Po
    empty_block(dcr->block);
 
    if (dev->open(dcr, OPEN_READ_WRITE) < 0) {
-      goto bail_out;
+      /* If device is not tape, attempt to create it */
+      if (dev->is_tape() || dev->open(dcr, CREATE_READ_WRITE) < 0) {
+         goto bail_out;
+      }
    }
    Dmsg1(150, "Label type=%d\n", dev->label_type);
    if (!dev->rewind(dcr)) {
       free_volume(dev);
       memset(&dev->VolHdr, 0, sizeof(dev->VolHdr));
-      Dmsg2(30, "Bad status on %s from rewind: ERR=%s\n", dev->print_name(), strerror_dev(dev));
+      Dmsg2(30, "Bad status on %s from rewind: ERR=%s\n", dev->print_name(), dev->bstrerror());
       if (!forge_on) {
          goto bail_out;
       }
    }
 
-   /* Create PRE_LABEL */
-   create_volume_label(dev, VolName, PoolName);
+   /* Create PRE_LABEL or VOL_LABEL if DVD */
+   create_volume_label(dev, VolName, PoolName, dvdnow);
 
    /*
     * If we have already detected an ANSI label, re-read it
@@ -335,7 +337,7 @@ bool write_new_volume_label_to_dev(DCR *dcr, const char *VolName, const char *Po
    /* Temporarily mark in append state to enable writing */
    dev->set_append();
    if (!write_record_to_block(dcr->block, dcr->rec)) {
-      Dmsg2(30, "Bad Label write on %s: ERR=%s\n", dev->print_name(), strerror_dev(dev));
+      Dmsg2(30, "Bad Label write on %s: ERR=%s\n", dev->print_name(), dev->bstrerror());
       goto bail_out;
    } else {
       Dmsg2(30, "Wrote label of %d bytes to %s\n", dcr->rec->data_len, dev->print_name());
@@ -343,12 +345,21 @@ bool write_new_volume_label_to_dev(DCR *dcr, const char *VolName, const char *Po
 
    Dmsg0(99, "Call write_block_to_dev()\n");
    if (!write_block_to_dev(dcr)) {
-      Dmsg2(30, "Bad Label write on %s: ERR=%s\n", dev->print_name(), strerror_dev(dev));
+      Dmsg2(30, "Bad Label write on %s: ERR=%s\n", dev->print_name(), dev->bstrerror());
       goto bail_out;
    }
+
+   /* Now commit block to DVD if we should write now */
+   if (dev->is_dvd() && dvdnow) {
+      if (!dvd_write_part(dcr)) {
+         Dmsg2(30, "Bad DVD write on %s: ERR=%s\n", dev->print_name(), dev->bstrerror());
+         goto bail_out;
+      }
+   }
+
    Dmsg0(99, " Wrote block to device\n");
 
-   if (weof_dev(dev, 1) == 0) {
+   if (dev->weof(1)) {
       dev->set_labeled();
       write_ansi_ibm_labels(dcr, ANSI_EOF_LABEL, dev->VolHdr.VolumeName);
    }
@@ -388,6 +399,9 @@ bool rewrite_volume_label(DCR *dcr, bool recycle)
       Dmsg0(200, "Error from write volume label.\n");
       return false;
    }
+
+   dev->VolCatInfo.VolCatBytes = 0;        /* reset byte count */
+
    /*
     * If we are not dealing with a streaming device,
     *  write the block now to ensure we have write permission.
@@ -397,13 +411,15 @@ bool rewrite_volume_label(DCR *dcr, bool recycle)
     */
    if (!dev_cap(dev, CAP_STREAM)) {
       if (!dev->rewind(dcr)) {
-         Jmsg2(jcr, M_WARNING, 0, _("Rewind error on device %s: ERR=%s\n"),
-               dev->print_name(), strerror_dev(dev));
+         Jmsg2(jcr, M_FATAL, 0, _("Rewind error on device %s: ERR=%s\n"),
+               dev->print_name(), dev->bstrerror());
+         return false;
       }
       if (recycle) {
-         if (!truncate_dev(dcr)) {
-            Jmsg2(jcr, M_WARNING, 0, _("Truncate error on device %s: ERR=%s\n"),
-                  dev->print_name(), strerror_dev(dev));
+         if (!dev->truncate(dcr)) {
+            Jmsg2(jcr, M_FATAL, 0, _("Truncate error on device %s: ERR=%s\n"),
+                  dev->print_name(), dev->bstrerror());
+            return false;
          }
       }
 
@@ -425,7 +441,7 @@ bool rewrite_volume_label(DCR *dcr, bool recycle)
       Dmsg1(200, "Attempt to write to device fd=%d.\n", dev->fd);
       if (!write_block_to_dev(dcr)) {
          Jmsg2(jcr, M_ERROR, 0, _("Unable to write device %s: ERR=%s\n"),
-            dev->print_name(), strerror_dev(dev));
+            dev->print_name(), dev->bstrerror());
          Dmsg0(200, "===ERROR write block to dev\n");
          return false;
       }
@@ -433,7 +449,6 @@ bool rewrite_volume_label(DCR *dcr, bool recycle)
    /* Set or reset Volume statistics */
    dev->VolCatInfo.VolCatJobs = 0;
    dev->VolCatInfo.VolCatFiles = 0;
-   dev->VolCatInfo.VolCatBytes = 1;
    dev->VolCatInfo.VolCatErrors = 0;
    dev->VolCatInfo.VolCatBlocks = 0;
    dev->VolCatInfo.VolCatRBytes = 0;
@@ -462,7 +477,7 @@ bool rewrite_volume_label(DCR *dcr, bool recycle)
     * End writing real Volume label (from pre-labeled tape), or recycling
     *  the volume.
     */
-   Dmsg0(200, "OK from rewite vol label.\n");
+   Dmsg0(200, "OK from rewrite vol label.\n");
    return true;
 }
 
@@ -531,7 +546,8 @@ static void create_volume_label_record(DCR *dcr, DEV_RECORD *rec)
 /*
  * Create a volume label in memory
  */
-void create_volume_label(DEVICE *dev, const char *VolName, const char *PoolName)
+void create_volume_label(DEVICE *dev, const char *VolName, 
+                         const char *PoolName, bool dvdnow)
 {
    DEVRES *device = (DEVRES *)dev->device;
 
@@ -544,7 +560,12 @@ void create_volume_label(DEVICE *dev, const char *VolName, const char *PoolName)
 
    bstrncpy(dev->VolHdr.Id, BaculaId, sizeof(dev->VolHdr.Id));
    dev->VolHdr.VerNum = BaculaTapeVersion;
-   dev->VolHdr.LabelType = PRE_LABEL;  /* Mark tape as unused */
+   if (dev->is_dvd() && dvdnow) {
+      /* We do not want to re-label a DVD so write VOL_LABEL now */
+      dev->VolHdr.LabelType = VOL_LABEL;
+   } else {
+      dev->VolHdr.LabelType = PRE_LABEL;  /* Mark tape as unused */
+   }
    bstrncpy(dev->VolHdr.VolumeName, VolName, sizeof(dev->VolHdr.VolumeName));
    bstrncpy(dev->VolHdr.PoolName, PoolName, sizeof(dev->VolHdr.PoolName));
    bstrncpy(dev->VolHdr.MediaType, device->media_type, sizeof(dev->VolHdr.MediaType));
@@ -685,15 +706,15 @@ bool write_session_label(DCR *dcr, int label)
       return false;
    }
 
-   Dmsg6(20, "Write sesson_label record JobId=%d FI=%s SessId=%d Strm=%s len=%d "
+   Dmsg6(50, "Write sesson_label record JobId=%d FI=%s SessId=%d Strm=%s len=%d "
              "remainder=%d\n", jcr->JobId,
       FI_to_ascii(buf1, rec->FileIndex), rec->VolSessionId,
       stream_to_ascii(buf2, rec->Stream, rec->FileIndex), rec->data_len,
       rec->remainder);
 
    free_record(rec);
-   Dmsg2(20, "Leave write_session_label Block=%d File=%d\n",
-      dev->block_num, dev->file);
+   Dmsg2(50, "Leave write_session_label Block=%ud File=%ud\n",
+      dev->get_block(), dev->get_file());
    return true;
 }