Refactor parts of stored/mount.c

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

diff --git a/bacula/src/stored/acquire.c b/bacula/src/stored/acquire.c
index 4ab57d2178f9bd741a4426bc68ca9cb988188d8d..51474e2a1344d5f1c8fbbd67a842b67057a987d9 100644 (file)
--- a/bacula/src/stored/acquire.c
+++ b/bacula/src/stored/acquire.c
@@ -38,7 +38,6 @@
 
 /* Forward referenced functions */
 static void attach_dcr_to_dev(DCR *dcr);
 
 /* Forward referenced functions */
 static void attach_dcr_to_dev(DCR *dcr);

-static bool is_suitable_volume_mounted(DCR *dcr);

 static bool is_tape_position_ok(JCR *jcr, DEVICE *dev);
 
 
 static bool is_tape_position_ok(JCR *jcr, DEVICE *dev);
 
 


@@ -338,7 +337,7 @@ DCR *acquire_device_for_append(DCR *dcr)
     * have_vol defines whether or not mount_next_write_volume should
     *   ask the Director again about what Volume to use.
     */
     * have_vol defines whether or not mount_next_write_volume should
     *   ask the Director again about what Volume to use.
     */

-   if (dev->can_append() && is_suitable_volume_mounted(dcr) &&
+   if (dev->can_append() && dcr->is_suitable_volume_mounted() &&

        strcmp(dcr->VolCatInfo.VolCatStatus, "Recycle") != 0) {
       Dmsg0(190, "device already in append.\n");
       /*
        strcmp(dcr->VolCatInfo.VolCatStatus, "Recycle") != 0) {
       Dmsg0(190, "device already in append.\n");
       /*


@@ -425,17 +424,6 @@ static bool is_tape_position_ok(JCR *jcr, DEVICE *dev)
    return true;
 }
 
    return true;
 }
 

-static bool is_suitable_volume_mounted(DCR *dcr)
-{
-   DEVICE *dev = dcr->dev;
-
-   /* Volume mounted? */
-   if (dev->VolHdr.VolumeName[0] == 0 || dcr->swap_dev || dcr->unload_device) {
-      return false;                      /* no */
-   }
-   bstrncpy(dcr->VolumeName, dev->VolHdr.VolumeName, sizeof(dcr->VolumeName));
-   return dir_get_volume_info(dcr, GET_VOL_INFO_FOR_WRITE);
-}

 
 /*
  * This job is done, so release the device. From a Unix standpoint,
 
 /*
  * This job is done, so release the device. From a Unix standpoint,

diff --git a/bacula/src/stored/dev.h b/bacula/src/stored/dev.h
index be8d1847472feda75397ed2a7288c01b44747125..6ff9e0d05cb35291f3c939072bbfa5c412f9215f 100644 (file)
--- a/bacula/src/stored/dev.h
+++ b/bacula/src/stored/dev.h
@@ -470,9 +470,15 @@ public:
    void dlock() { dev->dlock(); m_dev_locked = true; }
    void dunlock() { m_dev_locked = false; dev->dunlock(); }
    void dblock(int why) { dev->dblock(why); }
    void dlock() { dev->dlock(); m_dev_locked = true; }
    void dunlock() { m_dev_locked = false; dev->dunlock(); }
    void dblock(int why) { dev->dblock(why); }

+
+   /* Methods in mount.c */

    bool mount_next_write_volume();
    void mark_volume_in_error();
    bool mount_next_write_volume();
    void mark_volume_in_error();

-
+   void mark_volume_not_inchanger();
+   int try_autolabel(bool opened);
+   bool is_suitable_volume_mounted();
+   bool is_eod_valid();
+   int check_volume_label(bool &ask, bool &autochanger);

 };
 
 /*
 };
 
 /*

diff --git a/bacula/src/stored/mount.c b/bacula/src/stored/mount.c
index 79edb8affb9babf4d9d2bc2708b037c27caa730d..4b601e07dd21c36527dd96d59fb35fa654556b2d 100644 (file)
--- a/bacula/src/stored/mount.c
+++ b/bacula/src/stored/mount.c
@@ -38,9 +38,6 @@
 #include "bacula.h"                   /* pull in global headers */
 #include "stored.h"                   /* pull in Storage Deamon headers */
 
 #include "bacula.h"                   /* pull in global headers */
 #include "stored.h"                   /* pull in Storage Deamon headers */
 

