*
*/
/*
- 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
- 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.
*/
/* Imported functions */
extern uint32_t newVolSessionId();
-/* Forward referenced functions */
-static bool use_device_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";
-static char use_device[] = "use device=%127s media_type=%127s pool_name=%127s pool_type=%127s\n";
+ "type=%d level=%d FileSet=%127s NoAttr=%d SpoolAttr=%d FileSetMD5=%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\n";
-static char NO_device[] = "3914 Device \"%s\" not in SD Device resources.\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";
+//static char BAD_query[] = "3917 Bad query command: %s\n";
/*
* Director requests us to start a job
*/
bool job_cmd(JCR *jcr)
{
- int JobId, errstat;
+ int JobId;
char auth_key[100];
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;
- struct timeval tv;
- struct timezone tz;
- struct timespec timeout;
+ int write_part_after_job, PreferMountedVols;
+
JCR *ojcr;
/*
* Get JobId and permissions from Director
*/
- Dmsg1(100, "Job_cmd: %s\n", dir->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) != 11) {
+ Dmsg1(100, "<dird: %s", dir->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, &PreferMountedVols) != 13) {
pm_strcpy(jcr->errmsg, dir->msg);
bnet_fsend(dir, BAD_job, jcr->errmsg);
+ 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;
}
- /*
+ /*
* Since this job could be rescheduled, we
* check to see if we have it already. If so
* free the old jcr and use the new one.
jcr->no_attributes = no_attributes;
jcr->spool_attributes = spool_attributes;
jcr->spool_data = spool_data;
+ 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->PreferMountedVols = PreferMountedVols;
jcr->authenticated = false;
*/
make_session_key(auth_key, NULL, 1);
bnet_fsend(dir, OKjob, jcr->VolSessionId, jcr->VolSessionTime, auth_key);
- Dmsg1(110, ">dird: %s", dir->msg);
+ Dmsg1(100, ">dird: %s", dir->msg);
jcr->sd_auth_key = bstrdup(auth_key);
- memset(auth_key, 0, sizeof(auth_key));
+ memset(auth_key, 0, sizeof(auth_key));
+ generate_daemon_event(jcr, "JobStart");
+ return true;
+}
- /*
- * Wait for the device, media, and pool information
- */
- if (!use_device_cmd(jcr)) {
- set_jcr_job_status(jcr, JS_ErrorTerminated);
- memset(jcr->sd_auth_key, 0, strlen(jcr->sd_auth_key));
- return false;
- }
+bool run_cmd(JCR *jcr)
+{
+ struct timeval tv;
+ struct timezone tz;
+ struct timespec timeout;
+ int errstat;
+ Dmsg1(100, "Run_cmd: %s\n", jcr->dir_bsock->msg);
/* The following jobs don't need the FD */
switch (jcr->JobType) {
case JT_MIGRATION:
return false;
}
- set_jcr_job_status(jcr, JS_WaitFD); /* wait for FD to connect */
+ set_jcr_job_status(jcr, JS_WaitFD); /* wait for FD to connect */
dir_send_job_status(jcr);
gettimeofday(&tv, &tz);
- timeout.tv_nsec = tv.tv_usec * 1000;
- timeout.tv_sec = tv.tv_sec + 30 * 60; /* wait 30 minutes */
+ timeout.tv_nsec = tv.tv_usec * 1000;
+ timeout.tv_sec = tv.tv_sec + 30 * 60; /* wait 30 minutes */
Dmsg1(100, "%s waiting on FD to contact SD\n", jcr->Job);
/*
for ( ;!job_canceled(jcr); ) {
errstat = pthread_cond_timedwait(&jcr->job_start_wait, &jcr->mutex, &timeout);
if (errstat == 0 || errstat == ETIMEDOUT) {
- break;
+ break;
}
}
V(jcr->mutex);
if (jcr->authenticated && !job_canceled(jcr)) {
Dmsg1(100, "Running job %s\n", jcr->Job);
- run_job(jcr); /* Run the job */
+ run_job(jcr); /* Run the job */
}
return false;
}
/*
* After receiving a connection (in job.c) if it is
* from the File daemon, this routine is called.
- */
+ */
void handle_filed_connection(BSOCK *fd, char *job_name)
{
JCR *jcr;
- bmicrosleep(0, 50000); /* wait 50 millisecs */
+ bmicrosleep(0, 50000); /* wait 50 millisecs */
if (!(jcr=get_jcr_by_full_name(job_name))) {
Jmsg1(NULL, M_FATAL, 0, _("Job name not found: %s\n"), job_name);
Dmsg1(100, "Job name not found: %s\n", 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",
- jcr->JobId, jcr->Job);
+ Jmsg2(jcr, M_FATAL, 0, _("Hey!!!! JobId %u Job %s already authenticated.\n"),
+ jcr->JobId, jcr->Job);
free_jcr(jcr);
return;
}
-
+
/*
* Authenticate the File daemon
*/
}
-/*
- * Use Device command from Director
- * He tells is what Device Name to use, the Media Type,
- * the Pool Name, and the Pool Type.
+#ifdef needed
+/*
+ * Query Device command from Director
+ * Sends Storage Daemon's information on the device to the
+ * caller (presumably the Director).
+ * This command always returns "true" so that the line is
+ * not closed on an error.
*
- * Ensure that the device exists and is opened, then store
- * the media and pool info in the JCR.
*/
-static bool use_device_cmd(JCR *jcr)
+bool query_cmd(JCR *jcr)
{
- POOL_MEM dev_name, media_type, pool_name, pool_type;
+ POOL_MEM dev_name, VolumeName, MediaType, ChangerName;
BSOCK *dir = jcr->dir_bsock;
DEVRES *device;
+ AUTOCHANGER *changer;
+ bool ok;
- if (bnet_recv(dir) <= 0) {
- Jmsg0(jcr, M_FATAL, 0, _("No Device from Director\n"));
- return false;
- }
-
- Dmsg1(120, "Use device: %s", dir->msg);
- if (sscanf(dir->msg, use_device, dev_name.c_str(), media_type.c_str(),
- pool_name.c_str(), pool_type.c_str()) == 4) {
+ Dmsg1(100, "Query_cmd: %s", dir->msg);
+ ok = sscanf(dir->msg, query_device, dev_name.c_str()) == 1;
+ Dmsg1(100, "<dird: %s\n", dir->msg);
+ if (ok) {
unbash_spaces(dev_name);
- unbash_spaces(media_type);
- unbash_spaces(pool_name);
- unbash_spaces(pool_type);
- 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 &&
- device->dev && strcmp(device->media_type, media_type.c_str()) == 0) {
- const int name_len = MAX_NAME_LENGTH;
- DCR *dcr;
- UnlockRes();
- dcr = new_dcr(jcr, device->dev);
- if (!dcr) {
- return false;
- }
- Dmsg1(120, "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);
- jcr->device = device;
- Dmsg1(220, "Got: %s", dir->msg);
- return bnet_fsend(dir, OK_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, device);
+ }
+ if (!device->dev) {
+ break;
+ }
+// UnlockRes();
+ ok = dir_update_device(jcr, device->dev);
+ if (ok) {
+ ok = bnet_fsend(dir, OK_query);
+ } else {
+ bnet_fsend(dir, NO_query);
+ }
+ return ok;
+ }
}
- UnlockRes();
- if (verbose) {
- unbash_spaces(dir->msg);
- pm_strcpy(jcr->errmsg, dir->msg);
- Jmsg(jcr, M_INFO, 0, _("Failed command: %s\n"), jcr->errmsg);
+ 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();
+ if (!changer->device || changer->device->size() == 0) {
+ continue; /* no devices */
+ }
+ ok = dir_update_changer(jcr, changer);
+ if (ok) {
+ ok = bnet_fsend(dir, OK_query);
+ } else {
+ bnet_fsend(dir, NO_query);
+ }
+ return ok;
+ }
}
- 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());
+ /* If we get here, the device/autochanger was not found */
+// UnlockRes();
+ unbash_spaces(dir->msg);
+ pm_strcpy(jcr->errmsg, dir->msg);
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);
+ bnet_fsend(dir, BAD_query, jcr->errmsg);
+ Dmsg1(100, ">dird: %s\n", dir->msg);
}
- return false; /* ERROR return */
+ return true;
}
-/*
+#endif
+
+
+/*
* Destroy the Job Control Record and associated
* resources (sockets).
*/
-void stored_free_jcr(JCR *jcr)
+void stored_free_jcr(JCR *jcr)
{
if (jcr->file_bsock) {
bnet_close(jcr->file_bsock);
Emsg0(M_FATAL, 0, _("In free_jcr(), but still attached to device!!!!\n"));
}
pthread_cond_destroy(&jcr->job_start_wait);
+ if (jcr->dcrs) {
+ delete jcr->dcrs;
+ }
+ jcr->dcrs = NULL;
if (jcr->dcr) {
free_dcr(jcr->dcr);
jcr->dcr = NULL;
projects / bacula / bacula / blobdiff