X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;ds=sidebyside;f=bacula%2Fsrc%2Fdird%2Fbackup.c;h=96ed0787282f1c7f1463b957f9e48625a755042b;hb=ec7eb240abd60e667d1a26f89df1b064e1b3786d;hp=292857a20732ed5488875015b1984f393f36071f;hpb=fe3cc7407f557f6881075dd6e546fef71a5afdee;p=bacula%2Fbacula diff --git a/bacula/src/dird/backup.c b/bacula/src/dird/backup.c index 292857a207..96ed078728 100644 --- a/bacula/src/dird/backup.c +++ b/bacula/src/dird/backup.c @@ -1,3 +1,30 @@ +/* + Bacula® - The Network Backup Solution + + 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. + 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 John Walker. + The licensor of Bacula is the Free Software Foundation Europe + (FSFE), Fiduciary Program, Sumatrastrasse 25, 8006 Zürich, + Switzerland, email:ftf@fsfeurope.org. +*/ /* * * Bacula Director -- backup.c -- responsible for doing backup jobs @@ -13,20 +40,6 @@ * * 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 "dird.h" @@ -40,15 +53,19 @@ static char storaddr[] = "storage address=%s port=%d ssl=%d\n"; static char OKbackup[] = "2000 OK backup\n"; static char OKstore[] = "2000 OK storage\n"; static char EndJob[] = "2800 End Job TermCode=%d JobFiles=%u " - "ReadBytes=%lld JobBytes=%lld Errors=%u\n"; - + "ReadBytes=%llu JobBytes=%llu Errors=%u " + "VSS=%d Encrypt=%d\n"; +/* Pre 1.39.29 (04Dec06) EndJob */ +static char OldEndJob[] = "2800 End Job TermCode=%d JobFiles=%u " + "ReadBytes=%llu JobBytes=%llu Errors=%u\n"; /* * Called here before the job is run to do the job * specific setup. */ bool do_backup_init(JCR *jcr) { - POOL_DBR pr; + + free_rstorage(jcr); /* we don't read so release */ if (!get_or_create_fileset_record(jcr)) { return false; @@ -59,50 +76,17 @@ bool do_backup_init(JCR *jcr) */ get_level_since_time(jcr, jcr->since, sizeof(jcr->since)); - /* - * Apply any level related Pool selections - */ - switch (jcr->JobLevel) { - case L_FULL: - if (jcr->full_pool) { - jcr->pool = jcr->full_pool; - } - break; - case L_INCREMENTAL: - if (jcr->inc_pool) { - jcr->pool = jcr->inc_pool; - } - break; - case L_DIFFERENTIAL: - if (jcr->dif_pool) { - jcr->pool = jcr->dif_pool; - } - break; - } - memset(&pr, 0, sizeof(pr)); - bstrncpy(pr.Name, jcr->pool->hdr.name, sizeof(pr.Name)); + apply_pool_overrides(jcr); - if (!db_get_pool_record(jcr, jcr->db, &pr)) { /* get by Name */ - /* Try to create the pool */ - if (create_pool(jcr, jcr->db, jcr->pool, POOL_OP_CREATE) < 0) { - Jmsg(jcr, M_FATAL, 0, _("Pool %s not in database. %s"), pr.Name, - db_strerror(jcr->db)); - return false; - } else { - Jmsg(jcr, M_INFO, 0, _("Pool %s created in database.\n"), pr.Name); - if (!db_get_pool_record(jcr, jcr->db, &pr)) { /* get by Name */ - Jmsg(jcr, M_FATAL, 0, _("Pool %s not in database. %s"), pr.Name, - db_strerror(jcr->db)); - return false; - } - } + jcr->jr.PoolId = get_or_create_pool_record(jcr, jcr->pool->name()); + if (jcr->jr.PoolId == 0) { + return false; } - jcr->jr.PoolId = pr.PoolId; /* If pool storage specified, use it instead of job storage */ - copy_storage(jcr, jcr->pool->storage); + copy_wstorage(jcr, jcr->pool->storage, _("Pool resource")); - if (!jcr->storage) { + if (!jcr->wstorage) { Jmsg(jcr, M_FATAL, 0, _("No Storage specification found in Job or Pool.\n")); return false; } @@ -155,9 +139,19 @@ bool do_backup(JCR *jcr) /* * Now start a job with the Storage daemon */ - if (!start_storage_daemon_job(jcr, NULL, jcr->storage)) { + if (!start_storage_daemon_job(jcr, NULL, jcr->wstorage)) { + return false; + } + + /* + * Start the job prior to starting the message thread below + * to avoid two threads from using the BSOCK structure at + * the same time. + */ + if (!bnet_fsend(jcr->store_bsock, "run")) { return false; } + /* * Now start a Storage daemon message thread. Note, * this thread is used to provide the catalog services @@ -169,10 +163,6 @@ bool do_backup(JCR *jcr) } Dmsg0(150, "Storage daemon connection OK\n"); - if (!bnet_fsend(jcr->store_bsock, "run")) { - goto bail_out; - } - set_jcr_job_status(jcr, JS_WaitFD); if (!connect_to_file_daemon(jcr, 10, FDConnectTimeout, 1)) { goto bail_out; @@ -196,7 +186,7 @@ bool do_backup(JCR *jcr) /* * send Storage daemon address to the File daemon */ - store = jcr->store; + store = jcr->wstore; if (store->SDDport == 0) { store->SDDport = store->SDport; } @@ -210,24 +200,40 @@ bool do_backup(JCR *jcr) } } - bnet_fsend(fd, storaddr, store->address, store->SDDport, tls_need); + fd->fsend(storaddr, store->address, store->SDDport, tls_need); if (!response(jcr, fd, OKstore, "Storage", DISPLAY_ERROR)) { goto bail_out; } - - if (!send_run_before_and_after_commands(jcr)) { + if (!send_runscripts_commands(jcr)) { goto bail_out; } + /* + * We re-update the job start record so that the start + * time is set after the run before job. This avoids + * that any files created by the run before job will + * be saved twice. They will be backed up in the current + * job, but not in the next one unless they are changed. + * Without this, they will be backed up in this job and + * in the next job run because in that case, their date + * is after the start of this run. + */ + jcr->start_time = time(NULL); + jcr->jr.StartTime = jcr->start_time; + if (!db_update_job_start_record(jcr, jcr->db, &jcr->jr)) { + Jmsg(jcr, M_FATAL, 0, "%s", db_strerror(jcr->db)); + } + /* Send backup command */ - bnet_fsend(fd, backupcmd); + fd->fsend(backupcmd); if (!response(jcr, fd, OKbackup, "backup", DISPLAY_ERROR)) { goto bail_out; } /* Pickup Job termination data */ stat = wait_for_job_termination(jcr); + db_write_batch_file_records(jcr); /* used by bulk batch file insert */ if (stat == JS_Terminated) { backup_cleanup(jcr, stat); return true; @@ -238,6 +244,8 @@ bool do_backup(JCR *jcr) bail_out: set_jcr_job_status(jcr, JS_ErrorTerminated); Dmsg1(400, "wait for sd. use=%d\n", jcr->use_count()); + /* Cancel SD */ + cancel_storage_daemon_job(jcr); wait_for_storage_daemon_termination(jcr); Dmsg1(400, "after wait for sd. use=%d\n", jcr->use_count()); return false; @@ -256,13 +264,19 @@ int wait_for_job_termination(JCR *jcr) BSOCK *fd = jcr->file_bsock; bool fd_ok = false; uint32_t JobFiles, Errors; - uint64_t ReadBytes, JobBytes; + uint64_t ReadBytes = 0; + uint64_t JobBytes = 0; + int VSS = 0; + int Encrypt = 0; set_jcr_job_status(jcr, JS_Running); /* Wait for Client to terminate */ while ((n = bget_dirmsg(fd)) >= 0) { - if (!fd_ok && sscanf(fd->msg, EndJob, &jcr->FDJobStatus, &JobFiles, - &ReadBytes, &JobBytes, &Errors) == 5) { + if (!fd_ok && + (sscanf(fd->msg, EndJob, &jcr->FDJobStatus, &JobFiles, + &ReadBytes, &JobBytes, &Errors, &VSS, &Encrypt) == 7 || + sscanf(fd->msg, OldEndJob, &jcr->FDJobStatus, &JobFiles, + &ReadBytes, &JobBytes, &Errors) == 5)) { fd_ok = true; set_jcr_job_status(jcr, jcr->FDJobStatus); Dmsg1(100, "FDStatus=%c\n", (char)jcr->JobStatus); @@ -274,11 +288,17 @@ int wait_for_job_termination(JCR *jcr) break; } } + if (is_bnet_error(fd)) { Jmsg(jcr, M_FATAL, 0, _("Network error with FD during %s: ERR=%s\n"), - job_type_to_str(jcr->JobType), bnet_strerror(fd)); + job_type_to_str(jcr->JobType), fd->bstrerror()); + } + fd->signal(BNET_TERMINATE); /* tell Client we are terminating */ + + /* Force cancel in SD if failing */ + if (job_canceled(jcr) || !fd_ok) { + cancel_storage_daemon_job(jcr); } - bnet_sig(fd, BNET_TERMINATE); /* tell Client we are terminating */ /* Note, the SD stores in jcr->JobFiles/ReadBytes/JobBytes/Errors */ wait_for_storage_daemon_termination(jcr); @@ -290,6 +310,8 @@ int wait_for_job_termination(JCR *jcr) jcr->Errors = Errors; jcr->ReadBytes = ReadBytes; jcr->JobBytes = JobBytes; + jcr->VSS = VSS; + jcr->Encrypt = Encrypt; } else { Jmsg(jcr, M_FATAL, 0, _("No Job status returned from FD.\n")); } @@ -320,29 +342,27 @@ void backup_cleanup(JCR *jcr, int TermCode) char ec6[30], ec7[30], ec8[30], elapsed[50]; char term_code[100], fd_term_msg[100], sd_term_msg[100]; const char *term_msg; - int msg_type; + int msg_type = M_INFO; MEDIA_DBR mr; CLIENT_DBR cr; double kbps, compression; utime_t RunTime; Dmsg2(100, "Enter backup_cleanup %d %c\n", TermCode, TermCode); - dequeue_messages(jcr); /* display any queued messages */ memset(&mr, 0, sizeof(mr)); memset(&cr, 0, sizeof(cr)); - set_jcr_job_status(jcr, TermCode); - update_job_end_record(jcr); /* update database */ + update_job_end(jcr, TermCode); if (!db_get_job_record(jcr, jcr->db, &jcr->jr)) { - Jmsg(jcr, M_WARNING, 0, _("Error getting job record for stats: %s"), + Jmsg(jcr, M_WARNING, 0, _("Error getting Job record for Job report: ERR=%s"), db_strerror(jcr->db)); set_jcr_job_status(jcr, JS_ErrorTerminated); } - bstrncpy(cr.Name, jcr->client->hdr.name, sizeof(cr.Name)); + bstrncpy(cr.Name, jcr->client->name(), sizeof(cr.Name)); if (!db_get_client_record(jcr, jcr->db, &cr)) { - Jmsg(jcr, M_WARNING, 0, _("Error getting client record for stats: %s"), + Jmsg(jcr, M_WARNING, 0, _("Error getting Client record for Job report: ERR=%s"), db_strerror(jcr->db)); } @@ -355,7 +375,6 @@ void backup_cleanup(JCR *jcr, int TermCode) update_bootstrap_file(jcr); - msg_type = M_INFO; /* by default INFO message */ switch (jcr->JobStatus) { case JS_Terminated: if (jcr->Errors || jcr->SDErrors) { @@ -369,7 +388,7 @@ void backup_cleanup(JCR *jcr, int TermCode) term_msg = _("*** Backup Error ***"); msg_type = M_ERROR; /* Generate error message */ if (jcr->store_bsock) { - bnet_sig(jcr->store_bsock, BNET_TERMINATE); + jcr->store_bsock->signal(BNET_TERMINATE); if (jcr->SD_msg_chan) { pthread_cancel(jcr->SD_msg_chan); } @@ -378,7 +397,7 @@ void backup_cleanup(JCR *jcr, int TermCode) case JS_Canceled: term_msg = _("Backup Canceled"); if (jcr->store_bsock) { - bnet_sig(jcr->store_bsock, BNET_TERMINATE); + jcr->store_bsock->signal(BNET_TERMINATE); if (jcr->SD_msg_chan) { pthread_cancel(jcr->SD_msg_chan); } @@ -426,14 +445,15 @@ void backup_cleanup(JCR *jcr, int TermCode) // bmicrosleep(15, 0); /* for debugging SIGHUP */ - Jmsg(jcr, msg_type, 0, _("Bacula %s (%s): %s\n" + Jmsg(jcr, msg_type, 0, _("Bacula %s %s (%s): %s\n" +" Build OS: %s %s %s\n" " JobId: %d\n" " Job: %s\n" " Backup Level: %s%s\n" " Client: \"%s\" %s\n" " FileSet: \"%s\" %s\n" -" Pool: \"%s\"\n" -" Storage: \"%s\"\n" +" Pool: \"%s\" (From %s)\n" +" Storage: \"%s\" (From %s)\n" " Scheduled time: %s\n" " Start time: %s\n" " End time: %s\n" @@ -445,6 +465,8 @@ void backup_cleanup(JCR *jcr, int TermCode) " SD Bytes Written: %s (%sB)\n" " Rate: %.1f KB/s\n" " Software Compression: %s\n" +" VSS: %s\n" +" Storage Encryption: %s\n" " Volume name(s): %s\n" " Volume Session Id: %d\n" " Volume Session Time: %d\n" @@ -454,16 +476,15 @@ void backup_cleanup(JCR *jcr, int TermCode) " FD termination status: %s\n" " SD termination status: %s\n" " Termination: %s\n\n"), - VERSION, - LSMDATE, - edt, + my_name, VERSION, LSMDATE, edt, + HOST_OS, DISTNAME, DISTVER, jcr->jr.JobId, jcr->jr.Job, level_to_str(jcr->JobLevel), jcr->since, - jcr->client->hdr.name, cr.Uname, - jcr->fileset->hdr.name, jcr->FSCreateTime, - jcr->pool->hdr.name, - jcr->store->hdr.name, + jcr->client->name(), cr.Uname, + jcr->fileset->name(), jcr->FSCreateTime, + jcr->pool->name(), jcr->pool_source, + jcr->wstore->name(), jcr->wstore_source, schedt, sdt, edt, @@ -477,6 +498,8 @@ void backup_cleanup(JCR *jcr, int TermCode) edit_uint64_with_suffix(jcr->SDJobBytes, ec6), (float)kbps, compress, + jcr->VSS?"yes":"no", + jcr->Encrypt?"yes":"no", jcr->VolumeName, jcr->VolSessionId, jcr->VolSessionTime, @@ -499,19 +522,20 @@ void update_bootstrap_file(JCR *jcr) FILE *fd; BPIPE *bpipe = NULL; int got_pipe = 0; - char *fname = jcr->job->WriteBootstrap; + POOLMEM *fname = get_pool_memory(PM_FNAME); + fname = edit_job_codes(jcr, fname, jcr->job->WriteBootstrap, ""); + VOL_PARAMS *VolParams = NULL; int VolCount; char edt[50]; if (*fname == '|') { - fname++; got_pipe = 1; - bpipe = open_bpipe(fname, 0, "w"); + bpipe = open_bpipe(fname+1, 0, "w"); /* skip first char "|" */ fd = bpipe ? bpipe->wfd : NULL; } else { /* ***FIXME*** handle BASE */ - fd = fopen(fname, jcr->JobLevel==L_FULL?"w+":"a+"); + fd = fopen(fname, jcr->JobLevel==L_FULL?"w+b":"a+b"); } if (fd) { VolCount = db_get_job_volume_parameters(jcr, jcr->db, jcr->JobId, @@ -552,8 +576,9 @@ void update_bootstrap_file(JCR *jcr) } else { berrno be; Jmsg(jcr, M_ERROR, 0, _("Could not open WriteBootstrap file:\n" - "%s: ERR=%s\n"), fname, be.strerror()); + "%s: ERR=%s\n"), fname, be.bstrerror()); set_jcr_job_status(jcr, JS_ErrorTerminated); } + free_pool_memory(fname); } }