-static void mark_volume_not_inchanger(DCR *dcr);
-static int try_autolabel(DCR *dcr, bool opened);
-static bool is_eod_valid(DCR *dcr);

 
 enum {
    try_next_vol = 1,
 
 enum {
    try_next_vol = 1,


@@ -49,6 +46,13 @@ enum {
    try_default
 };
 
    try_default
 };
 

+enum {
+   check_next_vol = 1,
+   check_ok,
+   check_read_vol,
+   check_error
+};
+

 /*
  * If release is set, we rewind the current volume,
  * which we no longer want, and ask the user (console)
 /*
  * If release is set, we rewind the current volume,
  * which we no longer want, and ask the user (console)


@@ -65,7 +69,6 @@ bool DCR::mount_next_write_volume()
 {
    int retry = 0;
    bool ask = false, recycle, autochanger;
 {
    int retry = 0;
    bool ask = false, recycle, autochanger;

-   int vol_label_status;

    int mode;
    DCR *dcr = this;
 
    int mode;
    DCR *dcr = this;
 


@@ -106,16 +109,29 @@ mount_next_vol:
    }
 
    /*
    }
 
    /*

-    * Get Director's idea of what tape we should have mounted.
-    *    in dcr->VolCatInfo
+    * See if we are asked to swap the Volume from another device
+    *  if so, unload the other device here, and attach the
+    *  volume to our drive.

     */
     */

-   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)) {
-         goto bail_out;
-       }
-       Dmsg0(200, "Again dir_find_next_append...\n");
+   if (swap_dev) {
+      dev->vol = swap_dev->vol;      /* take its volume */
+      swap_dev->vol = NULL;
+      unload_dev(dcr, swap_dev);
+      swap_dev = NULL;
+   }
+   if (!is_suitable_volume_mounted()) {
+      /*
+       * Get Director's idea of what tape we should have mounted.
+       *    in dcr->VolCatInfo
+       */
+      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)) {
+            goto bail_out;
+          }
+          Dmsg0(200, "Again dir_find_next_append...\n");
+      }

    }
    if (job_canceled(jcr)) {
       goto bail_out;
    }
    if (job_canceled(jcr)) {
       goto bail_out;


@@ -134,12 +150,6 @@ mount_next_vol:
     * and move the tape to the end of data.
     *
     */
     * and move the tape to the end of data.
     *
     */

-   if (swap_dev) {
-      dev->vol = swap_dev->vol;      /* take its volume */
-      swap_dev->vol = NULL;
-      unload_dev(dcr, swap_dev);
-      swap_dev = NULL;
-   }

    if (autoload_device(dcr, 1, NULL) > 0) {
       autochanger = true;
       ask = false;
    if (autoload_device(dcr, 1, NULL) > 0) {
       autochanger = true;
       ask = false;


@@ -188,7 +198,7 @@ mount_next_vol:
    }
    /* Try autolabel if enabled */
    if (dev->open(dcr, mode) < 0) {
    }
    /* Try autolabel if enabled */
    if (dev->open(dcr, mode) < 0) {

-      try_autolabel(dcr, false);      /* try to create a new volume label */
+      try_autolabel(false);      /* try to create a new volume label */

    }
    while (dev->open(dcr, mode) < 0) {
       Dmsg1(150, "open_device failed: ERR=%s\n", dev->bstrerror());
    }
    while (dev->open(dcr, mode) < 0) {
       Dmsg1(150, "open_device failed: ERR=%s\n", dev->bstrerror());


@@ -209,7 +219,7 @@ mount_next_vol:
             dev->unmount(0);
          }
       }
             dev->unmount(0);
          }
       }

-      if (try_autolabel(dcr, false) == try_read_vol) {
+      if (try_autolabel(false) == try_read_vol) {

          break;                       /* created a new volume label */
       }
       /* If DVD, ignore the error, very often you cannot open the device
          break;                       /* created a new volume label */
       }
       /* If DVD, ignore the error, very often you cannot open the device


@@ -224,9 +234,84 @@ mount_next_vol:
    }
 
    /*
    }
 
    /*

-    * Now make sure we have the right tape mounted
+    * Now check the volume label to make sure we have the right tape mounted

     */
 read_volume:
     */
 read_volume:

