X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=bacula%2Fsrc%2Fstored%2Fautochanger.c;h=be656ff3371d73fb1b226c3e6c56f8db4a5b8ada;hb=5acaefa52eef9207ee62d4fe9d231701c0dc4529;hp=2db94094e48b3e8ba174cff961884c2d43092c77;hpb=c9551616bc6691b48a2c9094f761243532ff987c;p=bacula%2Fbacula diff --git a/bacula/src/stored/autochanger.c b/bacula/src/stored/autochanger.c index 2db94094e4..be656ff337 100644 --- a/bacula/src/stored/autochanger.c +++ b/bacula/src/stored/autochanger.c @@ -7,19 +7,32 @@ * Version $Id$ */ /* - Copyright (C) 2002-2006 Kern Sibbald + Bacula® - The Network Backup Solution - This program is free software; you can redistribute it and/or - modify it under the terms of the GNU General Public License - version 2 as amended with additional clauses defined in the - file LICENSE in the main source directory. + Copyright (C) 2002-2006 Free Software Foundation Europe e.V. - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - the file LICENSE for additional details. + The main author of Bacula is Kern Sibbald, with contributions from + many others, a complete list can be found in the file AUTHORS. + This program is Free Software; you can redistribute it and/or + modify it under the terms of version two of the GNU General Public + License as published by the Free Software Foundation plus additions + that are listed in the file LICENSE. - */ + This program is distributed in the hope that it will be useful, but + WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this program; if not, write to the Free Software + Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA + 02110-1301, USA. + + Bacula® is a registered trademark of John Walker. + The licensor of Bacula is the Free Software Foundation Europe + (FSFE), Fiduciary Program, Sumatrastrasse 25, 8006 Zürich, + Switzerland, email:ftf@fsfeurope.org. +*/ #include "bacula.h" /* pull in global headers */ #include "stored.h" /* pull in Storage Deamon headers */ @@ -105,9 +118,15 @@ int autoload_device(DCR *dcr, int writing, BSOCK *dir) POOLMEM *changer; if (!dev->is_autochanger()) { - Dmsg0(200, "======== NOT AUTOCHANGER ======\n"); + Dmsg1(200, "Device %s is not an autochanger\n", dev->print_name()); return 0; } + + /* An empty ChangerCommand => virtual disk autochanger */ + if (dcr->device->changer_command && dcr->device->changer_command[0] == 0) { + return 1; /* nothing to load */ + } + slot = dcr->VolCatInfo.InChanger ? dcr->VolCatInfo.Slot : 0; /* * Handle autoloaders here. If we cannot autoload it, we @@ -127,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 */ @@ -144,6 +163,7 @@ int autoload_device(DCR *dcr, int writing, BSOCK *dir) loaded = get_autochanger_loaded_slot(dcr); if (loaded != slot) { + POOL_MEM results(PM_MESSAGE); /* Unload anything in our drive */ if (!unload_autochanger(dcr, loaded)) { @@ -164,11 +184,10 @@ int autoload_device(DCR *dcr, int writing, BSOCK *dir) _("3304 Issuing autochanger \"load slot %d, drive %d\" command.\n"), slot, drive); dcr->VolCatInfo.Slot = slot; /* slot to be loaded */ - changer = edit_device_codes(dcr, changer, - dcr->device->changer_command, "load"); + changer = edit_device_codes(dcr, changer, dcr->device->changer_command, "load"); dev->close(); Dmsg1(200, "Run program=%s\n", changer); - status = run_program(changer, timeout, NULL); + status = run_program_full_output(changer, timeout, results.c_str()); if (status == 0) { Jmsg(jcr, M_INFO, 0, _("3305 Autochanger \"load slot %d, drive %d\", status is OK.\n"), slot, drive); @@ -179,9 +198,11 @@ int autoload_device(DCR *dcr, int writing, BSOCK *dir) be.set_errno(status); Dmsg3(100, "load slot %d, drive %d, bad stats=%s.\n", slot, drive, be.strerror()); - Jmsg(jcr, M_FATAL, 0, _("3992 Bad autochanger \"load slot %d, drive %d\": ERR=%s.\n"), - slot, drive, be.strerror()); + 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()); rtn_stat = -1; /* hard error */ + dev->Slot = -1; /* mark unknown */ } Dmsg2(100, "load slot %d status=%d\n", slot, status); unlock_changer(dcr); @@ -212,50 +233,58 @@ bail_out: int get_autochanger_loaded_slot(DCR *dcr) { JCR *jcr = dcr->jcr; - POOLMEM *changer, *results; + DEVICE *dev = dcr->dev; int status, loaded; uint32_t timeout = dcr->device->max_changer_wait; int drive = dcr->dev->drive_index; + POOL_MEM results(PM_MESSAGE); + POOLMEM *changer; + if (!dev->is_autochanger()) { + return -1; + } if (!dcr->device->changer_command) { Jmsg(jcr, M_FATAL, 0, _("3992 Missing Changer command.\n")); return -1; } - - results = get_pool_memory(PM_MESSAGE); - changer = get_pool_memory(PM_FNAME); - + if (dev->Slot > 0) { + return dev->Slot; + } + /* Virtual disk autochanger */ + if (dcr->device->changer_command[0] ==0) { + return 1; + } /* Find out what is loaded, zero means device is unloaded */ + changer = get_pool_memory(PM_FNAME); lock_changer(dcr); - Jmsg(jcr, M_INFO, 0, _("3301 Issuing autochanger \"loaded drive %d\" command.\n"), + Jmsg(jcr, M_INFO, 0, _("3301 Issuing autochanger \"loaded? drive %d\" command.\n"), drive); changer = edit_device_codes(dcr, changer, dcr->device->changer_command, "loaded"); - *results = 0; + *results.c_str() = 0; Dmsg1(100, "Run program=%s\n", changer); - status = run_program(changer, timeout, results); - Dmsg3(100, "run_prog: %s stat=%d result=%s\n", changer, status, results); + status = run_program_full_output(changer, timeout, 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); + loaded = str_to_int32(results.c_str()); if (loaded > 0) { - Jmsg(jcr, M_INFO, 0, _("3302 Autochanger \"loaded drive %d\", result is Slot %d.\n"), + Jmsg(jcr, M_INFO, 0, _("3302 Autochanger \"loaded? drive %d\", result is Slot %d.\n"), drive, loaded); - dcr->dev->Slot = loaded; + dev->Slot = loaded; } else { - Jmsg(jcr, M_INFO, 0, _("3302 Autochanger \"loaded drive %d\", result: nothing loaded.\n"), + Jmsg(jcr, M_INFO, 0, _("3302 Autochanger \"loaded? drive %d\", result: nothing loaded.\n"), drive); - dcr->dev->Slot = 0; + dev->Slot = -1; /* unknown */ } } else { berrno be; be.set_errno(status); - Jmsg(jcr, M_INFO, 0, _("3991 Bad autochanger \"loaded drive %d\" command: ERR=%s.\n"), - drive, be.strerror()); + Jmsg(jcr, M_INFO, 0, _("3991 Bad autochanger \"loaded? drive %d\" command: " + "ERR=%s.\nResults=%s\n"), drive, be.strerror(), results.c_str()); loaded = -1; /* force unload */ } unlock_changer(dcr); free_pool_memory(changer); - free_pool_memory(results); return loaded; } @@ -305,6 +334,7 @@ bool unload_autochanger(DCR *dcr, int loaded) } if (loaded > 0) { + POOL_MEM results(PM_MESSAGE); POOLMEM *changer = get_pool_memory(PM_FNAME); lock_changer(dcr); Jmsg(jcr, M_INFO, 0, @@ -316,14 +346,17 @@ bool unload_autochanger(DCR *dcr, int loaded) dcr->device->changer_command, "unload"); dev->close(); Dmsg1(100, "Run program=%s\n", changer); - int stat = run_program(changer, timeout, NULL); + *results.c_str() = 0; + int stat = run_program_full_output(changer, timeout, results.c_str()); dcr->VolCatInfo.Slot = slot; if (stat != 0) { 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()); + 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()); ok = false; + dev->Slot = -1; /* unknown */ } else { dev->Slot = 0; /* nothing loaded */ } @@ -381,18 +414,19 @@ static bool unload_other_drive(DCR *dcr, int slot) } 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; } POOLMEM *changer_cmd = get_pool_memory(PM_FNAME); + POOL_MEM results(PM_MESSAGE); lock_changer(dcr); Jmsg(jcr, M_INFO, 0, _("3307 Issuing autochanger \"unload slot %d, drive %d\" command.\n"), @@ -411,7 +445,7 @@ static bool unload_other_drive(DCR *dcr, int slot) Dmsg2(200, "close dev=%s reserve=%d\n", dev->print_name(), dev->reserved_device); Dmsg1(100, "Run program=%s\n", changer_cmd); - int stat = run_program(changer_cmd, timeout, NULL); + int stat = run_program_full_output(changer_cmd, timeout, results.c_str()); dcr->VolCatInfo.Slot = save_slot; dcr->dev = save_dev; if (stat != 0) { @@ -423,12 +457,13 @@ static bool unload_other_drive(DCR *dcr, int slot) Dmsg3(100, "Bad autochanger \"unload slot %d, drive %d\": ERR=%s.\n", slot, dev->drive_index, be.strerror()); ok = false; + dev->Slot = -1; /* unknown */ } else { - dev->Slot = 0; /* nothing loaded */ + dev->Slot = 0; /* nothing loaded */ Dmsg0(100, "Slot unloaded\n"); } unlock_changer(dcr); - V(dev->mutex); + dev->dunlock(); free_pool_memory(changer_cmd); return ok; }