X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=bacula%2Fsrc%2Fstored%2Fjob.c;h=9eb1d6780c5cf565b3182ec58ca2f3a038cbb4b1;hb=37bb5538254139ca710553a0b55541a10ba707da;hp=c77d95016844fab60565b8907053bb0bb5af4768;hpb=b7f0cd7bb1f6927f9eac1ba271e2a73943adab29;p=bacula%2Fbacula diff --git a/bacula/src/stored/job.c b/bacula/src/stored/job.c index c77d950168..9eb1d6780c 100644 --- a/bacula/src/stored/job.c +++ b/bacula/src/stored/job.c @@ -10,19 +10,14 @@ 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 - published by the Free Software Foundation; either version 2 of - the License, or (at your option) any later version. + 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. 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., 59 Temple Place - Suite 330, Boston, - MA 02111-1307, USA. + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + the file LICENSE for additional details. */ @@ -35,25 +30,14 @@ extern uint32_t VolSessionTime; /* Imported functions */ extern uint32_t newVolSessionId(); -/* Forward referenced functions */ -static bool use_storage_cmd(JCR *jcr); - /* Requests from the Director daemon */ static char jobcmd[] = "JobId=%d job=%127s job_name=%127s client_name=%127s " "type=%d level=%d FileSet=%127s NoAttr=%d SpoolAttr=%d FileSetMD5=%127s " - "SpoolData=%d WritePartAfterJob=%d NewVol=%d\n"; -static char use_storage[] = "use storage=%127s media_type=%127s " - "pool_name=%127s pool_type=%127s append=%d copy=%d stripe=%d\n"; -static char use_device[] = "use device=%127s\n"; -//static char query_device[] = "query device=%127s"; + "SpoolData=%d WritePartAfterJob=%d PreferMountedVols=%d\n"; /* Responses sent to Director daemon */ static char OKjob[] = "3000 OK Job SDid=%u SDtime=%u Authorization=%s\n"; -static char OK_device[] = "3000 OK use device device=%s\n"; -static char NO_device[] = "3924 Device \"%s\" not in SD Device resources.\n"; -static char NOT_open[] = "3925 Device \"%s\" could not be opened or does not exist.\n"; -static char BAD_use[] = "3913 Bad use command: %s\n"; static char BAD_job[] = "3915 Bad Job command: %s\n"; //static char OK_query[] = "3001 OK query\n"; //static char NO_query[] = "3918 Query failed\n"; @@ -76,22 +60,22 @@ bool job_cmd(JCR *jcr) BSOCK *dir = jcr->dir_bsock; POOL_MEM job_name, client_name, job, fileset_name, fileset_md5; int JobType, level, spool_attributes, no_attributes, spool_data; - int write_part_after_job, NewVol; + int write_part_after_job, PreferMountedVols; JCR *ojcr; /* * Get JobId and permissions from Director */ - Dmsg1(100, "msg); + Dmsg1(100, "msg); if (sscanf(dir->msg, jobcmd, &JobId, job.c_str(), job_name.c_str(), client_name.c_str(), &JobType, &level, fileset_name.c_str(), &no_attributes, &spool_attributes, fileset_md5.c_str(), &spool_data, - &write_part_after_job, &NewVol) != 13) { + &write_part_after_job, &PreferMountedVols) != 13) { pm_strcpy(jcr->errmsg, dir->msg); bnet_fsend(dir, BAD_job, jcr->errmsg); - Dmsg1(100, ">dird: %s\n", dir->msg); + Dmsg1(100, ">dird: %s", dir->msg); Emsg1(M_FATAL, 0, _("Bad Job Command from Director: %s\n"), jcr->errmsg); set_jcr_job_status(jcr, JS_ErrorTerminated); return false; @@ -127,7 +111,7 @@ bool job_cmd(JCR *jcr) jcr->write_part_after_job = write_part_after_job; jcr->fileset_md5 = get_pool_memory(PM_NAME); pm_strcpy(jcr->fileset_md5, fileset_md5); - jcr->NewVolEachJob = NewVol; + jcr->PreferMountedVols = PreferMountedVols; jcr->authenticated = false; @@ -139,19 +123,7 @@ bool job_cmd(JCR *jcr) Dmsg1(100, ">dird: %s", dir->msg); jcr->sd_auth_key = bstrdup(auth_key); memset(auth_key, 0, sizeof(auth_key)); - return true; -} - -bool use_cmd(JCR *jcr) -{ - /* - * Wait for the device, media, and pool information - */ - if (!use_storage_cmd(jcr)) { - set_jcr_job_status(jcr, JS_ErrorTerminated); - memset(jcr->sd_auth_key, 0, strlen(jcr->sd_auth_key)); - return false; - } + generate_daemon_event(jcr, "JobStart"); return true; } @@ -225,7 +197,7 @@ void handle_filed_connection(BSOCK *fd, char *job_name) Dmsg1(110, "Found Job %s\n", job_name); if (jcr->authenticated) { - Jmsg2(jcr, M_FATAL, 0, "Hey!!!! JobId %u Job %s already authenticated.\n", + Jmsg2(jcr, M_FATAL, 0, _("Hey!!!! JobId %u Job %s already authenticated.\n"), jcr->JobId, jcr->Job); free_jcr(jcr); return; @@ -253,193 +225,6 @@ void handle_filed_connection(BSOCK *fd, char *job_name) } -/* - * Use Device command from Director - * He tells is what Device Name to use, the Media Type, - * the Pool Name, and the Pool Type. - * - * Ensure that the device exists and is opened, then store - * the media and pool info in the JCR. - */ -class DIRSTORE { -public: - alist *device; - char name[MAX_NAME_LENGTH]; - char media_type[MAX_NAME_LENGTH]; - char pool_name[MAX_NAME_LENGTH]; - char pool_type[MAX_NAME_LENGTH]; -}; - -class DIRDEVICE { - alist *device; -}; - -static bool use_storage_cmd(JCR *jcr) -{ - POOL_MEM store_name, dev_name, media_type, pool_name, pool_type; - BSOCK *dir = jcr->dir_bsock; - DEVRES *device; - AUTOCHANGER *changer; - int append; - bool ok; - int Copy, Stripe; - - /* - * If there are multiple devices, the director sends us - * use_device for each device that it wants to use. - */ - Dmsg1(100, "msg); - ok = sscanf(dir->msg, use_storage, store_name.c_str(), - media_type.c_str(), pool_name.c_str(), - pool_type.c_str(), &append, &Copy, &Stripe) == 7; - if (ok) { - unbash_spaces(store_name); - unbash_spaces(media_type); - unbash_spaces(pool_name); - unbash_spaces(pool_type); - if (bnet_recv(dir) <= 0) { - return false; - } - ok = sscanf(dir->msg, use_device, dev_name.c_str()) == 1; - if (!ok) { - return false; - } - /* Eat to BNET_EOD */ - while (bnet_recv(dir) > 0) { - } - LockRes(); - foreach_res(device, R_DEVICE) { - /* Find resource, and make sure we were able to open it */ - if (fnmatch(dev_name.c_str(), device->hdr.name, 0) == 0 && - strcmp(device->media_type, media_type.c_str()) == 0) { - const int name_len = MAX_NAME_LENGTH; - DCR *dcr; - UnlockRes(); - if (!device->dev) { - device->dev = init_dev(jcr, NULL, device); - } - if (!device->dev) { - Jmsg(jcr, M_WARNING, 0, _("\n" - " Device \"%s\" requested by DIR could not be opened or does not exist.\n"), - dev_name.c_str()); - bnet_fsend(dir, NOT_open, dev_name.c_str()); - Dmsg1(100, ">dird: %s\n", dir->msg); - return false; - } - dcr = new_dcr(jcr, device->dev); - if (!dcr) { - bnet_fsend(dir, _("3926 Could not get dcr for device: %s\n"), dev_name.c_str()); - Dmsg1(100, ">dird: %s\n", dir->msg); - return false; - } - Dmsg1(100, "Found device %s\n", device->hdr.name); - bstrncpy(dcr->pool_name, pool_name, name_len); - bstrncpy(dcr->pool_type, pool_type, name_len); - bstrncpy(dcr->media_type, media_type, name_len); - bstrncpy(dcr->dev_name, dev_name, name_len); - dcr->Copy = Copy; - dcr->Stripe = Stripe; - jcr->dcr = dcr; - if (append == SD_APPEND) { - ok = reserve_device_for_append(dcr); - } else { - ok = reserve_device_for_read(dcr); - } - if (!ok) { - bnet_fsend(dir, _("3927 Could not reserve device: %s\n"), dev_name.c_str()); - Dmsg1(100, ">dird: %s\n", dir->msg); - free_dcr(jcr->dcr); - return false; - } - Dmsg1(220, "Got: %s", dir->msg); - bash_spaces(dev_name); - ok = bnet_fsend(dir, OK_device, dev_name.c_str()); - Dmsg1(100, ">dird: %s\n", dir->msg); - return ok; - } - } - - foreach_res(changer, R_AUTOCHANGER) { - /* Find resource, and make sure we were able to open it */ - if (fnmatch(dev_name.c_str(), changer->hdr.name, 0) == 0) { - const int name_len = MAX_NAME_LENGTH; - DCR *dcr; - /* Try each device in this AutoChanger */ - foreach_alist(device, changer->device) { - Dmsg1(100, "Try changer device %s\n", device->hdr.name); - if (!device->dev) { - device->dev = init_dev(jcr, NULL, device); - } - if (!device->dev) { - Dmsg1(100, "Device %s could not be opened. Skipped\n", dev_name.c_str()); - Jmsg(jcr, M_WARNING, 0, _("\n" - " Device \"%s\" in changer \"%s\" requested by DIR could not be opened or does not exist.\n"), - device->hdr.name, dev_name.c_str()); - continue; - } - if (!device->dev->autoselect) { - continue; /* device is not available */ - } - dcr = new_dcr(jcr, device->dev); - if (!dcr) { - bnet_fsend(dir, _("3926 Could not get dcr for device: %s\n"), dev_name.c_str()); - Dmsg1(100, ">dird: %s\n", dir->msg); - UnlockRes(); - return false; - } - Dmsg1(100, "Found changer device %s\n", device->hdr.name); - bstrncpy(dcr->pool_name, pool_name, name_len); - bstrncpy(dcr->pool_type, pool_type, name_len); - bstrncpy(dcr->media_type, media_type, name_len); - bstrncpy(dcr->dev_name, dev_name, name_len); - jcr->dcr = dcr; - if (append == SD_APPEND) { - ok = reserve_device_for_append(dcr); - } else { - ok = reserve_device_for_read(dcr); - } - if (!ok) { - Jmsg(jcr, M_WARNING, 0, _("Could not reserve device: %s\n"), dev_name.c_str()); - free_dcr(jcr->dcr); - continue; - } - Dmsg1(100, "Device %s opened.\n", dev_name.c_str()); - UnlockRes(); - pm_strcpy(dev_name, device->hdr.name); - bash_spaces(dev_name); - ok = bnet_fsend(dir, OK_device, dev_name.c_str()); - Dmsg1(100, ">dird: %s\n", dir->msg); - return ok; - } - break; /* we found it but could not open a device */ - } - } - - UnlockRes(); - if (verbose) { - unbash_spaces(dir->msg); - pm_strcpy(jcr->errmsg, dir->msg); - Jmsg(jcr, M_INFO, 0, _("Failed command: %s\n"), jcr->errmsg); - } - Jmsg(jcr, M_FATAL, 0, _("\n" - " Device \"%s\" with MediaType \"%s\" requested by DIR not found in SD Device resources.\n"), - dev_name.c_str(), media_type.c_str()); - bnet_fsend(dir, NO_device, dev_name.c_str()); - Dmsg1(100, ">dird: %s\n", dir->msg); - } else { - unbash_spaces(dir->msg); - pm_strcpy(jcr->errmsg, dir->msg); - if (verbose) { - Jmsg(jcr, M_INFO, 0, _("Failed command: %s\n"), jcr->errmsg); - } - Jmsg(jcr, M_FATAL, 0, _("Bad Use Device command: %s\n"), jcr->errmsg); - bnet_fsend(dir, BAD_use, jcr->errmsg); - Dmsg1(100, ">dird: %s\n", dir->msg); - } - - return false; /* ERROR return */ -} - #ifdef needed /* * Query Device command from Director @@ -462,17 +247,17 @@ bool query_cmd(JCR *jcr) Dmsg1(100, "msg); if (ok) { unbash_spaces(dev_name); - LockRes(); +// LockRes(); foreach_res(device, R_DEVICE) { /* Find resource, and make sure we were able to open it */ if (fnmatch(dev_name.c_str(), device->hdr.name, 0) == 0) { if (!device->dev) { - device->dev = init_dev(jcr, NULL, device); + device->dev = init_dev(jcr, device); } if (!device->dev) { break; } - UnlockRes(); +// UnlockRes(); ok = dir_update_device(jcr, device->dev); if (ok) { ok = bnet_fsend(dir, OK_query); @@ -485,7 +270,7 @@ bool query_cmd(JCR *jcr) foreach_res(changer, R_AUTOCHANGER) { /* Find resource, and make sure we were able to open it */ if (fnmatch(dev_name.c_str(), changer->hdr.name, 0) == 0) { - UnlockRes(); +// UnlockRes(); if (!changer->device || changer->device->size() == 0) { continue; /* no devices */ } @@ -499,7 +284,7 @@ bool query_cmd(JCR *jcr) } } /* If we get here, the device/autochanger was not found */ - UnlockRes(); +// UnlockRes(); unbash_spaces(dir->msg); pm_strcpy(jcr->errmsg, dir->msg); bnet_fsend(dir, NO_device, dev_name.c_str());