- Lock autochanger script when running.

- Mark Volume not InChanger if correct volume is not
  autoloaded.

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

diff --git a/bacula/src/stored/autochanger.c b/bacula/src/stored/autochanger.c
index b9d4779e9d1f04c7de149396ab16c4c58d0abaed..194d0c7de9d46a49e93020f77cac7321f2a0ff60 100644 (file)
--- a/bacula/src/stored/autochanger.c
+++ b/bacula/src/stored/autochanger.c
@@ -7,7 +7,7 @@
  *   Version $Id$
  */
 /*
-   Copyright (C) 2000-2004 Kern Sibbald and John Walker
+   Copyright (C) 2000-2005 Kern Sibbald
 
    This program is free software; you can redistribute it and/or
    modify it under the terms of the GNU General Public License as
@@ -32,7 +32,8 @@
 /* Forward referenced functions */
 char *edit_device_codes(DCR *dcr, char *omsg, const char *cmd);
 static int get_autochanger_loaded_slot(DCR *dcr);
-
+static void lock_changer(DCR *dcr);
+static void unlock_changer(DCR *dcr);
 
 /*
  * Called here to do an autoload using the autochanger, if
@@ -87,6 +88,7 @@ int autoload_device(DCR *dcr, int writing, BSOCK *dir)
         offline_or_rewind_dev(dev);
         /* We are going to load a new tape, so close the device */
         force_close_dev(dev);
+        lock_changer(dcr);
         if (loaded != 0 && loaded != -1) {        /* must unload drive */
             Dmsg0(400, "Doing changer unload.\n");
            Jmsg(jcr, M_INFO, 0,
@@ -123,6 +125,7 @@ int autoload_device(DCR *dcr, int writing, BSOCK *dir)
             Jmsg(jcr, M_INFO, 0, _("3992 Bad autochanger \"load slot %d, drive %d\": ERR=%s.\n"),
                    slot, drive, be.strerror());
         }
+        unlock_changer(dcr);
          Dmsg2(400, "load slot %d status=%d\n", slot, status);
       } else {
         status = 0;                  /* we got what we want */
@@ -149,6 +152,8 @@ static int get_autochanger_loaded_slot(DCR *dcr)
    results = get_pool_memory(PM_MESSAGE);
    changer = get_pool_memory(PM_FNAME);
 
+   lock_changer(dcr);
+
    /* Find out what is loaded, zero means device is unloaded */
    Jmsg(jcr, M_INFO, 0, _("3301 Issuing autochanger \"loaded drive %d\" command.\n"),
        drive);
@@ -171,21 +176,41 @@ static int get_autochanger_loaded_slot(DCR *dcr)
           drive, be.strerror());
       loaded = -1;             /* force unload */
    }
+   unlock_changer(dcr);
    free_pool_memory(changer);
    free_pool_memory(results);
    return loaded;
 }
 
+static void lock_changer(DCR *dcr)
+{
+   AUTOCHANGER *changer_res = dcr->device->changer_res;
+   if (changer_res) {
+      Dmsg1(100, "Locking changer %s\n", changer_res->hdr.name);
+      P(changer_res->changer_mutex);  /* Lock changer script */
+   }
+}
+
+static void unlock_changer(DCR *dcr)
+{
+   AUTOCHANGER *changer_res = dcr->device->changer_res;
+   if (changer_res) {
+      Dmsg1(100, "Unlocking changer %s\n", changer_res->hdr.name);
+      V(changer_res->changer_mutex);  /* Unlock changer script */
+   }
+}
+
+
 /*
  * The Volume is not in the correct slot, so mark this
  *   Volume as not being in the Changer.
  */
-void invalid_slot_in_catalog(DCR *dcr)
+void mark_volume_not_inchanger(DCR *dcr)
 {
    JCR *jcr = dcr->jcr;
    DEVICE *dev = dcr->dev;
    Jmsg(jcr, M_ERROR, 0, _("Autochanger Volume \"%s\" not found in slot %d.\n"
-"    Setting slot to zero in catalog.\n"),
+"    Setting InChanger to zero in catalog.\n"),
        dcr->VolCatInfo.VolCatName, dcr->VolCatInfo.Slot);
    dcr->VolCatInfo.InChanger = false;
    dev->VolCatInfo.InChanger = false;