+
+   switch (check_volume_label(ask, autochanger)) {
+   case check_next_vol:
+      goto mount_next_vol;
+   case check_read_vol:
+      goto read_volume;
+   case check_error:
+      goto bail_out;
+   case check_ok:
+      break;
+   }
+
+   /*
+    * 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
+    *  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.
+    */
+   recycle = strcmp(dev->VolCatInfo.VolCatStatus, "Recycle") == 0;
+   if (dev->VolHdr.LabelType == PRE_LABEL || recycle) {
+      if (!rewrite_volume_label(dcr, recycle)) {
+         mark_volume_in_error();
+         goto mount_next_vol;
+      }
+   } else {
+      /*
+       * OK, at this point, we have a valid Bacula label, but
+       * we need to position to the end of the volume, since we are
+       * 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"),
+         VolumeName);
+
+      if (!dev->eod(dcr)) {
+         Jmsg(jcr, M_ERROR, 0, _("Unable to position to end of data on device %s: ERR=%s\n"),
+            dev->print_name(), dev->bstrerror());
+         mark_volume_in_error();
+         goto mount_next_vol;
+      }
+      if (!is_eod_valid()) {
+         goto mount_next_vol;
+      }
+
+      dev->VolCatInfo.VolCatMounts++;      /* Update mounts */
+      Dmsg1(150, "update volinfo mounts=%d\n", dev->VolCatInfo.VolCatMounts);
+      if (!dir_update_volume_info(dcr, false, false)) {
+         goto bail_out;
+      }
+      
+      /* Return an empty block */
+      empty_block(block);             /* we used it for reading so set for write */
+   }
+   dev->set_append();
+   Dmsg1(150, "set APPEND, normal return from mount_next_write_volume. dev=%s\n",
+      dev->print_name());
+
+   unlock_volumes();
+   return true;
+
+bail_out:
+   unlock_volumes();
+   return false;
+}
+
+int DCR::check_volume_label(bool &ask, bool &autochanger)
+{
+   int vol_label_status;

    /*
     * If we are writing to a stream device, ASSUME the volume label
     *  is correct.
    /*
     * If we are writing to a stream device, ASSUME the volume label
     *  is correct.


@@ -236,10 +321,10 @@ read_volume:
       create_volume_label(dev, VolumeName, "Default", false /* not DVD */);
       dev->VolHdr.LabelType = PRE_LABEL;
    } else {
       create_volume_label(dev, VolumeName, "Default", false /* not DVD */);
       dev->VolHdr.LabelType = PRE_LABEL;
    } else {

-      vol_label_status = read_dev_volume_label(dcr);
+      vol_label_status = read_dev_volume_label(this);

    }
    if (job_canceled(jcr)) {
    }
    if (job_canceled(jcr)) {

-      goto bail_out;
+      goto check_bail_out;

    }
 
    Dmsg2(150, "Want dirVol=%s dirStat=%s\n", VolumeName,
    }
 
    Dmsg2(150, "Want dirVol=%s dirStat=%s\n", VolumeName,


@@ -252,7 +337,6 @@ read_volume:
    case VOL_OK:
       Dmsg1(150, "Vol OK name=%s\n", VolumeName);
       dev->VolCatInfo = VolCatInfo;       /* structure assignment */
    case VOL_OK:
       Dmsg1(150, "Vol OK name=%s\n", VolumeName);
       dev->VolCatInfo = VolCatInfo;       /* structure assignment */

-      recycle = strcmp(dev->VolCatInfo.VolCatStatus, "Recycle") == 0;

       break;                    /* got a Volume */
    case VOL_NAME_ERROR:
       VOLUME_CAT_INFO dcrVolCatInfo, devVolCatInfo;
       break;                    /* got a Volume */
    case VOL_NAME_ERROR:
       VOLUME_CAT_INFO dcrVolCatInfo, devVolCatInfo;


@@ -262,8 +346,8 @@ read_volume:
       if (!dev->is_removable()) {
          Jmsg(jcr, M_WARNING, 0, _("Volume \"%s\" not on device %s.\n"),
             VolumeName, dev->print_name());
       if (!dev->is_removable()) {
          Jmsg(jcr, M_WARNING, 0, _("Volume \"%s\" not on device %s.\n"),
             VolumeName, dev->print_name());

-         dcr->mark_volume_in_error();
-         goto mount_next_vol;
+         mark_volume_in_error();
+         goto check_next_volume;

       }
 
       Dmsg1(150, "Vol NAME Error Name=%s\n", VolumeName);
       }
 
       Dmsg1(150, "Vol NAME Error Name=%s\n", VolumeName);


@@ -271,7 +355,7 @@ read_volume:
       if (dev->poll && strcmp(dev->BadVolName, dev->VolHdr.VolumeName) == 0) {
          ask = true;
          Dmsg1(200, "Vol Name error supress due to poll. Name=%s\n", VolumeName);
       if (dev->poll && strcmp(dev->BadVolName, dev->VolHdr.VolumeName) == 0) {
          ask = true;
          Dmsg1(200, "Vol Name error supress due to poll. Name=%s\n", VolumeName);

-         goto mount_next_vol;
+         goto check_next_volume;

       }
       /*
        * OK, we got a different volume mounted. First save the
       }
       /*
        * OK, we got a different volume mounted. First save the


@@ -284,19 +368,19 @@ read_volume:
       /* Check if this is a valid Volume in the pool */
       bstrncpy(VolumeName, VolumeName, sizeof(VolumeName));
       bstrncpy(VolumeName, dev->VolHdr.VolumeName, sizeof(VolumeName));
       /* Check if this is a valid Volume in the pool */
       bstrncpy(VolumeName, VolumeName, sizeof(VolumeName));
       bstrncpy(VolumeName, dev->VolHdr.VolumeName, sizeof(VolumeName));

-      if (!dir_get_volume_info(dcr, GET_VOL_INFO_FOR_WRITE)) {
+      if (!dir_get_volume_info(this, GET_VOL_INFO_FOR_WRITE)) {

          POOL_MEM vol_info_msg;
          pm_strcpy(vol_info_msg, jcr->dir_bsock->msg);  /* save error message */
          /* Restore desired volume name, note device info out of sync */
          /* This gets the info regardless of the Pool */
          bstrncpy(VolumeName, dev->VolHdr.VolumeName, sizeof(VolumeName));
          POOL_MEM vol_info_msg;
          pm_strcpy(vol_info_msg, jcr->dir_bsock->msg);  /* save error message */
          /* Restore desired volume name, note device info out of sync */
          /* This gets the info regardless of the Pool */
          bstrncpy(VolumeName, dev->VolHdr.VolumeName, sizeof(VolumeName));

-         if (autochanger && !dir_get_volume_info(dcr, GET_VOL_INFO_FOR_READ)) {
+         if (autochanger && !dir_get_volume_info(this, GET_VOL_INFO_FOR_READ)) {

             /*
              * If we get here, we know we cannot write on the Volume,
              *  and we know that we cannot read it either, so it 
              *  is not in the autochanger.
              */
             /*
              * If we get here, we know we cannot write on the Volume,
              *  and we know that we cannot read it either, so it 
              *  is not in the autochanger.
              */

-            mark_volume_not_inchanger(dcr);
+            mark_volume_not_inchanger();

          }
          dev->VolCatInfo = devVolCatInfo;    /* structure assignment */
          bstrncpy(dev->BadVolName, dev->VolHdr.VolumeName, sizeof(dev->BadVolName));
          }
          dev->VolCatInfo = devVolCatInfo;    /* structure assignment */
          bstrncpy(dev->BadVolName, dev->VolHdr.VolumeName, sizeof(dev->BadVolName));


@@ -309,7 +393,7 @@ read_volume:
          /* Restore saved DCR before continuing */
          bstrncpy(VolumeName, VolumeName, sizeof(VolumeName));
          VolCatInfo = dcrVolCatInfo;  /* structure assignment */
          /* Restore saved DCR before continuing */
          bstrncpy(VolumeName, VolumeName, sizeof(VolumeName));
          VolCatInfo = dcrVolCatInfo;  /* structure assignment */

-         goto mount_next_vol;
+         goto check_next_volume;

       }
       /*
        * This was not the volume we expected, but it is OK with
       }
       /*
        * This was not the volume we expected, but it is OK with


@@ -317,7 +401,6 @@ read_volume:
        */
       Dmsg1(150, "want new name=%s\n", VolumeName);
       dev->VolCatInfo = VolCatInfo;   /* structure assignment */
        */
       Dmsg1(150, "want new name=%s\n", VolumeName);
       dev->VolCatInfo = VolCatInfo;   /* structure assignment */

-      recycle = strcmp(dev->VolCatInfo.VolCatStatus, "Recycle") == 0;

       break;                /* got a Volume */
    /*
     * At this point, we assume we have a blank tape mounted.
       break;                /* got a Volume */
    /*
     * At this point, we assume we have a blank tape mounted.


@@ -325,18 +408,18 @@ read_volume:
    case VOL_IO_ERROR:
       if (dev->is_dvd()) {
          Jmsg(jcr, M_FATAL, 0, "%s", jcr->errmsg);
    case VOL_IO_ERROR:
       if (dev->is_dvd()) {
          Jmsg(jcr, M_FATAL, 0, "%s", jcr->errmsg);

-         dcr->mark_volume_in_error();
-         goto bail_out;       /* we could not write on DVD */
+         mark_volume_in_error();
+         goto check_bail_out;       /* we could not write on DVD */

       }
       /* Fall through wanted */
    case VOL_NO_LABEL:
       }
       /* Fall through wanted */
    case VOL_NO_LABEL:

-      switch (try_autolabel(dcr, true)) {
+      switch (try_autolabel(true)) {

       case try_next_vol:
       case try_next_vol:

-         goto mount_next_vol;
+         goto check_next_volume;

       case try_read_vol:
       case try_read_vol:

-         goto read_volume;
+         goto check_read_volume;

       case try_error:
       case try_error:

-         goto bail_out;
+         goto check_bail_out;

       case try_default:
          break;
       }
       case try_default:
          break;
       }


@@ -355,91 +438,54 @@ read_volume:
       if (dev->requires_mount()) {
          dev->close();
       }
       if (dev->requires_mount()) {
          dev->close();
       }

-      goto mount_next_vol;
+      goto check_next_volume;

    }
    }

