X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=bacula%2Fsrc%2Fstored%2Fappend.c;h=8fddd1fe05c94a46387da5981e2bfcb6d0f65090;hb=6bca97aa2a205e95c82ac1900a59f50344658200;hp=89953b466b066e6d136086025285b54cea0652c7;hpb=ce1baad9e151607dd3425738169d1565214a44f6;p=bacula%2Fbacula diff --git a/bacula/src/stored/append.c b/bacula/src/stored/append.c index 89953b466b..8fddd1fe05 100644 --- a/bacula/src/stored/append.c +++ b/bacula/src/stored/append.c @@ -1,23 +1,36 @@ +/* + Bacula® - The Network Backup Solution + + Copyright (C) 2000-2009 Free Software Foundation Europe e.V. + + 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 two of the GNU 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., 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. +*/ /* * Append code for Storage daemon * Kern Sibbald, May MM * * Version $Id$ */ -/* - 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 - 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 - the file LICENSE for additional details. - - */ #include "bacula.h" #include "stored.h" @@ -25,6 +38,7 @@ /* Responses sent to the File daemon */ static char OK_data[] = "3000 OK data\n"; +static char OK_append[] = "3000 OK append data\n"; /* Forward referenced functions */ @@ -56,13 +70,13 @@ bool do_append_data(JCR *jcr) return false; } - Dmsg1(100, "Start append data. res=%d\n", dev->reserved_device); + Dmsg1(100, "Start append data. res=%d\n", dev->num_reserved()); memset(&rec, 0, sizeof(rec)); ds = fd_sock; - if (!bnet_set_buffer_size(ds, dcr->device->max_network_buffer_size, BNET_SETBUF_WRITE)) { + if (!ds->set_buffer_size(dcr->device->max_network_buffer_size, BNET_SETBUF_WRITE)) { set_jcr_job_status(jcr, JS_ErrorTerminated); Jmsg0(jcr, M_FATAL, 0, _("Unable to set network buffer size.\n")); return false; @@ -70,7 +84,6 @@ bool do_append_data(JCR *jcr) if (!acquire_device_for_append(dcr)) { set_jcr_job_status(jcr, JS_ErrorTerminated); - jcr->dcr = NULL; return false; } @@ -103,10 +116,10 @@ bool do_append_data(JCR *jcr) } /* Tell File daemon to send data */ - if (!bnet_fsend(fd_sock, OK_data)) { + if (!fd_sock->fsend(OK_data)) { berrno be; Jmsg1(jcr, M_FATAL, 0, _("Network send error to FD. ERR=%s\n"), - be.strerror(fd_sock->b_errno)); + be.bstrerror(fd_sock->b_errno)); ok = false; } @@ -135,7 +148,7 @@ bool do_append_data(JCR *jcr) * The stream header consists of the following: * file_index (sequential Bacula file index, base 1) * stream (Bacula number to distinguish parts of data) - * info (Info for Storage daemon -- compressed, encryped, ...) + * info (Info for Storage daemon -- compressed, encrypted, ...) * info is not currently used, so is read, but ignored! */ if ((n=bget_msg(ds)) <= 0) { @@ -143,32 +156,16 @@ bool do_append_data(JCR *jcr) break; /* end of data */ } Jmsg1(jcr, M_FATAL, 0, _("Error reading data header from FD. ERR=%s\n"), - bnet_strerror(ds)); + ds->bstrerror()); ok = false; break; } - /* - * This hand scanning is a bit more complicated than a simple - * sscanf, but it allows us to handle any size integer up to - * int64_t without worrying about whether %d, %ld, %lld, or %q - * is the correct format for each different architecture. - * It is a real pity that sscanf() is not portable. - */ - char *p = ds->msg; - while (B_ISSPACE(*p)) { - p++; - } - file_index = (int32_t)str_to_int64(p); - while (B_ISDIGIT(*p)) { - p++; - } - if (!B_ISSPACE(*p) || !B_ISDIGIT(*(p+1))) { + if (sscanf(ds->msg, "%ld %ld", &file_index, &stream) != 2) { Jmsg1(jcr, M_FATAL, 0, _("Malformed data header from FD: %s\n"), ds->msg); ok = false; break; } - stream = (int32_t)str_to_int64(p); Dmsg2(890, "no_attributes) { + BSOCK *dir = jcr->dir_bsock; if (are_attributes_spooled(jcr)) { - jcr->dir_bsock->spool = true; + dir->set_spooling(); } Dmsg0(850, "Send attributes to dir.\n"); if (!dir_update_file_attributes(dcr, &rec)) { - jcr->dir_bsock->spool = false; + dir->clear_spooling(); Jmsg(jcr, M_FATAL, 0, _("Error updating file attributes. ERR=%s\n"), - bnet_strerror(jcr->dir_bsock)); + dir->bstrerror()); ok = false; break; } - jcr->dir_bsock->spool = false; + dir->clear_spooling(); } } Dmsg0(650, "Enter bnet_get\n"); } Dmsg1(650, "End read loop with FD. Stat=%d\n", n); - if (is_bnet_error(ds)) { - Dmsg1(350, "Network read error from FD. ERR=%s\n", bnet_strerror(ds)); + if (ds->is_error()) { + Dmsg1(350, "Network read error from FD. ERR=%s\n", ds->bstrerror()); Jmsg1(jcr, M_FATAL, 0, _("Network error on data channel. ERR=%s\n"), - bnet_strerror(ds)); + ds->bstrerror()); ok = false; break; } } - time_t job_elapsed = time(NULL) - jcr->run_time; + /* Create Job status for end of session label */ + set_jcr_job_status(jcr, ok?JS_Terminated:JS_ErrorTerminated); + + /* Terminate connection with FD */ + ds->fsend(OK_append); + do_fd_commands(jcr); /* finish dialog with FD */ + + /* + * Don't use time_t for job_elapsed as time_t can be 32 or 64 bits, + * and the subsequent Jmsg() editing will break + */ + int32_t job_elapsed = time(NULL) - jcr->run_time; if (job_elapsed <= 0) { job_elapsed = 1; } - Jmsg(dcr->jcr, M_INFO, 0, _("Job write elapsed time = %02d:%02d:%02d, Transfer rate = %s bytes/second\n"), + Jmsg(dcr->jcr, M_INFO, 0, _("Job write elapsed time = %02d:%02d:%02d, Transfer rate = %s Bytes/second\n"), job_elapsed / 3600, job_elapsed % 3600 / 60, job_elapsed % 60, edit_uint64_with_suffix(jcr->JobBytes / job_elapsed, ec)); - /* Create Job status for end of session label */ - set_jcr_job_status(jcr, ok?JS_Terminated:JS_ErrorTerminated); Dmsg1(200, "Write EOS label JobStatus=%c\n", jcr->JobStatus); /* - * If !OK, check if we can still write. This may not be the case + * Check if we can still write. This may not be the case * if we are at the end of the tape or we got a fatal I/O error. */ if (ok || dev->can_write()) { if (!write_session_label(dcr, EOS_LABEL)) { - Jmsg1(jcr, M_FATAL, 0, _("Error writting end session label. ERR=%s\n"), + Jmsg1(jcr, M_FATAL, 0, _("Error writing end session label. ERR=%s\n"), dev->bstrerror()); set_jcr_job_status(jcr, JS_ErrorTerminated); ok = false; } if (dev->VolCatInfo.VolCatName[0] == 0) { Pmsg0(000, _("NULL Volume name. This shouldn't happen!!!\n")); + Dmsg0(000, _("NULL Volume name. This shouldn't happen!!!\n")); } Dmsg0(90, "back from write_end_session_label()\n"); /* Flush out final partial block of this session */ @@ -286,10 +294,12 @@ bool do_append_data(JCR *jcr) Dmsg0(100, _("Set ok=FALSE after write_block_to_device.\n")); ok = false; } + if (dev->VolCatInfo.VolCatName[0] == 0) { + Pmsg0(000, _("NULL Volume name. This shouldn't happen!!!\n")); + Dmsg0(000, _("NULL Volume name. This shouldn't happen!!!\n")); + } } - if (dev->VolCatInfo.VolCatName[0] == 0) { - Pmsg0(000, _("NULL Volume name. This shouldn't happen!!!\n")); - } + if (!ok) { discard_data_spool(dcr);