diff --git a/bacula/src/stored/mount.c b/bacula/src/stored/mount.c
index fdda8d2f011d134f122057c8a1cc408e60a40498..27d1ecebe38b93618addf85e6e4a2321f50c131c 100644 (file)
--- a/bacula/src/stored/mount.c
+++ b/bacula/src/stored/mount.c
@@ -156,7 +156,8 @@ mount_next_vol:
    /* Ensure the device is open */
    /* If we have a dvd that requires mount, we first want to guess
     * which Volume is loaded, so we continue (if the wrong device is
-    * loaded, open_device would fail). */
+    * loaded, open_device just below would fail. 
+    */
    if (!dev->is_dvd()) {
       if (!open_device(dcr)) {
         if (dev->poll) {
@@ -292,6 +293,9 @@ read_volume:
          Jmsg(jcr, M_WARNING, 0, _("Volume \"%s\" not on device %s.\n"),
            dcr->VolumeName, dev_name(dev));
         mark_volume_in_error(dcr);
+        if (autochanger) {
+           mark_volume_not_inchanger(dcr);
+        }
         goto mount_next_vol;
       }
       /* NOTE! Fall-through wanted. */

diff --git a/bacula/src/stored/protos.h b/bacula/src/stored/protos.h
index 7afa0e8b97e007b3add8b32c88e2735fa781660f..ff315fa688400b9cc36e03b53ade91330d78f2af 100644 (file)
--- a/bacula/src/stored/protos.h
+++ b/bacula/src/stored/protos.h
@@ -28,182 +28,182 @@
 uint32_t new_VolSessionId();
 
 /* From acquire.c */
-bool     reserve_device_for_append(JCR *jcr, DEVICE *dev);
-DCR     *acquire_device_for_append(JCR *jcr, DEVICE *dev);
-bool     reserve_device_for_read(JCR *jcr, DEVICE *dev);
-DCR     *acquire_device_for_read(JCR *jcr, DEVICE *dev);
-bool     release_device(JCR *jcr);
-DCR     *new_dcr(JCR *jcr, DEVICE *dev);
-void     free_dcr(DCR *dcr);
+bool    reserve_device_for_append(JCR *jcr, DEVICE *dev);
+DCR    *acquire_device_for_append(JCR *jcr, DEVICE *dev);
+bool    reserve_device_for_read(JCR *jcr, DEVICE *dev);
+DCR    *acquire_device_for_read(JCR *jcr, DEVICE *dev);
+bool    release_device(JCR *jcr);
+DCR    *new_dcr(JCR *jcr, DEVICE *dev);
+void    free_dcr(DCR *dcr);
 
 /* From askdir.c */
 enum get_vol_info_rw {
    GET_VOL_INFO_FOR_WRITE,
    GET_VOL_INFO_FOR_READ
 };
-bool    dir_get_volume_info(DCR *dcr, enum get_vol_info_rw);
-bool    dir_find_next_appendable_volume(DCR *dcr);
-bool    dir_update_volume_info(DCR *dcr, bool label);
-bool    dir_ask_sysop_to_create_appendable_volume(DCR *dcr);
-bool    dir_ask_sysop_to_mount_volume(DCR *dcr);
-bool    dir_update_file_attributes(DCR *dcr, DEV_RECORD *rec);
-bool    dir_send_job_status(JCR *jcr);
-bool    dir_create_jobmedia_record(DCR *dcr);
+bool   dir_get_volume_info(DCR *dcr, enum get_vol_info_rw);
+bool   dir_find_next_appendable_volume(DCR *dcr);
+bool   dir_update_volume_info(DCR *dcr, bool label);
+bool   dir_ask_sysop_to_create_appendable_volume(DCR *dcr);
+bool   dir_ask_sysop_to_mount_volume(DCR *dcr);
+bool   dir_update_file_attributes(DCR *dcr, DEV_RECORD *rec);
+bool   dir_send_job_status(JCR *jcr);
+bool   dir_create_jobmedia_record(DCR *dcr);
 
 /* authenticate.c */
-int     authenticate_director(JCR *jcr);
-int     authenticate_filed(JCR *jcr);
+int    authenticate_director(JCR *jcr);
+int    authenticate_filed(JCR *jcr);
 
 /* From autochanger.c */
-int      autoload_device(DCR *dcr, int writing, BSOCK *dir);
-bool     autochanger_list(DCR *dcr, BSOCK *dir);
-void     invalidate_slot_in_catalog(DCR *dcr);
-char    *edit_device_codes(DCR *dcr, char *omsg, const char *cmd);
+int     autoload_device(DCR *dcr, int writing, BSOCK *dir);
+bool    autochanger_list(DCR *dcr, BSOCK *dir);
+void    mark_volume_not_inchanger(DCR *dcr);
+char   *edit_device_codes(DCR *dcr, char *omsg, const char *cmd);
 
 /* From block.c */
-void    dump_block(DEV_BLOCK *b, const char *msg);
+void   dump_block(DEV_BLOCK *b, const char *msg);
 DEV_BLOCK *new_block(DEVICE *dev);
 DEV_BLOCK *dup_block(DEV_BLOCK *eblock);
-void    init_block_write(DEV_BLOCK *block);
-void    empty_block(DEV_BLOCK *block);
-void    free_block(DEV_BLOCK *block);
-bool    write_block_to_device(DCR *dcr);
-bool    write_block_to_dev(DCR *dcr);
-void    print_block_read_errors(JCR *jcr, DEV_BLOCK *block);
-void    ser_block_header(DEV_BLOCK *block);
+void   init_block_write(DEV_BLOCK *block);
+void   empty_block(DEV_BLOCK *block);
+void   free_block(DEV_BLOCK *block);
+bool   write_block_to_device(DCR *dcr);
+bool   write_block_to_dev(DCR *dcr);
+void   print_block_read_errors(JCR *jcr, DEV_BLOCK *block);
+void   ser_block_header(DEV_BLOCK *block);
 
 #define CHECK_BLOCK_NUMBERS    true
 #define NO_BLOCK_NUMBER_CHECK  false
-bool    read_block_from_device(DCR *dcr, bool check_block_numbers);
-bool    read_block_from_dev(DCR *dcr, bool check_block_numbers);
+bool   read_block_from_device(DCR *dcr, bool check_block_numbers);
+bool   read_block_from_dev(DCR *dcr, bool check_block_numbers);
 
 /* From butil.c -- utilities for SD tool programs */
-void    print_ls_output(const char *fname, const char *link, int type, struct stat *statp);
+void   print_ls_output(const char *fname, const char *link, int type, struct stat *statp);
 JCR    *setup_jcr(const char *name, char *dev_name, BSR *bsr,
-                  const char *VolumeName, int mode);
-void    display_tape_error_status(JCR *jcr, DEVICE *dev);
+                 const char *VolumeName, int mode);
+void   display_tape_error_status(JCR *jcr, DEVICE *dev);
 
 
 /* From dev.c */
-DEVICE  *init_dev(JCR *jcr, DEVICE *dev, DEVRES *device);
-int      open_dev(DEVICE *dev, char *VolName, int mode);
-off_t    lseek_dev(DEVICE *dev, off_t offset, int whence);
-int      open_first_part(DEVICE *dev);
-int      open_next_part(DEVICE *dev);
-int      open_guess_name_dev(DEVICE *dev);
-void     close_dev(DEVICE *dev);
-void     force_close_dev(DEVICE *dev);
-bool     truncate_dev(DEVICE *dev);
-void     term_dev(DEVICE *dev);
-char *   strerror_dev(DEVICE *dev);
-void     clrerror_dev(DEVICE *dev, int func);
-bool     update_pos_dev(DEVICE *dev);
-bool     rewind_dev(DEVICE *dev);
-bool     load_dev(DEVICE *dev);
-bool     offline_dev(DEVICE *dev);
-int      flush_dev(DEVICE *dev);
-int      weof_dev(DEVICE *dev, int num);
-int      write_block(DEVICE *dev);
+DEVICE *init_dev(JCR *jcr, DEVICE *dev, DEVRES *device);
+int     open_dev(DEVICE *dev, char *VolName, int mode);
+off_t   lseek_dev(DEVICE *dev, off_t offset, int whence);
+int     open_first_part(DEVICE *dev);
+int     open_next_part(DEVICE *dev);
+int     open_guess_name_dev(DEVICE *dev);
+void    close_dev(DEVICE *dev);
+void    force_close_dev(DEVICE *dev);
+bool    truncate_dev(DEVICE *dev);
+void    term_dev(DEVICE *dev);
+char *  strerror_dev(DEVICE *dev);
+void    clrerror_dev(DEVICE *dev, int func);
+bool    update_pos_dev(DEVICE *dev);
+bool    rewind_dev(DEVICE *dev);
+bool    load_dev(DEVICE *dev);
+bool    offline_dev(DEVICE *dev);
+int     flush_dev(DEVICE *dev);
+int     weof_dev(DEVICE *dev, int num);
+int     write_block(DEVICE *dev);
 uint32_t status_dev(DEVICE *dev);
-int      eod_dev(DEVICE *dev);
-bool     fsf_dev(DEVICE *dev, int num);
-bool     fsr_dev(DEVICE *dev, int num);
-bool     bsf_dev(DEVICE *dev, int num);
-bool     bsr_dev(DEVICE *dev, int num);
-void     attach_jcr_to_device(DEVICE *dev, JCR *jcr);
-void     detach_jcr_from_device(DEVICE *dev, JCR *jcr);
-JCR     *next_attached_jcr(DEVICE *dev, JCR *jcr);
-bool     dev_can_write(DEVICE *dev);
-bool     offline_or_rewind_dev(DEVICE *dev);
-bool     reposition_dev(DEVICE *dev, uint32_t file, uint32_t block);
-void     init_dev_wait_timers(DEVICE *dev);
-bool     double_dev_wait_time(DEVICE *dev);
+int     eod_dev(DEVICE *dev);
+bool    fsf_dev(DEVICE *dev, int num);
+bool    fsr_dev(DEVICE *dev, int num);
+bool    bsf_dev(DEVICE *dev, int num);
+bool    bsr_dev(DEVICE *dev, int num);
+void    attach_jcr_to_device(DEVICE *dev, JCR *jcr);
+void    detach_jcr_from_device(DEVICE *dev, JCR *jcr);
+JCR    *next_attached_jcr(DEVICE *dev, JCR *jcr);
+bool    dev_can_write(DEVICE *dev);
+bool    offline_or_rewind_dev(DEVICE *dev);
+bool    reposition_dev(DEVICE *dev, uint32_t file, uint32_t block);
+void    init_dev_wait_timers(DEVICE *dev);
+bool    double_dev_wait_time(DEVICE *dev);
 
 /* Get info about device */
-char *   dev_name(DEVICE *dev);
-char *   dev_vol_name(DEVICE *dev);
+char *  dev_name(DEVICE *dev);
+char *  dev_vol_name(DEVICE *dev);
 uint32_t dev_block(DEVICE *dev);
 uint32_t dev_file(DEVICE *dev);
-bool     dev_is_tape(DEVICE *dev);
+bool    dev_is_tape(DEVICE *dev);
 
 /* From device.c */
-bool     open_device(DCR *dcr);
-bool     first_open_device(DEVICE *dev);
-bool     fixup_device_block_write_error(DCR *dcr);
-void     _lock_device(const char *file, int line, DEVICE *dev);
-void     _unlock_device(const char *file, int line, DEVICE *dev);
-void     _block_device(const char *file, int line, DEVICE *dev, int state);
-void     _unblock_device(const char *file, int line, DEVICE *dev);
-void     _steal_device_lock(const char *file, int line, DEVICE *dev, bsteal_lock_t *hold, int state);
-void     _give_back_device_lock(const char *file, int line, DEVICE *dev, bsteal_lock_t *hold);
-void     set_new_volume_parameters(DCR *dcr);
-void     set_new_file_parameters(DCR *dcr);
-bool     device_is_unmounted(DEVICE *dev);
-void     dev_lock(DEVICE *dev);
-void     dev_unlock(DEVICE *dev);
+bool    open_device(DCR *dcr);
+bool    first_open_device(DEVICE *dev);
+bool    fixup_device_block_write_error(DCR *dcr);
+void    _lock_device(const char *file, int line, DEVICE *dev);
+void    _unlock_device(const char *file, int line, DEVICE *dev);
+void    _block_device(const char *file, int line, DEVICE *dev, int state);
+void    _unblock_device(const char *file, int line, DEVICE *dev);
+void    _steal_device_lock(const char *file, int line, DEVICE *dev, bsteal_lock_t *hold, int state);
+void    _give_back_device_lock(const char *file, int line, DEVICE *dev, bsteal_lock_t *hold);
+void    set_new_volume_parameters(DCR *dcr);
+void    set_new_file_parameters(DCR *dcr);
+bool    device_is_unmounted(DEVICE *dev);
+void    dev_lock(DEVICE *dev);
+void    dev_unlock(DEVICE *dev);
 const char *edit_blocked_reason(DEVICE *dev);
 
 /* From dircmd.c */
-void     *handle_connection_request(void *arg);
+void    *handle_connection_request(void *arg);
 
 
 /* From fd_cmds.c */
-void     run_job(JCR *jcr);
-bool     bootstrap_cmd(JCR *jcr);
+void    run_job(JCR *jcr);
+bool    bootstrap_cmd(JCR *jcr);
 
 /* From job.c */
-void     stored_free_jcr(JCR *jcr);
-void     connection_from_filed(void *arg);
-void     handle_filed_connection(BSOCK *fd, char *job_name);
+void    stored_free_jcr(JCR *jcr);
+void    connection_from_filed(void *arg);
+void    handle_filed_connection(BSOCK *fd, char *job_name);
 
 /* From label.c */
-int      read_dev_volume_label(DCR *dcr);
-int      read_dev_volume_label_guess(DCR *dcr, bool write);
-void     create_session_label(DCR *dcr, DEV_RECORD *rec, int label);
-void     create_volume_label(DEVICE *dev, const char *VolName, const char *PoolName);
-bool     write_new_volume_label_to_dev(DCR *dcr, const char *VolName, const char *PoolName);
-bool     write_ansi_ibm_label(DCR *dcr, const char *VolName);
-int      read_ansi_ibm_label(DCR *dcr);
-bool     write_session_label(DCR *dcr, int label);
-bool     write_volume_label_to_block(DCR *dcr);
-bool     rewrite_volume_label(DCR *dcr, bool recycle);
-void     dump_volume_label(DEVICE *dev);
-void     dump_label_record(DEVICE *dev, DEV_RECORD *rec, int verbose);
-bool     unser_volume_label(DEVICE *dev, DEV_RECORD *rec);
-bool     unser_session_label(SESSION_LABEL *label, DEV_RECORD *rec);
+int     read_dev_volume_label(DCR *dcr);
+int     read_dev_volume_label_guess(DCR *dcr, bool write);
+void    create_session_label(DCR *dcr, DEV_RECORD *rec, int label);
+void    create_volume_label(DEVICE *dev, const char *VolName, const char *PoolName);
+bool    write_new_volume_label_to_dev(DCR *dcr, const char *VolName, const char *PoolName);
+bool    write_ansi_ibm_label(DCR *dcr, const char *VolName);
+int     read_ansi_ibm_label(DCR *dcr);
+bool    write_session_label(DCR *dcr, int label);
+bool    write_volume_label_to_block(DCR *dcr);
+bool    rewrite_volume_label(DCR *dcr, bool recycle);
+void    dump_volume_label(DEVICE *dev);
+void    dump_label_record(DEVICE *dev, DEV_RECORD *rec, int verbose);
+bool    unser_volume_label(DEVICE *dev, DEV_RECORD *rec);
+bool    unser_session_label(SESSION_LABEL *label, DEV_RECORD *rec);
 
 /* From match_bsr.c */
-int      match_bsr(BSR *bsr, DEV_RECORD *rec, VOLUME_LABEL *volrec,
-              SESSION_LABEL *sesrec);
-int      match_bsr_block(BSR *bsr, DEV_BLOCK *block);
-void     position_bsr_block(BSR *bsr, DEV_BLOCK *block);
-BSR     *find_next_bsr(BSR *root_bsr, DEVICE *dev);
-bool     match_set_eof(BSR *bsr, DEV_RECORD *rec);
+int     match_bsr(BSR *bsr, DEV_RECORD *rec, VOLUME_LABEL *volrec,
+             SESSION_LABEL *sesrec);
+int     match_bsr_block(BSR *bsr, DEV_BLOCK *block);
+void    position_bsr_block(BSR *bsr, DEV_BLOCK *block);
+BSR    *find_next_bsr(BSR *root_bsr, DEVICE *dev);
+bool    match_set_eof(BSR *bsr, DEV_RECORD *rec);
 
 /* From mount.c */
-bool     mount_next_write_volume(DCR *dcr, bool release);
-bool     mount_next_read_volume(DCR *dcr);
-void     release_volume(DCR *ddr);
-void     mark_volume_in_error(DCR *dcr);
+bool    mount_next_write_volume(DCR *dcr, bool release);
+bool    mount_next_read_volume(DCR *dcr);
+void    release_volume(DCR *ddr);
+void    mark_volume_in_error(DCR *dcr);
 
 /* From parse_bsr.c */
-BSR     *parse_bsr(JCR *jcr, char *lf);
-void     dump_bsr(BSR *bsr, bool recurse);
-void     free_bsr(BSR *bsr);
+BSR    *parse_bsr(JCR *jcr, char *lf);
+void    dump_bsr(BSR *bsr, bool recurse);
+void    free_bsr(BSR *bsr);
 VOL_LIST *new_vol();
-int      add_vol(JCR *jcr, VOL_LIST *vol);
-void     free_vol_list(JCR *jcr);
-void     create_vol_list(JCR *jcr);
+int     add_vol(JCR *jcr, VOL_LIST *vol);
+void    free_vol_list(JCR *jcr);
+void    create_vol_list(JCR *jcr);
 
 /* From record.c */
 const char *FI_to_ascii(int fi);
 const char *stream_to_ascii(int stream, int fi);
-bool        write_record_to_block(DEV_BLOCK *block, DEV_RECORD *rec);
-bool        can_write_record_to_block(DEV_BLOCK *block, DEV_RECORD *rec);
-bool        read_record_from_block(DEV_BLOCK *block, DEV_RECORD *rec);
+bool       write_record_to_block(DEV_BLOCK *block, DEV_RECORD *rec);
+bool       can_write_record_to_block(DEV_BLOCK *block, DEV_RECORD *rec);
+bool       read_record_from_block(DEV_BLOCK *block, DEV_RECORD *rec);
 DEV_RECORD *new_record();
-void        free_record(DEV_RECORD *rec);
-void        empty_record(DEV_RECORD *rec);
+void       free_record(DEV_RECORD *rec);
+void       empty_record(DEV_RECORD *rec);
 
 /* From read_record.c */
 bool read_records(DCR *dcr,
@@ -211,12 +211,12 @@ bool read_records(DCR *dcr,
        bool mount_cb(DCR *dcr));
 
 /* From spool.c */
-bool    begin_data_spool          (JCR *jcr);
-bool    discard_data_spool        (JCR *jcr);
-bool    commit_data_spool         (JCR *jcr);
-bool    are_attributes_spooled    (JCR *jcr);
-bool    begin_attribute_spool     (JCR *jcr);
-bool    discard_attribute_spool   (JCR *jcr);
-bool    commit_attribute_spool    (JCR *jcr);
-bool    write_block_to_spool_file (DCR *dcr);
-void    list_spool_stats          (BSOCK *bs);
+bool   begin_data_spool          (JCR *jcr);
+bool   discard_data_spool        (JCR *jcr);
+bool   commit_data_spool         (JCR *jcr);
+bool   are_attributes_spooled    (JCR *jcr);
+bool   begin_attribute_spool     (JCR *jcr);
+bool   discard_attribute_spool   (JCR *jcr);
+bool   commit_attribute_spool    (JCR *jcr);
+bool   write_block_to_spool_file (DCR *dcr);
+void   list_spool_stats          (BSOCK *bs);