+   return check_ok;

 
 

-   /*
-    * 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
-    *  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) {
-      if (!rewrite_volume_label(dcr, recycle)) {
-         dcr->mark_volume_in_error();
-         goto mount_next_vol;
-      }
-   } else {
-      /*
-       * OK, at this point, we have a valid Bacula label, but
-       * we need to position to the end of the volume, since we are
-       * 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"),
-         VolumeName);
+check_next_volume:
+   return check_next_vol;

 
 

-      if (!dev->eod(dcr)) {
-         Jmsg(jcr, M_ERROR, 0, _("Unable to position to end of data on device %s: ERR=%s\n"),
-            dev->print_name(), dev->bstrerror());
-         dcr->mark_volume_in_error();
-         goto mount_next_vol;
-      }
-      if (!is_eod_valid(dcr)) {
-         goto mount_next_vol;
-      }
+check_bail_out:
+   return check_error;

 
 

-      dev->VolCatInfo.VolCatMounts++;      /* Update mounts */
-      Dmsg1(150, "update volinfo mounts=%d\n", dev->VolCatInfo.VolCatMounts);
-      if (!dir_update_volume_info(dcr, false, false)) {
-         goto bail_out;
-      }
-      
-      /* Return an empty block */
-      empty_block(block);             /* we used it for reading so set for write */
-   }
-   dev->set_append();
-   Dmsg1(150, "set APPEND, normal return from mount_next_write_volume. dev=%s\n",
-      dev->print_name());
+check_read_volume:
+   return check_read_vol;

 
 

