X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=bacula%2Fsrc%2Fstored%2Fappend.c;h=382dd2d556a8b0a1e46ca7ca33e11b9c501b330a;hb=bdcddd32cafd978761406b7ad3ca006597c8f1d7;hp=1e5b5f91ffce0f46a6e674a7b3fb3ad2308029ab;hpb=c37638750b04e222c9436d70c55d28193c58a86f;p=bacula%2Fbacula diff --git a/bacula/src/stored/append.c b/bacula/src/stored/append.c index 1e5b5f91ff..382dd2d556 100644 --- a/bacula/src/stored/append.c +++ b/bacula/src/stored/append.c @@ -1,20 +1,14 @@ -/* - * Append code for Storage daemon - * Kern Sibbald, May MM - * - * Version $Id$ - */ /* Bacula® - The Network Backup Solution - Copyright (C) 2000-2006 Free Software Foundation Europe e.V. + Copyright (C) 2000-2008 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 plus additions - that are listed in the file LICENSE. + 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 @@ -31,6 +25,12 @@ (FSFE), Fiduciary Program, Sumatrastrasse 25, 8006 Zürich, Switzerland, email:ftf@fsfeurope.org. */ +/* + * Append code for Storage daemon + * Kern Sibbald, May MM + * + * Version $Id$ + */ #include "bacula.h" #include "stored.h" @@ -38,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 */ @@ -69,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; @@ -83,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; } @@ -116,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; } @@ -156,7 +156,7 @@ 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; } @@ -236,17 +236,17 @@ bool do_append_data(JCR *jcr) crypto_digest_stream_type(stream) != CRYPTO_DIGEST_NONE) { if (!jcr->no_attributes) { if (are_attributes_spooled(jcr)) { - jcr->dir_bsock->spool = true; + jcr->dir_bsock->set_spooling(); } Dmsg0(850, "Send attributes to dir.\n"); if (!dir_update_file_attributes(dcr, &rec)) { - jcr->dir_bsock->spool = false; + jcr->dir_bsock->clear_spooling(); Jmsg(jcr, M_FATAL, 0, _("Error updating file attributes. ERR=%s\n"), - bnet_strerror(jcr->dir_bsock)); + jcr->dir_bsock->bstrerror()); ok = false; break; } - jcr->dir_bsock->spool = false; + jcr->dir_bsock->clear_spooling(); } } Dmsg0(650, "Enter bnet_get\n"); @@ -254,14 +254,22 @@ bool do_append_data(JCR *jcr) 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)); + 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; } } + /* 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 */ + + time_t job_elapsed = time(NULL) - jcr->run_time; if (job_elapsed <= 0) { @@ -272,13 +280,11 @@ bool do_append_data(JCR *jcr) 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()) { @@ -290,6 +296,7 @@ bool do_append_data(JCR *jcr) } 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 */ @@ -299,10 +306,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);