X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=bacula%2Fsrc%2Fstored%2Fmount.c;h=f03f9e68925e9f777c7e3be8ab284d5e71799f35;hb=85319cb5b8d9b163972aa8deb764e440824dc72a;hp=88de341080095c5692525e2ca3ec6f3f78303478;hpb=7b6c4d7955d2e4d4cb8fb70d91a53568a6f2f1f1;p=bacula%2Fbacula

diff --git a/bacula/src/stored/mount.c b/bacula/src/stored/mount.c
index 88de341080..f03f9e6892 100644
--- a/bacula/src/stored/mount.c
+++ b/bacula/src/stored/mount.c
@@ -8,7 +8,7 @@
  *   Version $Id$
  */
 /*
-   Copyright (C) 2000, 2001, 2002 Kern Sibbald and John Walker
+   Copyright (C) 2000-2004 Kern Sibbald and John Walker
 
    This program is free software; you can redistribute it and/or
    modify it under the terms of the GNU General Public License as
@@ -30,8 +30,7 @@
 #include "bacula.h"                   /* pull in global headers */
 #include "stored.h"                   /* pull in Storage Deamon headers */
 
-/* Forward referenced functions */
-static char *edit_device_codes(JCR *jcr, char *omsg, char *imsg, char *cmd);
+static bool rewrite_volume_label(DCR *dcr, DEV_BLOCK *block, bool recycle);
 
 
 /*
@@ -44,66 +43,64 @@ static char *edit_device_codes(JCR *jcr, char *omsg, char *imsg, char *cmd);
  *
  * This routine returns a 0 only if it is REALLY
  *  impossible to get the requested Volume.
+ *
  */
