* Version $Id$
*/
/*
- Copyright (C) 2000-2005 Kern Sibbald
+ Copyright (C) 2000-2006 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.
*/
/* Commands sent to Storage daemon */
static char jobcmd[] = "JobId=%d job=%s job_name=%s client_name=%s "
"type=%d level=%d FileSet=%s NoAttr=%d SpoolAttr=%d FileSetMD5=%s "
- "SpoolData=%d WritePartAfterJob=%d NewVol=%d\n";
+ "SpoolData=%d WritePartAfterJob=%d PreferMountedVols=%d\n";
static char use_storage[] = "use storage=%s media_type=%s pool_name=%s "
"pool_type=%s append=%d copy=%d stripe=%d\n";
static char use_device[] = "use device=%s\n";
-//static char query_device[] = "query device=%s";
+//static char query_device[] = _("query device=%s");
/* Response from Storage daemon */
static char OKjob[] = "3000 OK Job SDid=%d SDtime=%d Authorization=%100s\n";
/* Storage Daemon requests */
static char Job_start[] = "3010 Job %127s start\n";
static char Job_end[] =
- "3099 Job %127s end JobStatus=%d JobFiles=%d JobBytes=%" lld "\n";
+ "3099 Job %127s end JobStatus=%d JobFiles=%d JobBytes=%lld\n";
/* Forward referenced functions */
extern "C" void *msg_thread(void *arg);
/*
* Start a job with the Storage daemon
*/
-int start_storage_daemon_job(JCR *jcr, alist *store, int append)
+bool start_storage_daemon_job(JCR *jcr, alist *rstore, alist *wstore)
{
- bool ok = false;
+ bool ok = true;
STORE *storage;
BSOCK *sd;
char auth_key[100];
POOL_MEM store_name, device_name, pool_name, pool_type, media_type;
- char PoolId[50];
int copy = 0;
int stripe = 0;
jcr->client->hdr.name, jcr->JobType, jcr->JobLevel,
jcr->fileset->hdr.name, !jcr->pool->catalog_files,
jcr->job->SpoolAttributes, jcr->fileset->MD5, jcr->spool_data,
- jcr->write_part_after_job, jcr->job->NewVolEachJob);
+ jcr->write_part_after_job, jcr->job->PreferMountedVolumes);
Dmsg1(100, ">stored: %s\n", sd->msg);
unbash_spaces(jcr->job->hdr.name);
unbash_spaces(jcr->client->hdr.name);
pm_strcpy(pool_name, jcr->pool->hdr.name);
bash_spaces(pool_type);
bash_spaces(pool_name);
- edit_int64(jcr->PoolId, PoolId);
/*
* We have two loops here. The first comes from the
* associated with each Storage. It selects the first
* available one.
*
- * Note, the outer loop is not yet implemented.
*/
-// foreach_alist(storage, store) {
- storage = (STORE *)store->first();
- pm_strcpy(store_name, storage->hdr.name);
- bash_spaces(store_name);
- pm_strcpy(media_type, storage->media_type);
- bash_spaces(media_type);
- bnet_fsend(sd, use_storage, store_name.c_str(), media_type.c_str(),
- pool_name.c_str(), pool_type.c_str(), append, copy, stripe);
-
- DEVICE *dev;
- /* Loop over alternative storage Devices until one is OK */
- foreach_alist(dev, storage->device) {
- pm_strcpy(device_name, dev->hdr.name);
- bash_spaces(device_name);
- bnet_fsend(sd, use_device, device_name.c_str());
- Dmsg1(100, ">stored: %s", sd->msg);
+ /* Do read side of storage daemon */
+ if (ok && rstore) {
+ foreach_alist(storage, rstore) {
+ pm_strcpy(store_name, storage->hdr.name);
+ bash_spaces(store_name);
+ pm_strcpy(media_type, storage->media_type);
+ bash_spaces(media_type);
+ bnet_fsend(sd, use_storage, store_name.c_str(), media_type.c_str(),
+ pool_name.c_str(), pool_type.c_str(), 0, copy, stripe);
+
+ DEVICE *dev;
+ /* Loop over alternative storage Devices until one is OK */
+ foreach_alist(dev, storage->device) {
+ pm_strcpy(device_name, dev->hdr.name);
+ bash_spaces(device_name);
+ bnet_fsend(sd, use_device, device_name.c_str());
+ Dmsg1(100, ">stored: %s", sd->msg);
+ }
+ bnet_sig(sd, BNET_EOD); /* end of Devices */
+ }
+ bnet_sig(sd, BNET_EOD); /* end of Storages */
+ if (bget_dirmsg(sd) > 0) {
+ Dmsg1(100, "<stored: %s", sd->msg);
+ /* ****FIXME**** save actual device name */
+ ok = sscanf(sd->msg, OK_device, device_name.c_str()) == 1;
+ } else {
+ POOL_MEM err_msg;
+ pm_strcpy(err_msg, sd->msg); /* save message */
+ Jmsg(jcr, M_FATAL, 0, _("\n"
+ " Storage daemon didn't accept Device \"%s\" because:\n %s"),
+ device_name.c_str(), err_msg.c_str()/* sd->msg */);
+ ok = false;
+ }
+ }
+
+ /* Do write side of storage daemon */
+ if (ok && wstore) {
+ foreach_alist(storage, wstore) {
+ pm_strcpy(store_name, storage->hdr.name);
+ bash_spaces(store_name);
+ pm_strcpy(media_type, storage->media_type);
+ bash_spaces(media_type);
+ bnet_fsend(sd, use_storage, store_name.c_str(), media_type.c_str(),
+ pool_name.c_str(), pool_type.c_str(), 1, copy, stripe);
+
+ DEVICE *dev;
+ /* Loop over alternative storage Devices until one is OK */
+ foreach_alist(dev, storage->device) {
+ pm_strcpy(device_name, dev->hdr.name);
+ bash_spaces(device_name);
+ bnet_fsend(sd, use_device, device_name.c_str());
+ Dmsg1(100, ">stored: %s", sd->msg);
+ }
+ bnet_sig(sd, BNET_EOD); /* end of Devices */
}
- bnet_sig(sd, BNET_EOD);
+ bnet_sig(sd, BNET_EOD); /* end of Storages */
if (bget_dirmsg(sd) > 0) {
Dmsg1(100, "<stored: %s", sd->msg);
/* ****FIXME**** save actual device name */
} else {
POOL_MEM err_msg;
pm_strcpy(err_msg, sd->msg); /* save message */
- Jmsg(jcr, M_WARNING, 0, _("\n"
+ Jmsg(jcr, M_FATAL, 0, _("\n"
" Storage daemon didn't accept Device \"%s\" because:\n %s"),
device_name.c_str(), err_msg.c_str()/* sd->msg */);
+ ok = false;
}
-// if (!ok) {
-// break;
-// }
-// }
- if (ok) {
- ok = bnet_fsend(sd, "run");
- Dmsg1(100, ">stored: %s\n", sd->msg);
}
return ok;
}
*/
Dmsg0(100, "Start msg_thread loop\n");
while ((stat=bget_dirmsg(sd)) >= 0) {
- Dmsg1(200, "<stored: %s", sd->msg);
- if (sscanf(sd->msg, Job_start, &Job) == 1) {
+ int stat;
+ Dmsg1(3400, "<stored: %s", sd->msg);
+ if (sscanf(sd->msg, Job_start, Job) == 1) {
continue;
}
- if (sscanf(sd->msg, Job_end, &Job, &JobStatus, &JobFiles,
- &JobBytes) == 4) {
+ if ((stat=sscanf(sd->msg, Job_end, Job, &JobStatus, &JobFiles,
+ &JobBytes)) == 4) {
jcr->SDJobStatus = JobStatus; /* termination status */
jcr->SDJobFiles = JobFiles;
jcr->SDJobBytes = JobBytes;
if (is_bnet_error(sd)) {
jcr->SDJobStatus = JS_ErrorTerminated;
}
- pthread_cleanup_pop(1);
+ pthread_cleanup_pop(1); /* remove and execute the handler */
return NULL;
}
projects / bacula / bacula / blobdiff