X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=bacula%2Fsrc%2Fstored%2Fautochanger.c;h=f127e96fe20bbafb14c3b1d6d308e2b2641c992c;hb=7503a438c87931cf1748bd0fda3bb932e2af3346;hp=b9d4779e9d1f04c7de149396ab16c4c58d0abaed;hpb=bb2dd1b87f7b8c781404c4bc97de23446bb6eaf2;p=bacula%2Fbacula diff --git a/bacula/src/stored/autochanger.c b/bacula/src/stored/autochanger.c index b9d4779e9d..f127e96fe2 100644 --- 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,12 +152,14 @@ 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); changer = edit_device_codes(dcr, changer, "loaded"); status = run_program(changer, timeout, results); - Dmsg3(50, "run_prog: %s stat=%d result=%s\n", changer, status, results); + Dmsg3(50, "run_prog: %s stat=%d result=%s", changer, status, results); if (status == 0) { loaded = atoi(results); if (loaded > 0) { @@ -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; @@ -198,7 +223,7 @@ void invalid_slot_in_catalog(DCR *dcr) * with their barcodes. * We assume that it is always the Console that is calling us. */ -bool autochanger_list(DCR *dcr, BSOCK *dir) +bool autochanger_cmd(DCR *dcr, BSOCK *dir, const char *cmd) { DEVICE *dev = dcr->dev; JCR *jcr = dcr->jcr; @@ -207,6 +232,8 @@ bool autochanger_list(DCR *dcr, BSOCK *dir) BPIPE *bpipe; int slot, loaded; int len = sizeof_pool_memory(dir->msg) - 1; + bool ok = false; + int stat; if (!dev_cap(dev, CAP_AUTOCHANGER) || !dcr->device->changer_name || !dcr->device->changer_command) { @@ -215,49 +242,73 @@ bool autochanger_list(DCR *dcr, BSOCK *dir) } changer = get_pool_memory(PM_FNAME); - offline_or_rewind_dev(dev); - /* We are going to load a new tape, so close the device */ - force_close_dev(dev); + /* List command? */ + if (strcmp(cmd, "list") == 0) { + int drive = dev->device->drive_index; + /* Yes, to get a good listing, we unload any volumes */ + offline_or_rewind_dev(dev); + /* We are going to load a new tape, so close the device */ + force_close_dev(dev); - /* First unload any tape */ - loaded = get_autochanger_loaded_slot(dcr); - if (loaded > 0) { - bnet_fsend(dir, _("3305 Issuing autochanger \"unload slot %d\" command.\n"), loaded); - slot = dcr->VolCatInfo.Slot; - dcr->VolCatInfo.Slot = loaded; - changer = edit_device_codes(dcr, changer, "unload"); - int stat = run_program(changer, timeout, NULL); - if (stat != 0) { - berrno be; - be.set_errno(stat); - Jmsg(jcr, M_INFO, 0, _("3995 Bad autochanger \"unload slot %d\" command: ERR=%s.\n"), - loaded, be.strerror()); + /* First unload any tape */ + loaded = get_autochanger_loaded_slot(dcr); + if (loaded > 0) { + bnet_fsend(dir, + _("3305 Issuing autochanger \"unload slot %d, drive %d\" command.\n"), + loaded, drive); + slot = dcr->VolCatInfo.Slot; + dcr->VolCatInfo.Slot = loaded; + changer = edit_device_codes(dcr, changer, "unload"); + lock_changer(dcr); + int stat = run_program(changer, timeout, NULL); + unlock_changer(dcr); + 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, drive, be.strerror()); + } + dcr->VolCatInfo.Slot = slot; } - dcr->VolCatInfo.Slot = slot; } - /* Now list slots occupied */ - changer = edit_device_codes(dcr, changer, "list"); - bnet_fsend(dir, _("3306 Issuing autochanger \"list\" command.\n")); + /* Now issue the command */ + changer = edit_device_codes(dcr, changer, cmd); + bnet_fsend(dir, _("3306 Issuing autochanger \"%s\" command.\n"), cmd); + lock_changer(dcr); bpipe = open_bpipe(changer, timeout, "r"); if (!bpipe) { + unlock_changer(dcr); bnet_fsend(dir, _("3993 Open bpipe failed.\n")); - free_pool_memory(changer); - return false; + goto bail_out; } - /* Get output from changer */ - while (fgets(dir->msg, len, bpipe->rfd)) { + if (strcmp(cmd, "list") == 0) { + /* Get output from changer */ + while (fgets(dir->msg, len, bpipe->rfd)) { + dir->msglen = strlen(dir->msg); + Dmsg1(100, "msg); + bnet_send(dir); + } + } else { + /* For slots command, read a single line */ + bstrncpy(dir->msg, "slots=", len); + fgets(dir->msg+6, len-6, bpipe->rfd); dir->msglen = strlen(dir->msg); + Dmsg1(100, "msg); bnet_send(dir); } - int stat = close_bpipe(bpipe); + + stat = close_bpipe(bpipe); + unlock_changer(dcr); if (stat != 0) { berrno be; be.set_errno(stat); bnet_fsend(dir, "Autochanger error: ERR=%s\n", be.strerror()); } bnet_sig(dir, BNET_EOD); + ok = true; +bail_out: free_pool_memory(changer); return true; } @@ -290,7 +341,7 @@ char *edit_device_codes(DCR *dcr, char *omsg, const char *cmd) const char *imsg = dcr->device->changer_command; *omsg = 0; - Dmsg1(800, "edit_device_codes: %s\n", imsg); + Dmsg1(1800, "edit_device_codes: %s\n", imsg); for (p=imsg; *p; p++) { if (*p == '%') { switch (*++p) { @@ -298,7 +349,7 @@ char *edit_device_codes(DCR *dcr, char *omsg, const char *cmd) str = "%"; break; case 'a': - str = dev_name(dcr->dev); + str = dcr->dev->archive_name(); break; case 'c': str = NPRT(dcr->device->changer_name); @@ -340,9 +391,10 @@ char *edit_device_codes(DCR *dcr, char *omsg, const char *cmd) add[1] = 0; str = add; } - Dmsg1(900, "add_str %s\n", str); + Dmsg1(1900, "add_str %s\n", str); pm_strcat(&omsg, (char *)str); - Dmsg1(800, "omsg=%s\n", omsg); + Dmsg1(1800, "omsg=%s\n", omsg); } + Dmsg1(800, "omsg=%s\n", omsg); return omsg; }