-   unlock_volumes();
-   return true;
+}

 
 

-bail_out:
-   unlock_volumes();
-   return false;
+
+bool DCR::is_suitable_volume_mounted()
+{
+
+   /* Volume mounted? */
+   if (dev->VolHdr.VolumeName[0] == 0 || swap_dev || unload_device) {
+      return false;                      /* no */
+   }
+   bstrncpy(VolumeName, dev->VolHdr.VolumeName, sizeof(VolumeName));
+   return dir_get_volume_info(this, GET_VOL_INFO_FOR_WRITE);

 }
 
 
 }
 
 

+

 /*
  * Check if the current position on the volume corresponds to
  *  what is in the catalog.
  */
 /*
  * Check if the current position on the volume corresponds to
  *  what is in the catalog.
  */

-static bool is_eod_valid(DCR *dcr)
+bool DCR::is_eod_valid()

 {
 {

-   DEVICE *dev = dcr->dev;
-   JCR *jcr = dcr->jcr;
-

    if (dev->is_dvd()) {
       char ed1[50], ed2[50];
       if (dev->VolCatInfo.VolCatBytes == dev->part_start + dev->part_size) {
          Jmsg(jcr, M_INFO, 0, _("Ready to append to end of Volume \"%s\""
    if (dev->is_dvd()) {
       char ed1[50], ed2[50];
       if (dev->VolCatInfo.VolCatBytes == dev->part_start + dev->part_size) {
          Jmsg(jcr, M_INFO, 0, _("Ready to append to end of Volume \"%s\""

-              " part=%d size=%s\n"), dcr->VolumeName, 
+              " part=%d size=%s\n"), VolumeName, 

               dev->part, edit_uint64(dev->VolCatInfo.VolCatBytes,ed1));
       } else {
          Jmsg(jcr, M_ERROR, 0, _("Bacula cannot write on DVD Volume \"%s\" because: "
               "The sizes do not match! Volume=%s Catalog=%s\n"),
               dev->part, edit_uint64(dev->VolCatInfo.VolCatBytes,ed1));
       } else {
          Jmsg(jcr, M_ERROR, 0, _("Bacula cannot write on DVD Volume \"%s\" because: "
               "The sizes do not match! Volume=%s Catalog=%s\n"),

-              dcr->VolumeName,
+              VolumeName,

               edit_uint64(dev->part_start + dev->part_size, ed1),
               edit_uint64(dev->VolCatInfo.VolCatBytes, ed2));
               edit_uint64(dev->part_start + dev->part_size, ed1),
               edit_uint64(dev->VolCatInfo.VolCatBytes, ed2));

-         dcr->mark_volume_in_error();
+         mark_volume_in_error();

          return false;
       }
    } else if (dev->is_tape()) {
          return false;
       }
    } else if (dev->is_tape()) {


@@ -449,29 +495,29 @@ static bool is_eod_valid(DCR *dcr)
        */
       if (dev->VolCatInfo.VolCatFiles == dev->get_file()) {
          Jmsg(jcr, M_INFO, 0, _("Ready to append to end of Volume \"%s\" at file=%d.\n"),
        */
       if (dev->VolCatInfo.VolCatFiles == dev->get_file()) {
          Jmsg(jcr, M_INFO, 0, _("Ready to append to end of Volume \"%s\" at file=%d.\n"),

-              dcr->VolumeName, dev->get_file());
+              VolumeName, dev->get_file());

       } else {
          Jmsg(jcr, M_ERROR, 0, _("Bacula cannot write on tape Volume \"%s\" because:\n"
               "The number of files mismatch! Volume=%u Catalog=%u\n"),
       } else {
          Jmsg(jcr, M_ERROR, 0, _("Bacula cannot write on tape Volume \"%s\" because:\n"
               "The number of files mismatch! Volume=%u Catalog=%u\n"),

-              dcr->VolumeName, dev->get_file(), dev->VolCatInfo.VolCatFiles);
-         dcr->mark_volume_in_error();
+              VolumeName, dev->get_file(), dev->VolCatInfo.VolCatFiles);
+         mark_volume_in_error();

          return false;
       }
    } else if (dev->is_file()) {
       char ed1[50], ed2[50];
       boffset_t pos;
          return false;
       }
    } else if (dev->is_file()) {
       char ed1[50], ed2[50];
       boffset_t pos;

-      pos = dev->lseek(dcr, (boffset_t)0, SEEK_END);
+      pos = dev->lseek(this, (boffset_t)0, SEEK_END);

       if (dev->VolCatInfo.VolCatBytes == (uint64_t)pos) {
          Jmsg(jcr, M_INFO, 0, _("Ready to append to end of Volume \"%s\""
       if (dev->VolCatInfo.VolCatBytes == (uint64_t)pos) {
          Jmsg(jcr, M_INFO, 0, _("Ready to append to end of Volume \"%s\""

-              " size=%s\n"), dcr->VolumeName, 
+              " size=%s\n"), VolumeName, 

               edit_uint64(dev->VolCatInfo.VolCatBytes, ed1));
       } else {
          Jmsg(jcr, M_ERROR, 0, _("Bacula cannot write on disk Volume \"%s\" because: "
               "The sizes do not match! Volume=%s Catalog=%s\n"),
               edit_uint64(dev->VolCatInfo.VolCatBytes, ed1));
       } else {
          Jmsg(jcr, M_ERROR, 0, _("Bacula cannot write on disk Volume \"%s\" because: "
               "The sizes do not match! Volume=%s Catalog=%s\n"),

-              dcr->VolumeName,
+              VolumeName,

               edit_uint64(pos, ed1),
               edit_uint64(dev->VolCatInfo.VolCatBytes, ed2));
               edit_uint64(pos, ed1),
               edit_uint64(dev->VolCatInfo.VolCatBytes, ed2));

-         dcr->mark_volume_in_error();
+         mark_volume_in_error();

          return false;
       }
    }
          return false;
       }
    }


@@ -496,9 +542,9 @@ static bool is_eod_valid(DCR *dcr)
  *   try_error           hard error (catalog update)
  *   try_default         I couldn't do anything
  */
  *   try_error           hard error (catalog update)
  *   try_default         I couldn't do anything
  */

-static int try_autolabel(DCR *dcr, bool opened)
+int DCR::try_autolabel(bool opened)

 {
 {

-   DEVICE *dev = dcr->dev;
+   DCR *dcr = this;

 
    if (dev->poll && !dev->is_tape()) {
       return try_default;       /* if polling, don't try to create new labels */
 
    if (dev->poll && !dev->is_tape()) {
       return try_default;       /* if polling, don't try to create new labels */


@@ -507,38 +553,38 @@ static int try_autolabel(DCR *dcr, bool opened)
    if (!opened && dev->is_tape()) {
       return try_default;
    }
    if (!opened && dev->is_tape()) {
       return try_default;
    }

-   if (dev->has_cap(CAP_LABEL) && (dcr->VolCatInfo.VolCatBytes == 0 ||
-         (!dev->is_tape() && strcmp(dcr->VolCatInfo.VolCatStatus,
+   if (dev->has_cap(CAP_LABEL) && (VolCatInfo.VolCatBytes == 0 ||
+         (!dev->is_tape() && strcmp(VolCatInfo.VolCatStatus,

                                 "Recycle") == 0))) {
       Dmsg0(150, "Create volume label\n");
       /* Create a new Volume label and write it to the device */
                                 "Recycle") == 0))) {
       Dmsg0(150, "Create volume label\n");
       /* Create a new Volume label and write it to the device */

-      if (!write_new_volume_label_to_dev(dcr, dcr->VolumeName,
-             dcr->pool_name, false, /* no relabel */ false /* defer DVD label */)) {
+      if (!write_new_volume_label_to_dev(dcr, VolumeName,
+             pool_name, false, /* no relabel */ false /* defer DVD label */)) {

          Dmsg0(150, "!write_vol_label\n");
          if (opened) { 
          Dmsg0(150, "!write_vol_label\n");
          if (opened) { 

-            dcr->mark_volume_in_error();
+            mark_volume_in_error();

          }
          return try_next_vol;
       }
       Dmsg0(150, "dir_update_vol_info. Set Append\n");
       /* Copy Director's info into the device info */
          }
          return try_next_vol;
       }
       Dmsg0(150, "dir_update_vol_info. Set Append\n");
       /* Copy Director's info into the device info */

-      dev->VolCatInfo = dcr->VolCatInfo;    /* structure assignment */
+      dev->VolCatInfo = VolCatInfo;    /* structure assignment */

       if (!dir_update_volume_info(dcr, true, true)) {  /* indicate tape labeled */
          return try_error;
       }
       Jmsg(dcr->jcr, M_INFO, 0, _("Labeled new Volume \"%s\" on device %s.\n"),
       if (!dir_update_volume_info(dcr, true, true)) {  /* indicate tape labeled */
          return try_error;
       }
       Jmsg(dcr->jcr, M_INFO, 0, _("Labeled new Volume \"%s\" on device %s.\n"),

-         dcr->VolumeName, dev->print_name());
+         VolumeName, dev->print_name());

       return try_read_vol;   /* read label we just wrote */
    }
       return try_read_vol;   /* read label we just wrote */
    }

-   if (!dev->has_cap(CAP_LABEL) && dcr->VolCatInfo.VolCatBytes == 0) {
-      Jmsg(dcr->jcr, M_WARNING, 0, _("Device %s not configured to autolabel Volumes.\n"), 
+   if (!dev->has_cap(CAP_LABEL) && VolCatInfo.VolCatBytes == 0) {
+      Jmsg(jcr, M_WARNING, 0, _("Device %s not configured to autolabel Volumes.\n"), 

          dev->print_name());
    }
    /* If not removable, Volume is broken */
    if (!dev->is_removable()) {
          dev->print_name());
    }
    /* If not removable, Volume is broken */
    if (!dev->is_removable()) {

-      Jmsg(dcr->jcr, M_WARNING, 0, _("Volume \"%s\" not on device %s.\n"),
-         dcr->VolumeName, dev->print_name());
-      dcr->mark_volume_in_error();
+      Jmsg(jcr, M_WARNING, 0, _("Volume \"%s\" not on device %s.\n"),
+         VolumeName, dev->print_name());
+      mark_volume_in_error();

       return try_next_vol;
    }
    return try_default;
       return try_next_vol;
    }
    return try_default;


@@ -563,18 +609,16 @@ void DCR::mark_volume_in_error()
  * The Volume is not in the correct slot, so mark this
  *   Volume as not being in the Changer.
  */
  * The Volume is not in the correct slot, so mark this
  *   Volume as not being in the Changer.
  */

-static void mark_volume_not_inchanger(DCR *dcr)
+void DCR::mark_volume_not_inchanger()

 {
 {

-   JCR *jcr = dcr->jcr;
-   DEVICE *dev = dcr->dev;

    Jmsg(jcr, M_ERROR, 0, _("Autochanger Volume \"%s\" not found in slot %d.\n"
 "    Setting InChanger to zero in catalog.\n"),
    Jmsg(jcr, M_ERROR, 0, _("Autochanger Volume \"%s\" not found in slot %d.\n"
 "    Setting InChanger to zero in catalog.\n"),

-        dcr->VolCatInfo.VolCatName, dcr->VolCatInfo.Slot);
-   dev->VolCatInfo = dcr->VolCatInfo;    /* structure assignment */
-   dcr->VolCatInfo.InChanger = false;
+        VolCatInfo.VolCatName, VolCatInfo.Slot);
+   dev->VolCatInfo = VolCatInfo;    /* structure assignment */
+   VolCatInfo.InChanger = false;

    dev->VolCatInfo.InChanger = false;
    Dmsg0(400, "update vol info in mount\n");
    dev->VolCatInfo.InChanger = false;
    Dmsg0(400, "update vol info in mount\n");

-   dir_update_volume_info(dcr, true, false);  /* set new status */
+   dir_update_volume_info(this, true, false);  /* set new status */

 }
 
 /*
 }
 
 /*

diff --git a/bacula/src/stored/protos.h b/bacula/src/stored/protos.h
index 2d0d37814f21b1feba7afa189ca05df8030e8650..490355a3375fe2e1a6a0f197e5eda5b77493f07b 100644 (file)
--- a/bacula/src/stored/protos.h
+++ b/bacula/src/stored/protos.h
@@ -1,7 +1,7 @@
 /*
    Bacula® - The Network Backup Solution
 
 /*
    Bacula® - The Network Backup Solution
 

-   Copyright (C) 2000-20087 Free Software Foundation Europe e.V.
+   Copyright (C) 2000-2008 Free Software Foundation Europe e.V.

 
    The main author of Bacula is Kern Sibbald, with contributions from
    many others, a complete list can be found in the file AUTHORS.
 
    The main author of Bacula is Kern Sibbald, with contributions from
    many others, a complete list can be found in the file AUTHORS.

diff --git a/bacula/src/stored/stored.h b/bacula/src/stored/stored.h
index d29f34cd5e11226e76b3ce65395c188c92a58d76..c6d83b4d34c93aa5aeb0f3a5f9a49934f1fb8629 100644 (file)
--- a/bacula/src/stored/stored.h
+++ b/bacula/src/stored/stored.h
@@ -1,7 +1,7 @@
 /*
    Bacula® - The Network Backup Solution
 
 /*
    Bacula® - The Network Backup Solution
 

-   Copyright (C) 2000-2006 Free Software Foundation Europe e.V.
+   Copyright (C) 2000-2008 Free Software Foundation Europe e.V.

 
    The main author of Bacula is Kern Sibbald, with contributions from
    many others, a complete list can be found in the file AUTHORS.
 
    The main author of Bacula is Kern Sibbald, with contributions from
    many others, a complete list can be found in the file AUTHORS.

diff --git a/bacula/technotes-2.3 b/bacula/technotes-2.3
index d852fc13a62775a015f797e8746a4dd3a3c135cb..c7013838324ede6b90cbea326cc9638ed0c46206 100644 (file)
--- a/bacula/technotes-2.3
+++ b/bacula/technotes-2.3
@@ -24,6 +24,8 @@ Add long term statistics job table
 
 
 General:
 
 
 General:

+10Apr08
+kes  Refactor parts of stored/mount.c

 09Apr08
 ebl  Add sanity checks for VolWriteTime and VolReadTime
 ebl  Take care of bad clock changes while computing VolWriteTime
 09Apr08
 ebl  Add sanity checks for VolWriteTime and VolReadTime
 ebl  Take care of bad clock changes while computing VolWriteTime