X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=bacula%2Fsrc%2Fstored%2Fappend.c;h=78c85243699fce3a848016aa43fb486c0148999d;hb=5acaefa52eef9207ee62d4fe9d231701c0dc4529;hp=6a57c14b47cf0ddf5a8dc8d1533f629e0ef20af6;hpb=23392837f61fc878b87f5acb07d1a8cfb128b25d;p=bacula%2Fbacula diff --git a/bacula/src/stored/append.c b/bacula/src/stored/append.c index 6a57c14b47..78c8524369 100644 --- a/bacula/src/stored/append.c +++ b/bacula/src/stored/append.c @@ -7,7 +7,7 @@ /* Bacula® - The Network Backup Solution - Copyright (C) 2000-2006 Free Software Foundation Europe e.V. + Copyright (C) 2000-2007 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. @@ -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 */ @@ -261,6 +262,14 @@ bool do_append_data(JCR *jcr) } } + /* Create Job status for end of session label */ + set_jcr_job_status(jcr, ok?JS_Terminated:JS_ErrorTerminated); + + /* Terminate connection with FD */ + bnet_fsend(ds, OK_append); + do_fd_commands(jcr); /* finish dialog with FD */ + + time_t job_elapsed = time(NULL) - jcr->run_time; if (job_elapsed <= 0) { @@ -271,8 +280,6 @@ 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); @@ -298,10 +305,11 @@ 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")); + } } - if (dev->VolCatInfo.VolCatName[0] == 0) { - Pmsg0(000, _("NULL Volume name. This shouldn't happen!!!\n")); - } + if (!ok) { discard_data_spool(dcr);