X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=bacula%2Fsrc%2Fdird%2Ffd_cmds.c;h=85e6055343cdd02c13641086f726196c6054a03f;hb=bcfc3499e3ed90d43bef43e4a60edabecb4b236f;hp=6859a6e55f3f51120354f7ad32d7dcc0333c11ac;hpb=d8a17d94586ed6f18c091229a0bafe9a1395b571;p=bacula%2Fbacula diff --git a/bacula/src/dird/fd_cmds.c b/bacula/src/dird/fd_cmds.c index 6859a6e55f..85e6055343 100644 --- a/bacula/src/dird/fd_cmds.c +++ b/bacula/src/dird/fd_cmds.c @@ -1,12 +1,12 @@ /* Bacula® - The Network Backup Solution - Copyright (C) 2000-2008 Free Software Foundation Europe e.V. + Copyright (C) 2000-2010 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 + 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. @@ -15,7 +15,7 @@ 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 + 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. @@ -37,7 +37,6 @@ * Utility functions for sending info to File Daemon. * These functions are used by both backup and verify. * - * Version $Id$ */ #include "bacula.h" @@ -60,6 +59,7 @@ static char OKjob[] = "2000 OK Job"; static char OKlevel[] = "2000 OK level\n"; static char OKRunScript[] = "2000 OK RunScript\n"; static char OKRunBeforeNow[] = "2000 OK RunBeforeNow\n"; +static char OKRestoreObject[] = "2000 OK ObjectRestored\n"; /* Forward referenced functions */ static bool send_list_item(JCR *jcr, const char *code, char *item, BSOCK *fd); @@ -103,7 +103,7 @@ int connect_to_file_daemon(JCR *jcr, int retry_interval, int max_retry_time, } if (fd == NULL) { - set_jcr_job_status(jcr, JS_ErrorTerminated); + jcr->setJobStatus(JS_ErrorTerminated); return 0; } Dmsg0(10, "Opened connection with File daemon\n"); @@ -112,19 +112,22 @@ int connect_to_file_daemon(JCR *jcr, int retry_interval, int max_retry_time, } fd->res = (RES *)jcr->client; /* save resource in BSOCK */ jcr->file_bsock = fd; - set_jcr_job_status(jcr, JS_Running); + jcr->setJobStatus(JS_Running); if (!authenticate_file_daemon(jcr)) { - set_jcr_job_status(jcr, JS_ErrorTerminated); + jcr->setJobStatus(JS_ErrorTerminated); return 0; } /* * Now send JobId and authorization key */ + if (jcr->sd_auth_key == NULL) { + jcr->sd_auth_key = bstrdup("dummy"); + } fd->fsend(jobcmd, edit_int64(jcr->JobId, ed1), jcr->Job, jcr->VolSessionId, - jcr->VolSessionTime, jcr->sd_auth_key); - if (strcmp(jcr->sd_auth_key, "dummy") != 0) { + jcr->VolSessionTime, jcr->sd_auth_key); + if (!jcr->keep_sd_auth_key && strcmp(jcr->sd_auth_key, "dummy")) { memset(jcr->sd_auth_key, 0, strlen(jcr->sd_auth_key)); } Dmsg1(100, ">filed: %s", fd->msg); @@ -133,7 +136,7 @@ int connect_to_file_daemon(JCR *jcr, int retry_interval, int max_retry_time, if (strncmp(fd->msg, OKjob, strlen(OKjob)) != 0) { Jmsg(jcr, M_FATAL, 0, _("File daemon \"%s\" rejected Job command: %s\n"), jcr->client->hdr.name, fd->msg); - set_jcr_job_status(jcr, JS_ErrorTerminated); + jcr->setJobStatus(JS_ErrorTerminated); return 0; } else if (jcr->db) { CLIENT_DBR cr; @@ -151,7 +154,7 @@ int connect_to_file_daemon(JCR *jcr, int retry_interval, int max_retry_time, } else { Jmsg(jcr, M_FATAL, 0, _("FD gave bad response to JobId command: %s\n"), bnet_strerror(fd)); - set_jcr_job_status(jcr, JS_ErrorTerminated); + jcr->setJobStatus(JS_ErrorTerminated); return 0; } return 1; @@ -171,7 +174,7 @@ void get_level_since_time(JCR *jcr, char *since, int since_len) bool do_full = false; bool do_diff = false; utime_t now; - utime_t last_full_time; + utime_t last_full_time = 0; utime_t last_diff_time; since[0] = 0; @@ -190,50 +193,74 @@ void get_level_since_time(JCR *jcr, char *since, int since_len) * Lookup the last FULL backup job to get the time/date for a * differential or incremental save. */ - switch (jcr->get_JobLevel()) { + switch (jcr->getJobLevel()) { case L_DIFFERENTIAL: case L_INCREMENTAL: POOLMEM *stime = get_pool_memory(PM_MESSAGE); /* Look up start time of last Full job */ now = (utime_t)time(NULL); jcr->jr.JobId = 0; /* flag to return since time */ - have_full = db_find_job_start_time(jcr, jcr->db, &jcr->jr, &jcr->stime); - /* If there was a successful job, make sure it is recent enough */ - if (jcr->get_JobLevel() == L_INCREMENTAL && have_full && jcr->job->MaxDiffInterval > 0) { + /* + * This is probably redundant, but some of the code below + * uses jcr->stime, so don't remove unless you are sure. + */ + if (!db_find_job_start_time(jcr, jcr->db, &jcr->jr, &jcr->stime)) { + do_full = true; + } + have_full = db_find_last_job_start_time(jcr, jcr->db, &jcr->jr, &stime, L_FULL); + if (have_full) { + last_full_time = str_to_utime(stime); + } else { + do_full = true; /* No full, upgrade to one */ + } + Dmsg4(50, "have_full=%d do_full=%d now=%lld full_time=%lld\n", have_full, + do_full, now, last_full_time); + /* Make sure the last diff is recent enough */ + if (have_full && jcr->getJobLevel() == L_INCREMENTAL && jcr->job->MaxDiffInterval > 0) { /* Lookup last diff job */ if (db_find_last_job_start_time(jcr, jcr->db, &jcr->jr, &stime, L_DIFFERENTIAL)) { last_diff_time = str_to_utime(stime); - do_diff = ((now - last_diff_time) >= jcr->job->MaxDiffInterval); + /* If no Diff since Full, use Full time */ + if (last_diff_time < last_full_time) { + last_diff_time = last_full_time; + } + Dmsg2(50, "last_diff_time=%lld last_full_time=%lld\n", last_diff_time, + last_full_time); + } else { + /* No last differential, so use last full time */ + last_diff_time = last_full_time; + Dmsg1(50, "No last_diff_time setting to full_time=%lld\n", last_full_time); } + do_diff = ((now - last_diff_time) >= jcr->job->MaxDiffInterval); + Dmsg2(50, "do_diff=%d diffInter=%lld\n", do_diff, jcr->job->MaxDiffInterval); } - if (have_full && jcr->job->MaxFullInterval > 0 && - db_find_last_job_start_time(jcr, jcr->db, &jcr->jr, &stime, L_FULL)) { - last_full_time = str_to_utime(stime); + /* Note, do_full takes precedence over do_diff */ + if (have_full && jcr->job->MaxFullInterval > 0) { do_full = ((now - last_full_time) >= jcr->job->MaxFullInterval); } free_pool_memory(stime); - if (!have_full || do_full) { + if (do_full) { /* No recent Full job found, so upgrade this one to Full */ Jmsg(jcr, M_INFO, 0, "%s", db_strerror(jcr->db)); Jmsg(jcr, M_INFO, 0, _("No prior or suitable Full backup found in catalog. Doing FULL backup.\n")); bsnprintf(since, since_len, _(" (upgraded from %s)"), - level_to_str(jcr->get_JobLevel())); - jcr->set_JobLevel(jcr->jr.JobLevel = L_FULL); + level_to_str(jcr->getJobLevel())); + jcr->setJobLevel(jcr->jr.JobLevel = L_FULL); } else if (do_diff) { - /* No recent diff job found, so upgrade this one to Full */ + /* No recent diff job found, so upgrade this one to Diff */ Jmsg(jcr, M_INFO, 0, _("No prior or suitable Differential backup found in catalog. Doing Differential backup.\n")); bsnprintf(since, since_len, _(" (upgraded from %s)"), - level_to_str(jcr->get_JobLevel())); - jcr->set_JobLevel(jcr->jr.JobLevel = L_DIFFERENTIAL); + level_to_str(jcr->getJobLevel())); + jcr->setJobLevel(jcr->jr.JobLevel = L_DIFFERENTIAL); } else { if (jcr->job->rerun_failed_levels) { if (db_find_failed_job_since(jcr, jcr->db, &jcr->jr, jcr->stime, JobLevel)) { Jmsg(jcr, M_INFO, 0, _("Prior failed job found in catalog. Upgrading to %s.\n"), level_to_str(JobLevel)); bsnprintf(since, since_len, _(" (upgraded from %s)"), - level_to_str(jcr->get_JobLevel())); - jcr->set_JobLevel(jcr->jr.JobLevel = JobLevel); + level_to_str(jcr->getJobLevel())); + jcr->setJobLevel(jcr->jr.JobLevel = JobLevel); jcr->jr.JobId = jcr->JobId; break; } @@ -244,7 +271,7 @@ void get_level_since_time(JCR *jcr, char *since, int since_len) jcr->jr.JobId = jcr->JobId; break; } - Dmsg2(100, "Level=%c last start time=%s\n", jcr->get_JobLevel(), jcr->stime); + Dmsg2(100, "Level=%c last start time=%s\n", jcr->getJobLevel(), jcr->stime); } static void send_since_time(JCR *jcr) @@ -267,39 +294,40 @@ static void send_since_time(JCR *jcr) bool send_level_command(JCR *jcr) { BSOCK *fd = jcr->file_bsock; - const char *accurate = jcr->job->accurate?"accurate_":""; + const char *accurate = jcr->accurate?"accurate_":""; const char *not_accurate = ""; + const char *rerunning = jcr->rerunning?" rerunning ":" "; /* * Send Level command to File daemon */ - switch (jcr->get_JobLevel()) { + switch (jcr->getJobLevel()) { case L_BASE: - fd->fsend(levelcmd, not_accurate, "base", " ", 0); + fd->fsend(levelcmd, not_accurate, "base", rerunning, 0); break; /* L_NONE is the console, sending something off to the FD */ case L_NONE: case L_FULL: - fd->fsend(levelcmd, not_accurate, "full", " ", 0); + fd->fsend(levelcmd, not_accurate, "full", rerunning, 0); break; case L_DIFFERENTIAL: - fd->fsend(levelcmd, accurate, "differential", " ", 0); + fd->fsend(levelcmd, accurate, "differential", rerunning, 0); send_since_time(jcr); break; case L_INCREMENTAL: - fd->fsend(levelcmd, accurate, "incremental", " ", 0); + fd->fsend(levelcmd, accurate, "incremental", rerunning, 0); send_since_time(jcr); break; case L_SINCE: default: Jmsg2(jcr, M_FATAL, 0, _("Unimplemented backup level %d %c\n"), - jcr->get_JobLevel(), jcr->get_JobLevel()); + jcr->getJobLevel(), jcr->getJobLevel()); return 0; } Dmsg1(120, ">filed: %s", fd->msg); if (!response(jcr, fd, OKlevel, "Level", DISPLAY_ERROR)) { - return 0; + return false; } - return 1; + return true; } /* @@ -309,6 +337,7 @@ static bool send_fileset(JCR *jcr) { FILESET *fileset = jcr->fileset; BSOCK *fd = jcr->file_bsock; + STORE *store = jcr->wstore; int num; bool include = true; @@ -330,9 +359,11 @@ static bool send_fileset(JCR *jcr) ie = fileset->exclude_items[i]; fd->fsend("E\n"); } + if (ie->ignoredir) { + bnet_fsend(fd, "Z %s\n", ie->ignoredir); + } for (j=0; jnum_opts; j++) { FOPTS *fo = ie->opts_list[j]; - fd->fsend("O %s\n", fo->opts); bool enhanced_wild = false; for (k=0; fo->opts[k]!='\0'; k++) { @@ -342,6 +373,34 @@ static bool send_fileset(JCR *jcr) } } + /* Strip out compression option Zn if disallowed for this Storage */ + if (store && !store->AllowCompress) { + char newopts[MAX_FOPTS]; + bool done=false; /* print warning only if compression enabled in FS */ + int j = 0; + for (k=0; fo->opts[k]!='\0'; k++) { + /* Z compress option is followed by the single-digit compress level or 'o' */ + if (fo->opts[k]=='Z') { + done=true; + k++; /* skip option and level */ + } else { + newopts[j] = fo->opts[k]; + j++; + } + } + newopts[j] = '\0'; + + if (done) { + Jmsg(jcr, M_INFO, 0, + _("FD compression disabled for this Job because AllowCompress=No in Storage resource.\n") ); + } + /* Send the new trimmed option set without overwriting fo->opts */ + fd->fsend("O %s\n", newopts); + } else { + /* Send the original options */ + fd->fsend("O %s\n", fo->opts); + } + for (k=0; kregex.size(); k++) { fd->fsend("R %s\n", fo->regex.get(k)); } @@ -375,9 +434,6 @@ static bool send_fileset(JCR *jcr) if (fo->plugin) { fd->fsend("G %s\n", fo->plugin); } - if (fo->ignoredir) { - bnet_fsend(fd, "Z %s\n", fo->ignoredir); - } if (fo->reader) { fd->fsend("D %s\n", fo->reader); } @@ -415,7 +471,7 @@ static bool send_fileset(JCR *jcr) return true; bail_out: - set_jcr_job_status(jcr, JS_ErrorTerminated); + jcr->setJobStatus(JS_ErrorTerminated); return false; } @@ -519,43 +575,6 @@ bool send_exclude_list(JCR *jcr) return true; } - -/* - * Send bootstrap file if any to the socket given (FD or SD). - * This is used for restore, verify VolumeToCatalog, and - * for migration. - */ -bool send_bootstrap_file(JCR *jcr, BSOCK *sock) -{ - FILE *bs; - char buf[1000]; - const char *bootstrap = "bootstrap\n"; - - Dmsg1(400, "send_bootstrap_file: %s\n", jcr->RestoreBootstrap); - if (!jcr->RestoreBootstrap) { - return true; - } - bs = fopen(jcr->RestoreBootstrap, "rb"); - if (!bs) { - berrno be; - Jmsg(jcr, M_FATAL, 0, _("Could not open bootstrap file %s: ERR=%s\n"), - jcr->RestoreBootstrap, be.bstrerror()); - set_jcr_job_status(jcr, JS_ErrorTerminated); - return false; - } - sock->fsend(bootstrap); - while (fgets(buf, sizeof(buf), bs)) { - sock->fsend("%s", buf); - } - sock->signal(BNET_EOD); - fclose(bs); - if (jcr->unlink_bsr) { - unlink(jcr->RestoreBootstrap); - jcr->unlink_bsr = false; - } - return true; -} - /* TODO: drop this with runscript.old_proto in bacula 1.42 */ static char runbefore[] = "RunBeforeJob %s\n"; static char runafter[] = "RunAfterJob %s\n"; @@ -594,7 +613,7 @@ int send_runscripts_commands(JCR *jcr) Dmsg0(120, "bdird: sending runscripts to fd\n"); foreach_alist(cmd, jcr->job->RunScripts) { - if (cmd->can_run_at_level(jcr->get_JobLevel()) && cmd->target) { + if (cmd->can_run_at_level(jcr->getJobLevel()) && cmd->target) { ehost = edit_job_codes(jcr, ehost, cmd->target, ""); Dmsg2(200, "bdird: runscript %s -> %s\n", cmd->target, ehost); @@ -650,6 +669,96 @@ bail_out: return 0; } +struct OBJ_CTX { + JCR *jcr; + int count; +}; + +static int restore_object_handler(void *ctx, int num_fields, char **row) +{ + OBJ_CTX *octx = (OBJ_CTX *)ctx; + JCR *jcr = octx->jcr; + BSOCK *fd; + + fd = jcr->file_bsock; + if (jcr->is_job_canceled()) { + return 1; + } + /* Old File Daemon doesn't handle restore objects */ + if (jcr->FDVersion < 3) { + Jmsg(jcr, M_WARNING, 0, _("Client \"%s\" may not be used to restore " + "this job. Please upgrade your client.\n"), + jcr->client->name()); + return 1; + } + + fd->fsend("restoreobject JobId=%s %s,%s,%s,%s,%s,%s\n", + row[0], row[1], row[2], row[3], row[4], row[5], row[6]); + + Dmsg1(010, "Send obj hdr=%s", fd->msg); + + fd->msglen = pm_strcpy(fd->msg, row[7]); + fd->send(); /* send Object name */ + + Dmsg1(010, "Send obj: %s\n", fd->msg); + +// fd->msglen = str_to_uint64(row[1]); /* object length */ +// Dmsg1(000, "obj size: %lld\n", (uint64_t)fd->msglen); + + /* object */ + db_unescape_object(jcr, jcr->db, + row[8], /* Object */ + str_to_uint64(row[1]), /* Object length */ + &fd->msg, &fd->msglen); + fd->send(); /* send object */ + octx->count++; + + if (debug_level) { + for (int i=0; i < fd->msglen; i++) + if (!fd->msg[i]) + fd->msg[i] = ' '; + Dmsg1(000, "Send obj: %s\n", fd->msg); + } + + return 0; +} + +bool send_restore_objects(JCR *jcr) +{ + POOL_MEM query(PM_MESSAGE); + BSOCK *fd; + OBJ_CTX octx; + + if (!jcr->JobIds || !jcr->JobIds[0]) { + return true; + } + octx.jcr = jcr; + octx.count = 0; + Mmsg(query, "SELECT JobId,ObjectLength,ObjectFullLength,ObjectIndex," + "ObjectType,ObjectCompression,FileIndex,ObjectName," + "RestoreObject " + "FROM RestoreObject " + "WHERE JobId IN (%s) " + "ORDER BY ObjectIndex ASC", jcr->JobIds); + + /* restore_object_handler is called for each file found */ + db_sql_query(jcr->db, query.c_str(), restore_object_handler, (void *)&octx); + + /* + * Send to FD only if we have at least one restore object. + * This permits backward compatibility with older FDs. + */ + if (octx.count > 0) { + fd = jcr->file_bsock; + fd->fsend("restoreobject end\n"); + if (!response(jcr, fd, OKRestoreObject, "RestoreObject", DISPLAY_ERROR)) { + Jmsg(jcr, M_FATAL, 0, _("RestoreObject failed.\n")); + return false; + } + } + return true; +} + /* @@ -681,7 +790,7 @@ int get_attributes_and_put_in_catalog(JCR *jcr) if ((len = sscanf(fd->msg, "%ld %d %s", &file_index, &stream, Digest)) != 3) { Jmsg(jcr, M_FATAL, 0, _("msglen, fd->msg); - set_jcr_job_status(jcr, JS_ErrorTerminated); + jcr->setJobStatus(JS_ErrorTerminated); return 0; } p = fd->msg; @@ -721,6 +830,7 @@ int get_attributes_and_put_in_catalog(JCR *jcr) ar->FilenameId = 0; ar->Digest = NULL; ar->DigestType = CRYPTO_DIGEST_NONE; + ar->DeltaSeq = 0; jcr->cached_attribute = true; Dmsg2(dbglvl, "dirdfname); @@ -760,6 +870,6 @@ int get_attributes_and_put_in_catalog(JCR *jcr) } jcr->cached_attribute = false; } - set_jcr_job_status(jcr, JS_Terminated); + jcr->setJobStatus(JS_Terminated); return 1; }