-int mount_next_write_volume(JCR *jcr, DEVICE *dev, DEV_BLOCK *block, int release)
+bool mount_next_write_volume(DCR *dcr, DEV_BLOCK *block, bool release)
 {
-   int recycle, ask, retry = 0, autochanger;
+   int retry = 0;
+   bool ask = false, recycle, autochanger;
+   int vol_label_status;
+   DEVICE *dev = dcr->dev;
+   JCR *jcr = dcr->jcr;
 
    Dmsg0(100, "Enter mount_next_volume()\n");
 
+   init_dev_wait_timers(dev);
+
+   /* 
+    * Attempt to mount the next volume. If something non-fatal goes
+    *  wrong, we come back here to re-try (new op messages, re-read
+    *  Volume, ...)
+    */
 mount_next_vol:
-   if (retry++ > 5) {
-      Jmsg(jcr, M_FATAL, 0, _("Too many errors trying to mount device %s.\n"), dev_name(dev));
-      return 0;
+   /* Ignore retry if this is poll request */
+   if (!dev->poll && retry++ > 4) {
+      /* Last ditch effort before giving up, force operator to respond */
+      jcr->VolCatInfo.Slot = 0;
+      if (!dir_ask_sysop_to_mount_volume(dcr)) {
+         Jmsg(jcr, M_FATAL, 0, _("Too many errors trying to mount device %s.\n"), 
+	      dev_name(dev));
+	 return false;
+      }
    }
-   if (job_cancelled(jcr)) {
-      Jmsg(jcr, M_FATAL, 0, _("Job cancelled.\n"));
-      return 0;
+   if (job_canceled(jcr)) {
+      Jmsg(jcr, M_FATAL, 0, _("Job %d canceled.\n"), jcr->JobId);
+      return false;
    }
-   recycle = ask = autochanger = 0;
+   recycle = false;
    if (release) {
       Dmsg0(100, "mount_next_volume release=1\n");
-      /* 
-       * First erase all memory of the current volume	
-       */
-      dev->block_num = dev->file = 0;
-      dev->EndBlock = dev->EndFile = 0;
-      memset(&dev->VolCatInfo, 0, sizeof(dev->VolCatInfo));
-      memset(&jcr->VolCatInfo, 0, sizeof(jcr->VolCatInfo));
-      memset(&dev->VolHdr, 0, sizeof(dev->VolHdr));
-      dev->state &= ~ST_LABEL;	      /* label not yet read */
-      jcr->VolumeName[0] = 0;
-
-      if (!dev_is_tape(dev) || !(dev->capabilities & CAP_ALWAYSOPEN)) {
-	 if (dev->capabilities & CAP_OFFLINEUNMOUNT) {
-	    offline_dev(dev);
-	 }
-	 close_dev(dev);
-      }
-
-      /* If we have not closed the device, then at least rewind the tape */
-      if (dev->state & ST_OPENED) {
-	 if (dev->capabilities & CAP_OFFLINEUNMOUNT) {
-	    offline_dev(dev);
-	 }
-	 if (!rewind_dev(dev)) {
-            Jmsg2(jcr, M_WARNING, 0, _("Rewind error on device %s. ERR=%s\n"), 
-		  dev_name(dev), strerror_dev(dev));
-	 }
-      }
-      ask = 1;			      /* ask operator to mount tape */
+      release_volume(jcr, dev);
+      ask = true;		      /* ask operator to mount tape */
    }
 
    /* 
     * Get Director's idea of what tape we should have mounted. 
+    *	 in jcr->VolCatInfo
     */
-   if (!dir_find_next_appendable_volume(jcr)) {
-      ask = 1;			   /* we must ask */
-      Dmsg0(100, "did not find next volume. Must ask.\n");
+   Dmsg0(200, "Before dir_find_next_appendable_volume.\n");
+   while (!dir_find_next_appendable_volume(dcr)) {
+       Dmsg0(200, "not dir_find_next\n");
+       if (!dir_ask_sysop_to_create_appendable_volume(dcr)) {
+	 return false;
+       }
+       Dmsg0(200, "Again dir_find_next_append...\n");
+   }
+   if (job_canceled(jcr)) {
+      return false;
    }
    Dmsg2(100, "After find_next_append. Vol=%s Slot=%d\n",
-      jcr->VolCatInfo.VolCatName, jcr->VolCatInfo.Slot);
-   release = 1;                       /* release if we "recurse" */
+	 jcr->VolCatInfo.VolCatName, jcr->VolCatInfo.Slot);
 
    /* 
     * Get next volume and ready it for append
@@ -118,175 +115,200 @@ mount_next_vol:
     * It assumes that the device is not already in use!
     *
     */
-
-   Dmsg0(100, "Enter ready_dev_for_append\n");
-
    dev->state &= ~(ST_APPEND|ST_READ|ST_EOT|ST_WEOT|ST_EOF);
 
-   jcr->VolFirstFile = jcr->JobFiles; /* first update of Vol FileIndex */
-   for ( ;; ) {
-      autochanger = autoload_device(jcr, dev, 1, NULL);
-      if (autochanger) {
-	 ask = 0;		      /* if autochange no need to ask sysop */
-      }
+   if (autoload_device(dcr, 1, NULL) > 0) {
+      autochanger = true;
+      ask = false;
+   } else {
+      autochanger = false;
+      jcr->VolCatInfo.Slot = 0;
+   }
+   Dmsg1(100, "autoload_dev returns %d\n", autochanger);
+   /*
+    * If we autochanged to correct Volume or (we have not just
+    *	released the Volume AND we can automount) we go ahead 
+    *	and read the label. If there is no tape in the drive,
+    *	we will err, recurse and ask the operator the next time.
+    */
+   if (!release && dev_is_tape(dev) && dev_cap(dev, CAP_AUTOMOUNT)) {
+      ask = false;                 /* don't ask SYSOP this time */
+   }
+   /* Don't ask if not removable */
+   if (!dev_cap(dev, CAP_REM)) {
+      ask = false;
+   }
+   Dmsg2(100, "Ask=%d autochanger=%d\n", ask, autochanger);
+   release = true;                /* release next time if we "recurse" */
 
-      if (ask && !dir_ask_sysop_to_mount_next_volume(jcr, dev)) {
-         Dmsg0(100, "Error return ask_sysop ...\n");
-	 return 0;		/* error return */
-      }
-      Dmsg1(100, "want vol=%s\n", jcr->VolumeName);
+   if (ask && !dir_ask_sysop_to_mount_volume(dcr)) {
+      Dmsg0(100, "Error return ask_sysop ...\n");
+      return false;	     /* error return */
+   }
+   if (job_canceled(jcr)) {
+      return false;
+   }
+   Dmsg1(100, "want vol=%s\n", jcr->VolumeName);
 
-      /* Open device */
-      for ( ; !(dev->state & ST_OPENED); ) {
-	  if (open_dev(dev, jcr->VolCatInfo.VolCatName, READ_WRITE) < 0) {
-	     if (dev->dev_errno == EAGAIN || dev->dev_errno == EBUSY) {
-		sleep(30);
-	     }
-             Jmsg2(jcr, M_FATAL, 0, _("Unable to open device %s. ERR=%s\n"), 
-		dev_name(dev), strerror_dev(dev));
-	     return 0;
-	  }
+   if (dev->poll && dev_cap(dev, CAP_CLOSEONPOLL)) {
+      force_close_dev(dev);
+   }
+
+   /* Ensure the device is open */
+   if (!open_device(jcr, dev)) {
+      if (dev->poll) {
+	 goto mount_next_vol;
+      } else {
+	 return false;
       }
+   }
 
-      /*
-       * Now make sure we have the right tape mounted
-       */
+   /*
+    * Now make sure we have the right tape mounted
+    */
 read_volume:
-      switch (read_dev_volume_label(jcr, dev, block)) {
-	 case VOL_OK:
-            Dmsg1(100, "Vol OK name=%s\n", jcr->VolumeName);
-	    memcpy(&dev->VolCatInfo, &jcr->VolCatInfo, sizeof(jcr->VolCatInfo));
-            if (strcmp(dev->VolCatInfo.VolCatStatus, "Recycle") == 0) {
-	       recycle = 1;
-	    }
-	    break;		      /* got it */
-	 case VOL_NAME_ERROR:
-            Dmsg1(100, "Vol NAME Error Name=%s\n", jcr->VolumeName);
-	    /* 
-	     * OK, we got a different volume mounted. First save the
-	     *	requested Volume info in the dev structure, then query if
-	     *	this volume is really OK. If not, put back the desired
-	     *	volume name and continue.
-	     */
-	    memcpy(&dev->VolCatInfo, &jcr->VolCatInfo, sizeof(jcr->VolCatInfo));
-	    /* Check if this is a valid Volume in the pool */
-	    strcpy(jcr->VolumeName, dev->VolHdr.VolName);
-	    if (!dir_get_volume_info(jcr, 1)) {
-               Mmsg(&jcr->errmsg, _("Wanted Volume \"%s\".\n\
-    Actual Volume \"%s\" not acceptable.\n"),
-		  dev->VolCatInfo.VolCatName, dev->VolHdr.VolName);
-	       /* Restore desired volume name, note device info out of sync */
-	       memcpy(&jcr->VolCatInfo, &dev->VolCatInfo, sizeof(jcr->VolCatInfo));
-	       goto mount_error;
-	    }
-            Dmsg1(100, "want new name=%s\n", jcr->VolumeName);
-	    memcpy(&dev->VolCatInfo, &jcr->VolCatInfo, sizeof(jcr->VolCatInfo));
-	    break;
+   /* 
+    * If we are writing to a stream device, ASSUME the volume label
+    *  is correct.
+    */
+   if (dev_cap(dev, CAP_STREAM)) {
+      vol_label_status = VOL_OK;
+      create_volume_label(dev, jcr->VolumeName, "Default");
+      dev->VolHdr.LabelType = PRE_LABEL;
+   } else {
+      vol_label_status = read_dev_volume_label(jcr->dcr, block);
+   }
+   if (job_canceled(jcr)) {
+      return false;
+   }
 
-	 case VOL_NO_LABEL:
-	 case VOL_IO_ERROR:
-            Dmsg1(500, "Vol NO_LABEL or IO_ERROR name=%s\n", jcr->VolumeName);
-	    /* If permitted, create a label */
-	    if (dev->capabilities & CAP_LABEL) {
-               Dmsg0(100, "Create volume label\n");
-	       if (!write_volume_label_to_dev(jcr, (DEVRES *)dev->device, jcr->VolumeName,
-		      jcr->pool_name)) {
-                  Dmsg0(100, "!write_vol_label\n");
-		  goto mount_next_vol;
-	       }
-               Jmsg(jcr, M_INFO, 0, _("Created Volume label %s on device %s.\n"),
-		  jcr->VolumeName, dev_name(dev));
-	       goto read_volume;      /* read label we just wrote */
-	    } 
-	    /* NOTE! Fall-through wanted. */
-	 default:
-mount_error:
-	    /* Send error message */
-            Jmsg1(jcr, M_WARNING, 0, "%s", jcr->errmsg);                         
-	    if (autochanger) {
-               Jmsg(jcr, M_ERROR, 0, _("Autochanger Volume \"%s\" not found in slot %d.\n\
-    Setting slot to zero in catalog.\n"),
-		  jcr->VolCatInfo.VolCatName, jcr->VolCatInfo.Slot);
-	       jcr->VolCatInfo.Slot = 0; /* invalidate slot */
-	       dir_update_volume_info(jcr, &jcr->VolCatInfo, 1);  /* set slot */
-	    }
-            Dmsg0(100, "Default\n");
+   Dmsg2(100, "dirVol=%s dirStat=%s\n", jcr->VolumeName,
+      jcr->VolCatInfo.VolCatStatus);
+   /*
+    * At this point, dev->VolCatInfo has what is in the drive, if anything,
+    *	       and   jcr->VolCatInfo has what the Director wants.
+    */
+   switch (vol_label_status) {
+   case VOL_OK:
+      Dmsg1(100, "Vol OK name=%s\n", jcr->VolumeName);
+      memcpy(&dev->VolCatInfo, &jcr->VolCatInfo, sizeof(jcr->VolCatInfo));
+      recycle = strcmp(dev->VolCatInfo.VolCatStatus, "Recycle") == 0;
+      break;			/* got a Volume */
+   case VOL_NAME_ERROR:
+      VOLUME_CAT_INFO VolCatInfo;
+
+      /* If not removable, Volume is broken */
+      if (!dev_cap(dev, CAP_REM)) {
+         Jmsg(jcr, M_WARNING, 0, _("Volume \"%s\" not on device %s.\n"),
+	    jcr->VolumeName, dev_name(dev));
+	 mark_volume_in_error(jcr, dev);
+	 goto mount_next_vol;
+      }
+	 
+      Dmsg1(100, "Vol NAME Error Name=%s\n", jcr->VolumeName);
+      /* If polling and got a previous bad name, ignore it */
+      if (dev->poll && strcmp(dev->BadVolName, dev->VolHdr.VolName) == 0) {
+	 ask = true;
+         Dmsg1(200, "Vol Name error supress due to poll. Name=%s\n", 
+	    jcr->VolumeName);
+	 goto mount_next_vol;
+      }
+      /* 
+       * OK, we got a different volume mounted. First save the
+       *  requested Volume info (jcr) structure, then query if
+       *  this volume is really OK. If not, put back the desired
+       *  volume name and continue.
+       */
+      memcpy(&VolCatInfo, &jcr->VolCatInfo, sizeof(VolCatInfo));
+      /* Check if this is a valid Volume in the pool */
+      pm_strcpy(&jcr->VolumeName, dev->VolHdr.VolName); 			
+      if (!dir_get_volume_info(dcr, GET_VOL_INFO_FOR_WRITE)) {
+	 bstrncpy(dev->BadVolName, dev->VolHdr.VolName, sizeof(dev->BadVolName));
+         Jmsg(jcr, M_WARNING, 0, _("Director wanted Volume \"%s\".\n"
+              "    Current Volume \"%s\" not acceptable because:\n"
+              "    %s"),
+	     VolCatInfo.VolCatName, dev->VolHdr.VolName,
+	     jcr->dir_bsock->msg);
+	 /* Restore desired volume name, note device info out of sync */
+	 memcpy(&jcr->VolCatInfo, &VolCatInfo, sizeof(jcr->VolCatInfo));
+	 ask = true;
+	 goto mount_next_vol;
+      }
+      Dmsg1(100, "want new name=%s\n", jcr->VolumeName);
+      memcpy(&dev->VolCatInfo, &jcr->VolCatInfo, sizeof(dev->VolCatInfo));
+      recycle = strcmp(dev->VolCatInfo.VolCatStatus, "Recycle") == 0;
+      break;		    /* got a Volume */
+   /*
+    * At this point, we assume we have a blank tape mounted.
+    */
+   case VOL_NO_LABEL:
+   case VOL_IO_ERROR:
+      /* 
+       * If permitted, we label the device, make sure we can do
+       *   it by checking that the VolCatBytes is zero => not labeled, 
+       *   once the Volume is labeled we don't want to label another
+       *   blank tape with the same name.  For disk, we go ahead and
+       *   label it anyway, because the OS insures that there is only
+       *   one Volume with that name.
+       * As noted above, at this point jcr->VolCatInfo has what
+       *   the Director wants and dev->VolCatInfo has info on the
+       *   previous tape (or nothing).
+       */
+      if (dev_cap(dev, CAP_LABEL) && (jcr->VolCatInfo.VolCatBytes == 0 ||
+	    (!dev_is_tape(dev) && strcmp(jcr->VolCatInfo.VolCatStatus, 
+                                   "Recycle") == 0))) {
+         Dmsg0(100, "Create volume label\n");
+	 /* Create a new Volume label and write it to the device */
+	 if (!write_new_volume_label_to_dev(jcr->dcr, jcr->VolumeName,
+		jcr->pool_name)) {
+            Dmsg0(100, "!write_vol_label\n");
 	    goto mount_next_vol;
+	 }
+         Dmsg0(100, "dir_update_vol_info. Set Append\n");
+         /* Copy Director's info into the device info */
+	 memcpy(&dev->VolCatInfo, &jcr->VolCatInfo, sizeof(dev->VolCatInfo));
+	 dir_update_volume_info(dcr, true);  /* indicate tape labeled */
+         Jmsg(jcr, M_INFO, 0, _("Labeled new Volume \"%s\" on device %s.\n"),
+	    jcr->VolumeName, dev_name(dev));
+	 goto read_volume;	/* read label we just wrote */
+      } 
+      /* If not removable, Volume is broken */
+      if (!dev_cap(dev, CAP_REM)) {
+         Jmsg(jcr, M_WARNING, 0, _("Volume \"%s\" not on device %s.\n"),
+	    jcr->VolumeName, dev_name(dev));
+	 mark_volume_in_error(jcr, dev);
+	 goto mount_next_vol;
+      }
+      /* NOTE! Fall-through wanted. */
+   case VOL_NO_MEDIA:
+   default:
+      /* Send error message */
+      if (!dev->poll) {
+         Jmsg(jcr, M_WARNING, 0, "%s", jcr->errmsg);                         
+      } else {
+         Dmsg1(200, "Msg suppressed by poll: %s\n", jcr->errmsg);
       }
-      break;
+      ask = true;
+      goto mount_next_vol;
    }
 
    /* 
-    * See if we have a fresh tape or tape with data.
+    * See if we have a fresh tape or a tape with data.
     *
     * Note, if the LabelType is PRE_LABEL, it was labeled
     *  but never written. If so, rewrite the label but set as
     *  VOL_LABEL.  We rewind and return the label (reconstructed)
     *  in the block so that in the case of a new tape, data can
     *  be appended just after the block label.	If we are writing
-    *  an second volume, the calling routine will write the label
+    *  a second volume, the calling routine will write the label
     *  before writing the overflow block.
     *
     *  If the tape is marked as Recycle, we rewrite the label.
     */
    if (dev->VolHdr.LabelType == PRE_LABEL || recycle) {
-      Dmsg1(190, "ready_for_append found freshly labeled volume. dev=%x\n", dev);
-      dev->VolHdr.LabelType = VOL_LABEL; /* set Volume label */
-      write_volume_label_to_block(jcr, dev, block);
-      /*
-       * Write the block now to ensure we have write permission.
-       *  It is better to find out now rather than later.
-       */
-      dev->VolCatInfo.VolCatBytes = 0;
-      if (!rewind_dev(dev)) {
-         Jmsg2(jcr, M_WARNING, 0, _("Rewind error on device %s. ERR=%s\n"), 
-	       dev_name(dev), strerror_dev(dev));
-      }
-      if (recycle) {
-	 if (!truncate_dev(dev)) {
-            Jmsg2(jcr, M_WARNING, 0, _("Truncate error on device %s. ERR=%s\n"), 
-		  dev_name(dev), strerror_dev(dev));
-	 }
-      }
-      /* Attempt write to check write permission */
-      if (!write_block_to_dev(jcr, dev, block)) {
-         Jmsg2(jcr, M_ERROR, 0, _("Unable to write device %s. ERR=%s\n"),
-	    dev_name(dev), strerror_dev(dev));
+      if (!rewrite_volume_label(jcr->dcr, block, recycle)) {
 	 goto mount_next_vol;
       }
-      if (!rewind_dev(dev)) {
-         Jmsg2(jcr, M_ERROR, 0, _("Unable to rewind device %s. ERR=%s\n"),
-	    dev_name(dev), strerror_dev(dev));
-	 goto mount_next_vol;
-      }
-
-      /* Recreate a correct volume label and return it in the block */
-      write_volume_label_to_block(jcr, dev, block);
-      /* Set or reset Volume statistics */
-      dev->VolCatInfo.VolCatJobs = 1;
-      dev->VolCatInfo.VolCatFiles = 1;
-      dev->VolCatInfo.VolCatErrors = 0;
-      dev->VolCatInfo.VolCatBlocks = 1;
-      if (recycle) {
-	 dev->VolCatInfo.VolCatMounts++;  
-	 dev->VolCatInfo.VolCatRecycles++;
-      } else {
-	 dev->VolCatInfo.VolCatMounts = 1;
-	 dev->VolCatInfo.VolCatRecycles = 0;
-	 dev->VolCatInfo.VolCatWrites = 1;
-	 dev->VolCatInfo.VolCatReads = 1;
-      }
-      strcpy(dev->VolCatInfo.VolCatStatus, "Append");
-      Dmsg0(100, "dir_update_vol_info. Set Append\n");
-      dir_update_volume_info(jcr, &dev->VolCatInfo, 1);  /* indicate doing relabel */
-      if (recycle) {
-         Jmsg(jcr, M_INFO, 0, _("Recycled volume %s on device %s, all previous data lost.\n"),
-	    jcr->VolumeName, dev_name(dev));
-      } else {
-         Jmsg(jcr, M_INFO, 0, _("Wrote label to prelabeled Volume %s on device %s\n"),
-	    jcr->VolumeName, dev_name(dev));
-      }
-
    } else {
       /*
        * OK, at this point, we have a valid Bacula label, but
@@ -294,16 +316,12 @@ mount_error:
        * just now putting it into append mode.
        */
       Dmsg0(200, "Device previously written, moving to end of data\n");
-      Jmsg(jcr, M_INFO, 0, _("Volume %s previously written, moving to end of data.\n"),
+      Jmsg(jcr, M_INFO, 0, _("Volume \"%s\" previously written, moving to end of data.\n"),
 	 jcr->VolumeName);
       if (!eod_dev(dev)) {
-         Jmsg(jcr, M_ERROR, 0, _("Unable to position to end of data %s. ERR=%s\n"),
+         Jmsg(jcr, M_ERROR, 0, _("Unable to position to end of data on device \"%s\". ERR=%s\n"),
 	    dev_name(dev), strerror_dev(dev));
-         Jmsg(jcr, M_INFO, 0, _("Marking Volume %s in Error in Catalog.\n"),
-	    jcr->VolumeName);
-         strcpy(dev->VolCatInfo.VolCatStatus, "Error");
-         Dmsg0(100, "dir_update_vol_info. Set Error.\n");
-	 dir_update_volume_info(jcr, &dev->VolCatInfo, 0);
+	 mark_volume_in_error(jcr, dev);
 	 goto mount_next_vol;
       }
       /* *****FIXME**** we should do some checking for files too */
@@ -312,31 +330,117 @@ mount_error:
 	  * Check if we are positioned on the tape at the same place
 	  * that the database says we should be.
 	  */
-	 if (dev->VolCatInfo.VolCatFiles == dev_file(dev) + 1) {
-            Jmsg(jcr, M_INFO, 0, _("Ready to append to end of Volume at file=%d.\n"), 
-		 dev_file(dev));
+	 if (dev->VolCatInfo.VolCatFiles == dev_file(dev)) {
+            Jmsg(jcr, M_INFO, 0, _("Ready to append to end of Volume \"%s\" at file=%d.\n"), 
+		 jcr->VolumeName, dev_file(dev));
 	 } else {
-            Jmsg(jcr, M_ERROR, 0, _("I canot write on this volume because:\n\
-The number of files mismatch! Volume=%d Catalog=%d\n"), 
-		 dev_file(dev)+1, dev->VolCatInfo.VolCatFiles);
-            strcpy(dev->VolCatInfo.VolCatStatus, "Error");
-            Dmsg0(100, "dir_update_vol_info. Set Error.\n");
-	    dir_update_volume_info(jcr, &dev->VolCatInfo, 0);
+            Jmsg(jcr, M_ERROR, 0, _("I canot write on Volume \"%s\" because:\n\
+The number of files mismatch! Volume=%u Catalog=%u\n"), 
+		 jcr->VolumeName, dev_file(dev), dev->VolCatInfo.VolCatFiles);
+	    mark_volume_in_error(jcr, dev);
 	    goto mount_next_vol;
 	 }
       }
       dev->VolCatInfo.VolCatMounts++;	   /* Update mounts */
-      dir_update_volume_info(jcr, &dev->VolCatInfo, 0);
+      Dmsg1(100, "update volinfo mounts=%d\n", dev->VolCatInfo.VolCatMounts);
+      dir_update_volume_info(dcr, false);
       /* Return an empty block */
       empty_block(block);	      /* we used it for reading so set for write */
    }
    dev->state |= ST_APPEND;
    Dmsg0(100, "Normal return from read_dev_for_append\n");
-   return 1; 
+   return true;
+}
+
+/*
+ * Write a volume label. 
+ *  Returns: true if OK
+ *	     false if unable to write it
+ */
+static bool rewrite_volume_label(DCR *dcr, DEV_BLOCK *block, bool recycle)
+{
+   DEVICE *dev = dcr->dev;
+   JCR *jcr = dcr->jcr;
+
+   Dmsg1(190, "ready_for_append found freshly labeled volume. dev=%x\n", dev);
+   dev->VolHdr.LabelType = VOL_LABEL; /* set Volume label */
+   if (!write_volume_label_to_block(dcr, block)) {
+      return false;
+   }
+   /*
+    * If we are not dealing with a streaming device,
+    *  write the block now to ensure we have write permission.
+    *  It is better to find out now rather than later.
+    */
+   if (!dev_cap(dev, CAP_STREAM)) {
+      if (!rewind_dev(dev)) {
+         Jmsg2(jcr, M_WARNING, 0, _("Rewind error on device \"%s\". ERR=%s\n"), 
+	       dev_name(dev), strerror_dev(dev));
+      }
+      if (recycle) {
+	 if (!truncate_dev(dev)) {
+            Jmsg2(jcr, M_WARNING, 0, _("Truncate error on device \"%s\". ERR=%s\n"), 
+		  dev_name(dev), strerror_dev(dev));
+	 }
+      }
+      /* Attempt write to check write permission */
+      if (!write_block_to_dev(dcr, block)) {
+         Jmsg2(jcr, M_ERROR, 0, _("Unable to write device \"%s\". ERR=%s\n"),
+	    dev_name(dev), strerror_dev(dev));
+	 return false;
+      }
+   }
+   /* 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;
+   if (recycle) {
+      dev->VolCatInfo.VolCatMounts++;  
+      dev->VolCatInfo.VolCatRecycles++;
+   } else {
+      dev->VolCatInfo.VolCatMounts = 1;
+      dev->VolCatInfo.VolCatRecycles = 0;
+      dev->VolCatInfo.VolCatWrites = 1;
+      dev->VolCatInfo.VolCatReads = 1;
+   }
+   Dmsg0(100, "dir_update_vol_info. Set Append\n");
+   bstrncpy(dev->VolCatInfo.VolCatStatus, "Append", sizeof(dev->VolCatInfo.VolCatStatus));
+   dir_update_volume_info(dcr, true);  /* indicate doing relabel */
+   if (recycle) {
+      Jmsg(jcr, M_INFO, 0, _("Recycled volume \"%s\" on device \"%s\", all previous data lost.\n"),
+	 jcr->VolumeName, dev_name(dev));
+   } else {
+      Jmsg(jcr, M_INFO, 0, _("Wrote label to prelabeled Volume \"%s\" on device \"%s\"\n"),
+	 jcr->VolumeName, dev_name(dev));
+   }
+   /*
+    * End writing real Volume label (from pre-labeled tape), or recycling
+    *  the volume.
+    */
+    return true;
 }
 
 
-int mount_next_read_volume(JCR *jcr, DEVICE *dev, DEV_BLOCK *block)
+/*
+ * Mark volume in error in catalog 
+ */
+void mark_volume_in_error(JCR *jcr, DEVICE *dev)
+{
+   Jmsg(jcr, M_INFO, 0, _("Marking Volume \"%s\" in Error in Catalog.\n"),
+	jcr->VolumeName);
+   bstrncpy(dev->VolCatInfo.VolCatStatus, "Error", sizeof(dev->VolCatInfo.VolCatStatus));
+   Dmsg0(100, "dir_update_vol_info. Set Error.\n");
+   dir_update_volume_info(jcr->dcr, false);
+}
+
+/* 
+ * If we are reading, we come here at the end of the tape
+ *  and see if there are more volumes to be mounted.
+ */
+bool mount_next_read_volume(JCR *jcr, DEVICE *dev, DEV_BLOCK *block)
 {
    Dmsg2(90, "NumVolumes=%d CurVolume=%d\n", jcr->NumVolumes, jcr->CurVolume);
    /*
@@ -345,189 +449,46 @@ int mount_next_read_volume(JCR *jcr, DEVICE *dev, DEV_BLOCK *block)
    if (jcr->NumVolumes > 1 && jcr->CurVolume < jcr->NumVolumes) {
       close_dev(dev);
       dev->state &= ~ST_READ; 
-      if (!acquire_device_for_read(jcr, dev, block)) {
-         Emsg2(M_FATAL, 0, "Cannot open Dev=%s, Vol=%s\n", dev_name(dev),
+      if (!acquire_device_for_read(jcr)) {
+         Jmsg2(jcr, M_FATAL, 0, "Cannot open Dev=%s, Vol=%s\n", dev_name(dev),
 	       jcr->VolumeName);
-	 return 0;
+	 return false;
       }
-      return 1; 		      /* next volume mounted */
+      return true;		      /* next volume mounted */
    }
    Dmsg0(90, "End of Device reached.\n");
-   return 0;
+   return false;
 }
 
 /*
- * Called here to do an autoload using the autochanger, if
- *  configured, and if a Slot has been defined for this Volume.
- *  On success this routine loads the indicated tape, but the
- *  label is not read, so it must be verified.
- *
- *  Note if dir is not NULL, it is the console requesting the 
- *   autoload for labeling, so we respond directly to the
- *   dir bsock.
- *
- *  Returns: 1 on success
- *	     0 on failure
+ * Either because we are going to hang a new volume, or because
+ *  of explicit user request, we release the current volume.
  */
-int autoload_device(JCR *jcr, DEVICE *dev, int writing, BSOCK *dir)
+void release_volume(JCR *jcr, DEVICE *dev)
 {
-   int slot = jcr->VolCatInfo.Slot;
-   int rtn_stat = 0;
-     
-   /*
-    * Handle autoloaders here.	If we cannot autoload it, we
-    *  will return FALSE to ask the sysop.
-    */
-   if (writing && dev->capabilities && CAP_AUTOCHANGER && slot <= 0) {
-      if (dir) {
-	 return 0;		      /* For user, bail out right now */
-      }
-      if (dir_find_next_appendable_volume(jcr)) {
-	 slot = jcr->VolCatInfo.Slot; 
-      }
+   if (jcr->dcr->WroteVol) {
+      Jmsg0(jcr, M_ERROR, 0, "Hey!!!!! WroteVol non-zero !!!!!\n");
    }
-   Dmsg1(100, "Want changer slot=%d\n", slot);
-
-   if (slot > 0 && jcr->device->changer_name && jcr->device->changer_command) {
-      uint32_t timeout = jcr->device->max_changer_wait;
-      POOLMEM *changer, *results;
-      int status, loaded;
-
-      results = get_pool_memory(PM_MESSAGE);
-      changer = get_pool_memory(PM_FNAME);
-
-      /* Find out what is loaded, zero means device is unloaded */
-      changer = edit_device_codes(jcr, changer, jcr->device->changer_command, 
-                   "loaded");
-      status = run_program(changer, timeout, results);
-      if (status == 0) {
-	 loaded = atoi(results);
-      } else {
-	 loaded = -1;		   /* force unload */
-      }
-      Dmsg1(100, "loaded=%s\n", results);
-
-      /* If bad status or tape we want is not loaded, load it. */
-      if (status != 0 || loaded != slot) { 
-	 if (dev->capabilities & CAP_OFFLINEUNMOUNT) {
-	    offline_dev(dev);
-	 }
-	 /* We are going to load a new tape, so close the device */
-	 force_close_dev(dev);
-	 if (loaded != 0) {	   /* must unload drive */
-            Dmsg0(100, "Doing changer unload.\n");
-	    if (dir) {
-               bnet_fsend(dir, _("3902 Issuing autochanger \"unload\" command.\n"));
-	    } else {
-               Jmsg(jcr, M_INFO, 0, _("Issuing autochanger \"unload\" command.\n"));
-	    }
-	    changer = edit_device_codes(jcr, changer, 
-                        jcr->device->changer_command, "unload");
-	    status = run_program(changer, timeout, NULL);
-            Dmsg1(100, "unload status=%d\n", status);
-	 }
-	 /*
-	  * Load the desired cassette	 
-	  */
-         Dmsg1(100, "Doing changer load slot %d\n", slot);
-	 if (dir) {
-            bnet_fsend(dir, _("3903 Issuing autochanger \"load slot %d\" command.\n"),
-	       slot);
-	 } else {
-            Jmsg(jcr, M_INFO, 0, _("Issuing autochanger \"load slot %d\" command.\n"),
-	       slot);
-	 }
-	 changer = edit_device_codes(jcr, changer, 
-                      jcr->device->changer_command, "load");
-	 status = run_program(changer, timeout, NULL);
-         Dmsg2(100, "load slot %d status=%d\n", slot, status);
-      }
-      free_pool_memory(changer);
-      free_pool_memory(results);
-      Dmsg1(100, "After changer, status=%d\n", status);
-      if (status == 0) {	   /* did we succeed? */
-	 rtn_stat = 1;		   /* tape loaded by changer */
-      }
+   /* 
+    * First erase all memory of the current volume   
+    */
+   dev->block_num = dev->file = 0;
+   dev->EndBlock = dev->EndFile = 0;
+   memset(&dev->VolCatInfo, 0, sizeof(dev->VolCatInfo));
+   memset(&jcr->VolCatInfo, 0, sizeof(jcr->VolCatInfo));
+   memset(&dev->VolHdr, 0, sizeof(dev->VolHdr));
+   /* Force re-read of label */
+   dev->state &= ~(ST_LABEL|ST_READ|ST_APPEND);
+   jcr->VolumeName[0] = 0;
+
+   if ((dev->state & ST_OPENED) && 
+       (!dev_is_tape(dev) || !dev_cap(dev, CAP_ALWAYSOPEN))) {
+      offline_or_rewind_dev(dev);
+      close_dev(dev);
    }
-   return rtn_stat;
-}
-
-
-
-/*
- * Edit codes into ChangerCommand
- *  %% = %
- *  %a = archive device name
- *  %c = changer device name
- *  %f = Client's name
- *  %j = Job name
- *  %o = command
- *  %s = Slot base 0
- *  %S = Slot base 1
- *  %v = Volume name
- *
- *
- *  omsg = edited output message
- *  imsg = input string containing edit codes (%x)
- *  cmd = command string (load, unload, ...) 
- *
- */
-static char *edit_device_codes(JCR *jcr, char *omsg, char *imsg, char *cmd) 
-{
-   char *p;
-   const char *str;
-   char add[20];
-
-   *omsg = 0;
-   Dmsg1(200, "edit_device_codes: %s\n", imsg);
-   for (p=imsg; *p; p++) {
-      if (*p == '%') {
-	 switch (*++p) {
-         case '%':
-            str = "%";
-	    break;
-         case 'a':
-	    str = jcr->device->dev->dev_name;
-	    break;
-         case 'c':
-	    str = NPRT(jcr->device->changer_name);
-	    break;
-         case 'o':
-	    str = NPRT(cmd);
-	    break;
-         case 's':
-            sprintf(add, "%d", jcr->VolCatInfo.Slot - 1);
-	    str = add;
-	    break;
-         case 'S':
-            sprintf(add, "%d", jcr->VolCatInfo.Slot);
-	    str = add;
-	    break;
-         case 'j':                    /* Job name */
-	    str = jcr->Job;
-	    break;
-         case 'v':
-	    str = NPRT(jcr->VolumeName);
-	    break;
-         case 'f':
-	    str = NPRT(jcr->client_name);
-	    break;
 
-	 default:
-            add[0] = '%';
-	    add[1] = *p;
-	    add[2] = 0;
-	    str = add;
-	    break;
-	 }
-      } else {
-	 add[0] = *p;
-	 add[1] = 0;
-	 str = add;
-      }
-      Dmsg1(200, "add_str %s\n", str);
-      pm_strcat(&omsg, (char *)str);
-      Dmsg1(200, "omsg=%s\n", omsg);
+   /* If we have not closed the device, then at least rewind the tape */
+   if (dev->state & ST_OPENED) {
+      offline_or_rewind_dev(dev);
    }
-   return omsg;
 }