/*
- * Read code for Storage daemon
- *
- * Kern Sibbald, November MM
- *
- * Version $Id$
- */
-/*
- Copyright (C) 2000-2004 Kern Sibbald and John Walker
+ 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 as
- published by the Free Software Foundation; either version 2 of
- the License, or (at your option) any later version.
+ Copyright (C) 2000-2009 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
+ 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 three of the GNU Affero General Public
+ License as published by the Free Software Foundation and included
+ 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., 59 Temple Place - Suite 330, Boston,
- MA 02111-1307, USA.
+ You should have received a copy of the GNU Affero 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 Kern Sibbald.
+ The licensor of Bacula is the Free Software Foundation Europe
+ (FSFE), Fiduciary Program, Sumatrastrasse 25, 8006 Zürich,
+ Switzerland, email:ftf@fsfeurope.org.
+*/
+/*
+ * Read code for Storage daemon
+ *
+ * Kern Sibbald, November MM
+ *
+ * Version $Id$
*/
#include "bacula.h"
static char FD_error[] = "3000 error\n";
static char rec_header[] = "rechdr %ld %ld %ld %ld %ld";
-/*
+/*
* Read Data and send to File Daemon
* Returns: false on failure
- * true on success
+ * true on success
*/
-bool do_read_data(JCR *jcr)
+bool do_read_data(JCR *jcr)
{
BSOCK *fd = jcr->file_bsock;
bool ok = true;
- DCR *dcr;
-
+ DCR *dcr = jcr->read_dcr;
+
Dmsg0(20, "Start read data.\n");
- if (!bnet_set_buffer_size(fd, jcr->device->max_network_buffer_size, BNET_SETBUF_WRITE)) {
+ if (!bnet_set_buffer_size(fd, dcr->device->max_network_buffer_size, BNET_SETBUF_WRITE)) {
return false;
}
-
- create_vol_list(jcr);
- if (jcr->NumVolumes == 0) {
+ if (jcr->NumReadVolumes == 0) {
Jmsg(jcr, M_FATAL, 0, _("No Volume names found for restore.\n"));
- free_vol_list(jcr);
- bnet_fsend(fd, FD_error);
+ fd->fsend(FD_error);
return false;
}
- Dmsg2(200, "Found %d volumes names to restore. First=%s\n", jcr->NumVolumes,
+ Dmsg2(200, "Found %d volumes names to restore. First=%s\n", jcr->NumReadVolumes,
jcr->VolList->VolumeName);
- /*
- * Ready device for reading, and read records
- */
- if (!(dcr=acquire_device_for_read(jcr))) {
- free_vol_list(jcr);
+ /* Ready device for reading */
+ if (!acquire_device_for_read(dcr)) {
+ fd->fsend(FD_error);
return false;
}
/* Tell File daemon we will send data */
- bnet_fsend(fd, OK_data);
+ fd->fsend(OK_data);
+ set_jcr_job_status(jcr, JS_Running);
+ dir_send_job_status(jcr);
ok = read_records(dcr, record_cb, mount_next_read_volume);
/* Send end of data to FD */
- bnet_sig(fd, BNET_EOD);
+ fd->signal(BNET_EOD);
- if (!release_device(jcr)) {
+ if (!release_device(jcr->read_dcr)) {
ok = false;
}
-
- free_vol_list(jcr);
+
Dmsg0(30, "Done reading.\n");
return ok;
}
/*
* Called here for each record from read_records()
* Returns: true if OK
- * false if error
+ * false if error
*/
static bool record_cb(DCR *dcr, DEV_RECORD *rec)
{
BSOCK *fd = jcr->file_bsock;
bool ok = true;
POOLMEM *save_msg;
+ char ec1[50], ec2[50];
if (rec->FileIndex < 0) {
return true;
}
- Dmsg5(100, "Send to FD: SessId=%u SessTim=%u FI=%d Strm=%d, len=%d\n",
- rec->VolSessionId, rec->VolSessionTime, rec->FileIndex, rec->Stream,
+ Dmsg5(400, "Send to FD: SessId=%u SessTim=%u FI=%s Strm=%s, len=%d\n",
+ rec->VolSessionId, rec->VolSessionTime,
+ FI_to_ascii(ec1, rec->FileIndex),
+ stream_to_ascii(ec2, rec->Stream, rec->FileIndex),
rec->data_len);
/* Send record header to File daemon */
- if (!bnet_fsend(fd, rec_header, rec->VolSessionId, rec->VolSessionTime,
- rec->FileIndex, rec->Stream, rec->data_len)) {
- Dmsg1(30, ">filed: Error Hdr=%s\n", fd->msg);
+ if (!fd->fsend(rec_header, rec->VolSessionId, rec->VolSessionTime,
+ rec->FileIndex, rec->Stream, rec->data_len)) {
+ Pmsg1(000, _(">filed: Error Hdr=%s\n"), fd->msg);
Jmsg1(jcr, M_FATAL, 0, _("Error sending to File daemon. ERR=%s\n"),
- bnet_strerror(fd));
+ fd->bstrerror());
return false;
} else {
- Dmsg1(30, ">filed: Hdr=%s\n", fd->msg);
+ Dmsg1(400, ">filed: Hdr=%s\n", fd->msg);
}
/* Send data record to File daemon */
- save_msg = fd->msg; /* save fd message pointer */
- fd->msg = rec->data; /* pass data directly to bnet_send */
+ save_msg = fd->msg; /* save fd message pointer */
+ fd->msg = rec->data; /* pass data directly to the FD */
fd->msglen = rec->data_len;
- Dmsg1(30, ">filed: send %d bytes data.\n", fd->msglen);
- if (!bnet_send(fd)) {
- Pmsg1(000, "Error sending to FD. ERR=%s\n", bnet_strerror(fd));
+ Dmsg1(400, ">filed: send %d bytes data.\n", fd->msglen);
+ if (!fd->send()) {
+ Pmsg1(000, _("Error sending to FD. ERR=%s\n"), fd->bstrerror());
Jmsg1(jcr, M_FATAL, 0, _("Error sending to File daemon. ERR=%s\n"),
- bnet_strerror(fd));
+ fd->bstrerror());
ok = false;
}
- fd->msg = save_msg; /* restore fd message pointer */
+ fd->msg = save_msg; /* restore fd message pointer */
return ok;
}
projects / bacula / bacula / blobdiff