X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=bacula%2Fsrc%2Fstored%2Fautochanger.c;h=ea79fcc778b07a236c2a51fcfb89eb8232c3299f;hb=ecf33f65329d2ac71403eb26962800c9c2f4664e;hp=afa7ed8464215b230b22fcb338e0016af206123a;hpb=c91a1d5628634c8c2675f423b4699ba84bd7f791;p=bacula%2Fbacula diff --git a/bacula/src/stored/autochanger.c b/bacula/src/stored/autochanger.c index afa7ed8464..ea79fcc778 100644 --- a/bacula/src/stored/autochanger.c +++ b/bacula/src/stored/autochanger.c @@ -1,15 +1,7 @@ -/* - * - * Routines for handling the autochanger. - * - * Kern Sibbald, August MMII - * - * Version $Id$ - */ /* Bacula® - The Network Backup Solution - Copyright (C) 2002-2006 Free Software Foundation Europe e.V. + Copyright (C) 2002-2007 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. @@ -33,6 +25,14 @@ (FSFE), Fiduciary Program, Sumatrastrasse 25, 8006 Zürich, Switzerland, email:ftf@fsfeurope.org. */ +/* + * + * Routines for handling the autochanger. + * + * Kern Sibbald, August MMII + * + * Version $Id$ + */ #include "bacula.h" /* pull in global headers */ #include "stored.h" /* pull in Storage Deamon headers */ @@ -146,13 +146,13 @@ int autoload_device(DCR *dcr, int writing, BSOCK *dir) changer = get_pool_memory(PM_FNAME); if (slot <= 0) { - Jmsg(jcr, M_INFO, 0, _("Invalid slot=%d defined, cannot autoload Volume.\n"), slot); + Jmsg(jcr, M_INFO, 0, _("Invalid slot=%d defined in catalog. Manual load my be required.\n"), slot); rtn_stat = 0; } else if (!dcr->device->changer_name) { - Jmsg(jcr, M_INFO, 0, _("No \"Changer Device\" given cannot autoload Volume.\n")); + Jmsg(jcr, M_INFO, 0, _("No \"Changer Device\" manual load of Volume may be required.\n")); rtn_stat = 0; } else if (!dcr->device->changer_command) { - Jmsg(jcr, M_INFO, 0, _("No \"Changer Command\" given cannot autoload Volume.\n")); + Jmsg(jcr, M_INFO, 0, _("No \"Changer Command\" manual load of Volume may be requird.\n")); rtn_stat = 0; } else { /* Attempt to load the Volume */ @@ -197,10 +197,10 @@ int autoload_device(DCR *dcr, int writing, BSOCK *dir) berrno be; be.set_errno(status); Dmsg3(100, "load slot %d, drive %d, bad stats=%s.\n", slot, drive, - be.strerror()); + be.bstrerror()); Jmsg(jcr, M_FATAL, 0, _("3992 Bad autochanger \"load slot %d, drive %d\": " "ERR=%s.\nResults=%s\n"), - slot, drive, be.strerror(), results.c_str()); + slot, drive, be.bstrerror(), results.c_str()); rtn_stat = -1; /* hard error */ dev->Slot = -1; /* mark unknown */ } @@ -264,7 +264,7 @@ int get_autochanger_loaded_slot(DCR *dcr) *results.c_str() = 0; Dmsg1(100, "Run program=%s\n", changer); status = run_program_full_output(changer, timeout, results.c_str()); - Dmsg3(100, "run_prog: %s stat=%d result=%s\n", changer, status, results.c_str()); + Dmsg3(100, "run_prog: %s stat=%d result=%s", changer, status, results.c_str()); if (status == 0) { loaded = str_to_int32(results.c_str()); if (loaded > 0) { @@ -280,7 +280,7 @@ int get_autochanger_loaded_slot(DCR *dcr) berrno be; be.set_errno(status); Jmsg(jcr, M_INFO, 0, _("3991 Bad autochanger \"loaded? drive %d\" command: " - "ERR=%s.\nResults=%s\n"), drive, be.strerror(), results.c_str()); + "ERR=%s.\nResults=%s\n"), drive, be.bstrerror(), results.c_str()); loaded = -1; /* force unload */ } unlock_changer(dcr); @@ -354,7 +354,7 @@ bool unload_autochanger(DCR *dcr, int loaded) be.set_errno(stat); Jmsg(jcr, M_INFO, 0, _("3995 Bad autochanger \"unload slot %d, drive %d\": " "ERR=%s\nResults=%s\n"), - loaded, dev->drive_index, be.strerror(), results.c_str()); + loaded, dev->drive_index, be.bstrerror(), results.c_str()); ok = false; dev->Slot = -1; /* unknown */ } else { @@ -380,7 +380,7 @@ static bool unload_other_drive(DCR *dcr, int slot) AUTOCHANGER *changer = dcr->dev->device->changer_res; DEVRES *device; bool found = false; - bool first = true; + int retries = 0; /* wait for device retries */ if (!changer) { return false; @@ -408,20 +408,19 @@ static bool unload_other_drive(DCR *dcr, int slot) } for (int i=0; i < 3; i++) { if (dev->is_busy()) { - wait_for_device(dcr->jcr, first); - first = false; + wait_for_device(dcr->jcr, retries); continue; } break; } - P(dev->mutex); + dev->dlock(); if (dev->is_busy()) { Jmsg(jcr, M_WARNING, 0, _("Volume \"%s\" is in use by device %s\n"), dcr->VolumeName, dev->print_name()); Dmsg4(100, "Vol %s for dev=%s is busy dev=%s slot=%d\n", dcr->VolumeName, dcr->dev->print_name(), dev->print_name(), slot); Dmsg2(100, "num_writ=%d reserv=%d\n", dev->num_writers, dev->reserved_device); - V(dev->mutex); + dev->dunlock(); return false; } @@ -452,10 +451,10 @@ static bool unload_other_drive(DCR *dcr, int slot) berrno be; be.set_errno(stat); Jmsg(jcr, M_INFO, 0, _("3995 Bad autochanger \"unload slot %d, drive %d\": ERR=%s.\n"), - slot, dev->drive_index, be.strerror()); + slot, dev->drive_index, be.bstrerror()); Dmsg3(100, "Bad autochanger \"unload slot %d, drive %d\": ERR=%s.\n", - slot, dev->drive_index, be.strerror()); + slot, dev->drive_index, be.bstrerror()); ok = false; dev->Slot = -1; /* unknown */ } else { @@ -463,7 +462,7 @@ static bool unload_other_drive(DCR *dcr, int slot) Dmsg0(100, "Slot unloaded\n"); } unlock_changer(dcr); - V(dev->mutex); + dev->dunlock(); free_pool_memory(changer_cmd); return ok; } @@ -541,7 +540,7 @@ bool autochanger_cmd(DCR *dcr, BSOCK *dir, const char *cmd) if (stat != 0) { berrno be; be.set_errno(stat); - bnet_fsend(dir, _("Autochanger error: ERR=%s\n"), be.strerror()); + bnet_fsend(dir, _("Autochanger error: ERR=%s\n"), be.bstrerror()); } bnet_sig(dir, BNET_EOD); ok = true;