X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=bacula%2Fsrc%2Fdird%2Ffd_cmds.c;h=2561e70c7891eda35533059ac0df83bfe52c62c8;hb=495460e08127544c76c0037fe252c40308dbab15;hp=0f6ef13500bb35bb1ffc14e5fd997d5f57e931bd;hpb=688a50efb4fa9ac69de705adbc64463283e5a7be;p=bacula%2Fbacula diff --git a/bacula/src/dird/fd_cmds.c b/bacula/src/dird/fd_cmds.c index 0f6ef13500..2561e70c78 100644 --- a/bacula/src/dird/fd_cmds.c +++ b/bacula/src/dird/fd_cmds.c @@ -1,14 +1,14 @@ /* Bacula® - The Network Backup Solution - Copyright (C) 2000-2007 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 @@ -44,11 +44,13 @@ #include "dird.h" #include "findlib/find.h" +const int dbglvl = 400; + /* Commands sent to File daemon */ static char filesetcmd[] = "fileset%s\n"; /* set full fileset */ static char jobcmd[] = "JobId=%s Job=%s SDid=%u SDtime=%u Authorization=%s\n"; /* Note, mtime_only is not used here -- implemented as file option */ -static char levelcmd[] = "level = %s%s mtime_only=%d\n"; +static char levelcmd[] = "level = %s%s%s mtime_only=%d\n"; static char runscript[] = "Run OnSuccess=%u OnFailure=%u AbortOnError=%u When=%u Command=%s\n"; static char runbeforenow[]= "RunBeforeNow\n"; @@ -60,6 +62,7 @@ static char OKRunScript[] = "2000 OK RunScript\n"; static char OKRunBeforeNow[] = "2000 OK RunBeforeNow\n"; /* Forward referenced functions */ +static bool send_list_item(JCR *jcr, const char *code, char *item, BSOCK *fd); /* External functions */ extern DIRRES *director; @@ -88,9 +91,11 @@ int connect_to_file_daemon(JCR *jcr, int retry_interval, int max_retry_time, } if (!jcr->file_bsock) { + char name[MAX_NAME_LENGTH + 100]; + bstrncpy(name, _("Client: "), sizeof(name)); + bstrncat(name, jcr->client->name(), sizeof(name)); fd = bnet_connect(jcr, retry_interval, max_retry_time, heart_beat, - _("File daemon"), jcr->client->address, - NULL, jcr->client->FDport, verbose); + name, jcr->client->address, NULL, jcr->client->FDport, verbose); if (fd == NULL) { set_jcr_job_status(jcr, JS_ErrorTerminated); return 0; @@ -111,7 +116,7 @@ int connect_to_file_daemon(JCR *jcr, int retry_interval, int max_retry_time, /* * Now send JobId and authorization key */ - bnet_fsend(fd, jobcmd, edit_int64(jcr->JobId, ed1), jcr->Job, jcr->VolSessionId, + 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) { memset(jcr->sd_auth_key, 0, strlen(jcr->sd_auth_key)); @@ -156,34 +161,65 @@ int connect_to_file_daemon(JCR *jcr, int retry_interval, int max_retry_time, void get_level_since_time(JCR *jcr, char *since, int since_len) { int JobLevel; + bool have_full; + bool do_full = false; + bool do_diff = false; + time_t now; + utime_t full_time; + utime_t diff_time; since[0] = 0; - if (jcr->cloned) { - if (jcr->stime && jcr->stime[0]) { - bstrncpy(since, _(", since="), since_len); - bstrncat(since, jcr->stime, since_len); - } + /* If job cloned and a since time already given, use it */ + if (jcr->cloned && jcr->stime && jcr->stime[0]) { + bstrncpy(since, _(", since="), since_len); + bstrncat(since, jcr->stime, since_len); return; } + /* Make sure stime buffer is allocated */ if (!jcr->stime) { jcr->stime = get_pool_memory(PM_MESSAGE); } jcr->stime[0] = 0; - /* Lookup the last FULL backup job to get the time/date for a + /* + * Lookup the last FULL backup job to get the time/date for a * differential or incremental save. */ switch (jcr->JobLevel) { case L_DIFFERENTIAL: case L_INCREMENTAL: - /* Look up start time of last job */ - jcr->jr.JobId = 0; /* flag for db_find_job_start time */ - if (!db_find_job_start_time(jcr, jcr->db, &jcr->jr, &jcr->stime)) { - /* No job found, so upgrade this one to Full */ + POOLMEM *stime = get_pool_memory(PM_MESSAGE); + /* Look up start time of last Full job */ + now = 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->JobLevel == L_INCREMENTAL && have_full && jcr->job->MaxDiffInterval > 0) { + /* Lookup last diff job */ + if (db_find_last_job_start_time(jcr, jcr->db, &jcr->jr, &stime, L_DIFFERENTIAL)) { + diff_time = str_to_utime(stime); + do_diff = ((now - diff_time) <= jcr->job->MaxDiffInterval); + } + } + if (have_full && jcr->job->MaxFullInterval > 0 && + db_find_last_job_start_time(jcr, jcr->db, &jcr->jr, &stime, L_FULL)) { + full_time = str_to_utime(stime); + do_full = ((now - full_time) <= jcr->job->MaxFullInterval); + } + free_pool_memory(stime); + + if (!have_full || 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->JobLevel)); jcr->JobLevel = jcr->jr.JobLevel = L_FULL; + } else if (do_diff) { + /* No recent diff job found, so upgrade this one to Full */ + 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->JobLevel)); + jcr->JobLevel = 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)) { @@ -212,13 +248,12 @@ static void send_since_time(JCR *jcr) char ed1[50]; stime = str_to_utime(jcr->stime); - bnet_fsend(fd, levelcmd, NT_("since_utime "), edit_uint64(stime, ed1), 0); + fd->fsend(levelcmd, "", NT_("since_utime "), edit_uint64(stime, ed1), 0); while (bget_dirmsg(fd) >= 0) { /* allow him to poll us to sync clocks */ Jmsg(jcr, M_INFO, 0, "%s\n", fd->msg); } } - /* * Send level command to FD. * Used for backup jobs and estimate command. @@ -226,24 +261,26 @@ 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 *not_accurate=""; /* * Send Level command to File daemon */ switch (jcr->JobLevel) { case L_BASE: - bnet_fsend(fd, levelcmd, "base", " ", 0); + fd->fsend(levelcmd, not_accurate, "base", " ", 0); break; /* L_NONE is the console, sending something off to the FD */ case L_NONE: case L_FULL: - bnet_fsend(fd, levelcmd, "full", " ", 0); + fd->fsend(levelcmd, not_accurate, "full", " ", 0); break; case L_DIFFERENTIAL: - bnet_fsend(fd, levelcmd, "differential", " ", 0); + fd->fsend(levelcmd, accurate, "differential", " ", 0); send_since_time(jcr); break; case L_INCREMENTAL: - bnet_fsend(fd, levelcmd, "incremental", " ", 0); + fd->fsend(levelcmd, accurate, "incremental", " ", 0); send_since_time(jcr); break; case L_SINCE: @@ -276,24 +313,20 @@ static bool send_fileset(JCR *jcr) num = fileset->num_excludes; } for (int i=0; iinclude_items[i]; - bnet_fsend(fd, "I\n"); + fd->fsend("I\n"); } else { ie = fileset->exclude_items[i]; - bnet_fsend(fd, "E\n"); + fd->fsend("E\n"); } for (j=0; jnum_opts; j++) { FOPTS *fo = ie->opts_list[j]; - bnet_fsend(fd, "O %s\n", fo->opts); + fd->fsend("O %s\n", fo->opts); bool enhanced_wild = false; for (k=0; fo->opts[k]!='\0'; k++) { @@ -304,110 +337,64 @@ static bool send_fileset(JCR *jcr) } for (k=0; kregex.size(); k++) { - bnet_fsend(fd, "R %s\n", fo->regex.get(k)); + fd->fsend("R %s\n", fo->regex.get(k)); } for (k=0; kregexdir.size(); k++) { - bnet_fsend(fd, "RD %s\n", fo->regexdir.get(k)); + fd->fsend("RD %s\n", fo->regexdir.get(k)); } for (k=0; kregexfile.size(); k++) { - bnet_fsend(fd, "RF %s\n", fo->regexfile.get(k)); + fd->fsend("RF %s\n", fo->regexfile.get(k)); } for (k=0; kwild.size(); k++) { - bnet_fsend(fd, "W %s\n", fo->wild.get(k)); + fd->fsend("W %s\n", fo->wild.get(k)); } for (k=0; kwilddir.size(); k++) { - bnet_fsend(fd, "WD %s\n", fo->wilddir.get(k)); + fd->fsend("WD %s\n", fo->wilddir.get(k)); } for (k=0; kwildfile.size(); k++) { - bnet_fsend(fd, "WF %s\n", fo->wildfile.get(k)); + fd->fsend("WF %s\n", fo->wildfile.get(k)); } for (k=0; kwildbase.size(); k++) { - bnet_fsend(fd, "W%c %s\n", enhanced_wild ? 'B' : 'F', fo->wildbase.get(k)); + fd->fsend("W%c %s\n", enhanced_wild ? 'B' : 'F', fo->wildbase.get(k)); } for (k=0; kbase.size(); k++) { - bnet_fsend(fd, "B %s\n", fo->base.get(k)); + fd->fsend("B %s\n", fo->base.get(k)); } for (k=0; kfstype.size(); k++) { - bnet_fsend(fd, "X %s\n", fo->fstype.get(k)); + fd->fsend("X %s\n", fo->fstype.get(k)); } for (k=0; kdrivetype.size(); k++) { - bnet_fsend(fd, "XD %s\n", fo->drivetype.get(k)); + fd->fsend("XD %s\n", fo->drivetype.get(k)); + } + if (fo->plugin) { + fd->fsend("G %s\n", fo->plugin); + } + if (fo->ignoredir) { + bnet_fsend(fd, "Z %s\n", fo->ignoredir); } if (fo->reader) { - bnet_fsend(fd, "D %s\n", fo->reader); + fd->fsend("D %s\n", fo->reader); } if (fo->writer) { - bnet_fsend(fd, "T %s\n", fo->writer); + fd->fsend("T %s\n", fo->writer); } - bnet_fsend(fd, "N\n"); + fd->fsend("N\n"); } for (j=0; jname_list.size(); j++) { - p = (char *)ie->name_list.get(j); - switch (*p) { - case '|': - p++; /* skip over the | */ - fd->msg = edit_job_codes(jcr, fd->msg, p, ""); - bpipe = open_bpipe(fd->msg, 0, "r"); - if (!bpipe) { - berrno be; - Jmsg(jcr, M_FATAL, 0, _("Cannot run program: %s. ERR=%s\n"), - p, be.strerror()); - goto bail_out; - } - bstrncpy(buf, "F ", sizeof(buf)); - Dmsg1(500, "Opts=%s\n", buf); - optlen = strlen(buf); - while (fgets(buf+optlen, sizeof(buf)-optlen, bpipe->rfd)) { - fd->msglen = Mmsg(fd->msg, "%s", buf); - Dmsg2(500, "Inc/exc len=%d: %s", fd->msglen, fd->msg); - if (!bnet_send(fd)) { - Jmsg(jcr, M_FATAL, 0, _(">filed: write error on socket\n")); - goto bail_out; - } - } - if ((stat=close_bpipe(bpipe)) != 0) { - berrno be; - Jmsg(jcr, M_FATAL, 0, _("Error running program: %s. ERR=%s\n"), - p, be.strerror(stat)); - goto bail_out; - } - break; - case '<': - p++; /* skip over < */ - if ((ffd = fopen(p, "rb")) == NULL) { - berrno be; - Jmsg(jcr, M_FATAL, 0, _("Cannot open included file: %s. ERR=%s\n"), - p, be.strerror()); - goto bail_out; - } - bstrncpy(buf, "F ", sizeof(buf)); - Dmsg1(500, "Opts=%s\n", buf); - optlen = strlen(buf); - while (fgets(buf+optlen, sizeof(buf)-optlen, ffd)) { - fd->msglen = Mmsg(fd->msg, "%s", buf); - if (!bnet_send(fd)) { - Jmsg(jcr, M_FATAL, 0, _(">filed: write error on socket\n")); - goto bail_out; - } - } - fclose(ffd); - break; - case '\\': - p++; /* skip over \ */ - /* Note, fall through wanted */ - default: - pm_strcpy(fd->msg, "F "); - fd->msglen = pm_strcat(fd->msg, p); - Dmsg1(500, "Inc/Exc name=%s\n", fd->msg); - if (!bnet_send(fd)) { - Jmsg(jcr, M_FATAL, 0, _(">filed: write error on socket\n")); - goto bail_out; - } - break; + item = (char *)ie->name_list.get(j); + if (!send_list_item(jcr, "F ", item, fd)) { + goto bail_out; } } - bnet_fsend(fd, "N\n"); + fd->fsend("N\n"); + for (j=0; jplugin_list.size(); j++) { + item = (char *)ie->plugin_list.get(j); + if (!send_list_item(jcr, "P ", item, fd)) { + goto bail_out; + } + } + fd->fsend("N\n"); } if (!include) { /* If we just did excludes */ break; /* all done */ @@ -415,7 +402,7 @@ static bool send_fileset(JCR *jcr) include = false; /* Now do excludes */ } - bnet_sig(fd, BNET_EOD); /* end of data */ + fd->signal(BNET_EOD); /* end of data */ if (!response(jcr, fd, OKinc, "Include", DISPLAY_ERROR)) { goto bail_out; } @@ -427,6 +414,79 @@ bail_out: } +static bool send_list_item(JCR *jcr, const char *code, char *item, BSOCK *fd) +{ + BPIPE *bpipe; + FILE *ffd; + char buf[2000]; + int optlen, stat; + char *p = item; + + switch (*p) { + case '|': + p++; /* skip over the | */ + fd->msg = edit_job_codes(jcr, fd->msg, p, ""); + bpipe = open_bpipe(fd->msg, 0, "r"); + if (!bpipe) { + berrno be; + Jmsg(jcr, M_FATAL, 0, _("Cannot run program: %s. ERR=%s\n"), + p, be.bstrerror()); + return false; + } + bstrncpy(buf, code, sizeof(buf)); + Dmsg1(500, "code=%s\n", buf); + optlen = strlen(buf); + while (fgets(buf+optlen, sizeof(buf)-optlen, bpipe->rfd)) { + fd->msglen = Mmsg(fd->msg, "%s", buf); + Dmsg2(500, "Inc/exc len=%d: %s", fd->msglen, fd->msg); + if (!bnet_send(fd)) { + Jmsg(jcr, M_FATAL, 0, _(">filed: write error on socket\n")); + return false; + } + } + if ((stat=close_bpipe(bpipe)) != 0) { + berrno be; + Jmsg(jcr, M_FATAL, 0, _("Error running program: %s. ERR=%s\n"), + p, be.bstrerror(stat)); + return false; + } + break; + case '<': + p++; /* skip over < */ + if ((ffd = fopen(p, "rb")) == NULL) { + berrno be; + Jmsg(jcr, M_FATAL, 0, _("Cannot open included file: %s. ERR=%s\n"), + p, be.bstrerror()); + return false; + } + bstrncpy(buf, code, sizeof(buf)); + Dmsg1(500, "code=%s\n", buf); + optlen = strlen(buf); + while (fgets(buf+optlen, sizeof(buf)-optlen, ffd)) { + fd->msglen = Mmsg(fd->msg, "%s", buf); + if (!bnet_send(fd)) { + Jmsg(jcr, M_FATAL, 0, _(">filed: write error on socket\n")); + return false; + } + } + fclose(ffd); + break; + case '\\': + p++; /* skip over \ */ + /* Note, fall through wanted */ + default: + pm_strcpy(fd->msg, code); + fd->msglen = pm_strcat(fd->msg, p); + Dmsg1(500, "Inc/Exc name=%s\n", fd->msg); + if (!fd->send()) { + Jmsg(jcr, M_FATAL, 0, _(">filed: write error on socket\n")); + return false; + } + break; + } + return true; +} + /* * Send include list to File daemon @@ -435,7 +495,7 @@ bool send_include_list(JCR *jcr) { BSOCK *fd = jcr->file_bsock; if (jcr->fileset->new_include) { - bnet_fsend(fd, filesetcmd, jcr->fileset->enable_vss ? " vss=1" : ""); + fd->fsend(filesetcmd, jcr->fileset->enable_vss ? " vss=1" : ""); return send_fileset(jcr); } return true; @@ -473,15 +533,15 @@ bool send_bootstrap_file(JCR *jcr, BSOCK *sock) if (!bs) { berrno be; Jmsg(jcr, M_FATAL, 0, _("Could not open bootstrap file %s: ERR=%s\n"), - jcr->RestoreBootstrap, be.strerror()); + jcr->RestoreBootstrap, be.bstrerror()); set_jcr_job_status(jcr, JS_ErrorTerminated); return false; } - bnet_fsend(sock, bootstrap); + sock->fsend(bootstrap); while (fgets(buf, sizeof(buf), bs)) { - bnet_fsend(sock, "%s", buf); + sock->fsend("%s", buf); } - bnet_sig(sock, BNET_EOD); + sock->signal(BNET_EOD); fclose(bs); if (jcr->unlink_bsr) { unlink(jcr->RestoreBootstrap); @@ -528,13 +588,11 @@ 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->JobLevel) && cmd->target) { - ehost = edit_job_codes(jcr, ehost, cmd->target, ""); Dmsg2(200, "bdird: runscript %s -> %s\n", cmd->target, ehost); - if (strcmp(ehost, jcr->client->hdr.name) == 0) { + if (strcmp(ehost, jcr->client->name()) == 0) { pm_strcpy(msg, cmd->command); bash_spaces(msg); @@ -545,21 +603,18 @@ int send_runscripts_commands(JCR *jcr) result = send_runscript_with_old_proto(jcr, cmd->when, msg); } else { - bnet_fsend(fd, runscript, cmd->on_success, - cmd->on_failure, - cmd->abort_on_error, - cmd->when, - msg); + fd->fsend(runscript, cmd->on_success, + cmd->on_failure, + cmd->fail_on_error, + cmd->when, + msg); result = response(jcr, fd, OKRunScript, "RunScript", DISPLAY_ERROR); - launch_before_cmd=true; + launch_before_cmd = true; } if (!result) { - set_jcr_job_status(jcr, JS_ErrorTerminated); - free_pool_memory(msg); - free_pool_memory(ehost); - return 0; + goto bail_out; } } /* TODO : we have to play with other client */ @@ -571,22 +626,26 @@ int send_runscripts_commands(JCR *jcr) } } - /* We tell to the FD that i can execute commands (ie ClientRunBeforeJob) */ + /* Tell the FD to execute the ClientRunBeforeJob */ if (launch_before_cmd) { - bnet_fsend(fd, runbeforenow); + fd->fsend(runbeforenow); if (!response(jcr, fd, OKRunBeforeNow, "RunBeforeNow", DISPLAY_ERROR)) { - set_jcr_job_status(jcr, JS_ErrorTerminated); - free_pool_memory(msg); - free_pool_memory(ehost); - return 0; + goto bail_out; } } free_pool_memory(msg); free_pool_memory(ehost); return 1; + +bail_out: + Jmsg(jcr, M_FATAL, 0, _("Client \"%s\" RunScript failed.\n"), ehost); + free_pool_memory(msg); + free_pool_memory(ehost); + return 0; } + /* * Read the attributes from the File daemon for * a Verify job and store them in the catalog. @@ -595,97 +654,107 @@ int get_attributes_and_put_in_catalog(JCR *jcr) { BSOCK *fd; int n = 0; - ATTR_DBR ar; + ATTR_DBR *ar = NULL; + char digest[MAXSTRING]; fd = jcr->file_bsock; jcr->jr.FirstIndex = 1; - memset(&ar, 0, sizeof(ar)); jcr->FileIndex = 0; + /* Start transaction allocates jcr->attr and jcr->ar if needed */ + db_start_transaction(jcr, jcr->db); /* start transaction if not already open */ + ar = jcr->ar; Dmsg0(120, "bdird: waiting to receive file attributes\n"); /* Pickup file attributes and digest */ while (!fd->errors && (n = bget_dirmsg(fd)) > 0) { - - /*****FIXME****** improve error handling to stop only on - * really fatal problems, or the number of errors is too - * large. - */ - long file_index; + uint32_t file_index; int stream, len; - char *attr, *p, *fn; - char Opts_Digest[MAXSTRING]; /* either Verify opts or MD5/SHA1 digest */ - char digest[CRYPTO_DIGEST_MAX_SIZE]; + char *p, *fn; + char Digest[MAXSTRING]; /* either Verify opts or MD5/SHA1 digest */ jcr->fname = check_pool_memory_size(jcr->fname, fd->msglen); - if ((len = sscanf(fd->msg, "%ld %d %s", &file_index, &stream, Opts_Digest)) != 3) { + 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); return 0; } p = fd->msg; + /* The following three fields were sscanf'ed above so skip them */ skip_nonspaces(&p); /* skip FileIndex */ skip_spaces(&p); skip_nonspaces(&p); /* skip Stream */ skip_spaces(&p); - skip_nonspaces(&p); /* skip Opts_SHA1 */ + skip_nonspaces(&p); /* skip Opts_Digest */ p++; /* skip space */ - fn = jcr->fname; - while (*p != 0) { - *fn++ = *p++; /* copy filename */ - } - *fn = *p++; /* term filename and point to attribs */ - attr = p; - + Dmsg1(dbglvl, "Stream=%d\n", stream); if (stream == STREAM_UNIX_ATTRIBUTES || stream == STREAM_UNIX_ATTRIBUTES_EX) { + if (jcr->cached_attribute) { + Dmsg3(dbglvl, "Cached attr. Stream=%d fname=%s\n", ar->Stream, ar->fname, + ar->attr); + if (!db_create_file_attributes_record(jcr, jcr->db, ar)) { + Jmsg1(jcr, M_FATAL, 0, _("Attribute create error. %s"), db_strerror(jcr->db)); + } + } + /* Any cached attr is flushed so we can reuse jcr->attr and jcr->ar */ + fn = jcr->fname; + while (*p != 0) { + *fn++ = *p++; /* copy filename */ + } + *fn = *p++; /* term filename and point p to attribs */ + pm_strcpy(jcr->attr, p); /* save attributes */ jcr->JobFiles++; jcr->FileIndex = file_index; - ar.attr = attr; - ar.fname = jcr->fname; - ar.FileIndex = file_index; - ar.Stream = stream; - ar.link = NULL; - ar.JobId = jcr->JobId; - ar.ClientId = jcr->ClientId; - ar.PathId = 0; - ar.FilenameId = 0; - ar.Digest = NULL; - ar.DigestType = CRYPTO_DIGEST_NONE; - - Dmsg2(111, "dirdfname); - Dmsg1(120, "dirddb, &ar)) { - Jmsg1(jcr, M_ERROR, 0, "%s", db_strerror(jcr->db)); - set_jcr_job_status(jcr, JS_Error); - continue; - } - jcr->FileId = ar.FileId; + ar->attr = jcr->attr; + ar->fname = jcr->fname; + ar->FileIndex = file_index; + ar->Stream = stream; + ar->link = NULL; + ar->JobId = jcr->JobId; + ar->ClientId = jcr->ClientId; + ar->PathId = 0; + ar->FilenameId = 0; + ar->Digest = NULL; + ar->DigestType = CRYPTO_DIGEST_NONE; + jcr->cached_attribute = true; + + Dmsg2(dbglvl, "dirdfname); + Dmsg1(dbglvl, "dirdattr); + jcr->FileId = ar->FileId; + /* + * First, get STREAM_UNIX_ATTRIBUTES and fill ATTR_DBR structure + * Next, we CAN have a CRYPTO_DIGEST, so we fill ATTR_DBR with it (or not) + * When we get a new STREAM_UNIX_ATTRIBUTES, we known that we can add file to the catalog + * At the end, we have to add the last file + */ } else if (crypto_digest_stream_type(stream) != CRYPTO_DIGEST_NONE) { if (jcr->FileIndex != (uint32_t)file_index) { Jmsg3(jcr, M_ERROR, 0, _("%s index %d not same as attributes %d\n"), stream_to_ascii(stream), file_index, jcr->FileIndex); - set_jcr_job_status(jcr, JS_Error); continue; } - db_escape_string(digest, Opts_Digest, strlen(Opts_Digest)); - Dmsg2(120, "DigestLen=%d Digest=%s\n", strlen(digest), digest); - if (!db_add_digest_to_file_record(jcr, jcr->db, jcr->FileId, digest, - crypto_digest_stream_type(stream))) { - Jmsg1(jcr, M_ERROR, 0, "%s", db_strerror(jcr->db)); - set_jcr_job_status(jcr, JS_Error); - } + ar->Digest = digest; + ar->DigestType = crypto_digest_stream_type(stream); + db_escape_string(jcr, jcr->db, digest, Digest, strlen(Digest)); + Dmsg4(dbglvl, "stream=%d DigestLen=%d Digest=%s type=%d\n", stream, + strlen(digest), digest, ar->DigestType); } jcr->jr.JobFiles = jcr->JobFiles = file_index; jcr->jr.LastIndex = file_index; } if (is_bnet_error(fd)) { Jmsg1(jcr, M_FATAL, 0, _("bstrerror()); return 0; } - + if (jcr->cached_attribute) { + Dmsg3(dbglvl, "Cached attr with digest. Stream=%d fname=%s attr=%s\n", ar->Stream, + ar->fname, ar->attr); + if (!db_create_file_attributes_record(jcr, jcr->db, ar)) { + Jmsg1(jcr, M_FATAL, 0, _("Attribute create error. %s"), db_strerror(jcr->db)); + } + jcr->cached_attribute = false; + } set_jcr_job_status(jcr, JS_Terminated); return 1; }