/*
Bacula® - The Network Backup Solution
- Copyright (C) 2000-2007 Free Software Foundation Europe e.V.
+ Copyright (C) 2000-2009 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
Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
02110-1301, USA.
- Bacula® is a registered trademark of John Walker.
+ Bacula® is a registered trademark of Kern Sibbald.
The licensor of Bacula is the Free Software Foundation Europe
(FSFE), Fiduciary Program, Sumatrastrasse 25, 8006 Zürich,
Switzerland, email:ftf@fsfeurope.org.
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";
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;
int connect_to_file_daemon(JCR *jcr, int retry_interval, int max_retry_time,
int verbose)
{
- BSOCK *fd;
+ BSOCK *fd = new_bsock();
char ed1[30];
utime_t heart_beat;
}
if (!jcr->file_bsock) {
- fd = bnet_connect(jcr, retry_interval, max_retry_time, heart_beat,
- _("File daemon"), jcr->client->address,
- NULL, jcr->client->FDport, verbose);
+ char name[MAX_NAME_LENGTH + 100];
+ bstrncpy(name, _("Client: "), sizeof(name));
+ bstrncat(name, jcr->client->name(), sizeof(name));
+
+ fd->set_source_address(director->DIRsrc_addr);
+ if (!fd->connect(jcr,retry_interval,max_retry_time, heart_beat, name, jcr->client->address,
+ NULL, jcr->client->FDport, verbose)) {
+ fd->destroy();
+ fd = NULL;
+ }
+
if (fd == NULL) {
set_jcr_job_status(jcr, JS_ErrorTerminated);
return 0;
/*
* 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));
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;
+ utime_t now;
+ utime_t last_full_time = 0;
+ utime_t last_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) {
+ switch (jcr->get_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 */
+ 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 */
+ /*
+ * 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)) {
- /* No job found, so upgrade this one to Full */
+ 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->get_JobLevel() == 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);
+ /* 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);
+ }
+ /* 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 (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;
+ level_to_str(jcr->get_JobLevel()));
+ jcr->set_JobLevel(jcr->jr.JobLevel = L_FULL);
+ } else if (do_diff) {
+ /* 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);
} 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->JobLevel));
- jcr->JobLevel = jcr->jr.JobLevel = JobLevel;
+ level_to_str(jcr->get_JobLevel()));
+ jcr->set_JobLevel(jcr->jr.JobLevel = JobLevel);
jcr->jr.JobId = jcr->JobId;
break;
}
jcr->jr.JobId = jcr->JobId;
break;
}
- Dmsg2(100, "Level=%c last start time=%s\n", jcr->JobLevel, jcr->stime);
+ Dmsg2(100, "Level=%c last start time=%s\n", jcr->get_JobLevel(), jcr->stime);
}
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.
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) {
+ switch (jcr->get_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:
default:
Jmsg2(jcr, M_FATAL, 0, _("Unimplemented backup level %d %c\n"),
- jcr->JobLevel, jcr->JobLevel);
+ jcr->get_JobLevel(), jcr->get_JobLevel());
return 0;
}
Dmsg1(120, ">filed: %s", fd->msg);
num = fileset->num_excludes;
}
for (int i=0; i<num; i++) {
- BPIPE *bpipe;
- FILE *ffd;
- char buf[2000];
- char *p;
- int optlen, stat;
+ char *item;
INCEXE *ie;
int j, k;
if (include) {
ie = fileset->include_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; j<ie->num_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++) {
}
for (k=0; k<fo->regex.size(); k++) {
- bnet_fsend(fd, "R %s\n", fo->regex.get(k));
+ fd->fsend("R %s\n", fo->regex.get(k));
}
for (k=0; k<fo->regexdir.size(); k++) {
- bnet_fsend(fd, "RD %s\n", fo->regexdir.get(k));
+ fd->fsend("RD %s\n", fo->regexdir.get(k));
}
for (k=0; k<fo->regexfile.size(); k++) {
- bnet_fsend(fd, "RF %s\n", fo->regexfile.get(k));
+ fd->fsend("RF %s\n", fo->regexfile.get(k));
}
for (k=0; k<fo->wild.size(); k++) {
- bnet_fsend(fd, "W %s\n", fo->wild.get(k));
+ fd->fsend("W %s\n", fo->wild.get(k));
}
for (k=0; k<fo->wilddir.size(); k++) {
- bnet_fsend(fd, "WD %s\n", fo->wilddir.get(k));
+ fd->fsend("WD %s\n", fo->wilddir.get(k));
}
for (k=0; k<fo->wildfile.size(); k++) {
- bnet_fsend(fd, "WF %s\n", fo->wildfile.get(k));
+ fd->fsend("WF %s\n", fo->wildfile.get(k));
}
for (k=0; k<fo->wildbase.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; k<fo->base.size(); k++) {
- bnet_fsend(fd, "B %s\n", fo->base.get(k));
+ fd->fsend("B %s\n", fo->base.get(k));
}
for (k=0; k<fo->fstype.size(); k++) {
- bnet_fsend(fd, "X %s\n", fo->fstype.get(k));
+ fd->fsend("X %s\n", fo->fstype.get(k));
}
for (k=0; k<fo->drivetype.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; j<ie->name_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.bstrerror());
- 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.bstrerror(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.bstrerror());
- 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;
+ }
+ }
+ fd->fsend("N\n");
+ for (j=0; j<ie->plugin_list.size(); j++) {
+ item = (char *)ie->plugin_list.get(j);
+ if (!send_list_item(jcr, "P ", item, fd)) {
+ goto bail_out;
}
}
- bnet_fsend(fd, "N\n");
+ fd->fsend("N\n");
}
if (!include) { /* If we just did excludes */
break; /* all done */
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;
}
}
+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
{
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;
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);
Dmsg0(120, "bdird: sending runscripts to fd\n");
foreach_alist(cmd, jcr->job->RunScripts) {
-
- if (cmd->can_run_at_level(jcr->JobLevel) && cmd->target) {
-
+ if (cmd->can_run_at_level(jcr->get_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);
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 */
}
}
- /* 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.
BSOCK *fd;
int n = 0;
ATTR_DBR *ar = NULL;
+ char digest[MAXSTRING];
fd = jcr->file_bsock;
jcr->jr.FirstIndex = 1;
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) {
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, _("<filed: bad attributes, expected 3 fields got %d\n"
"msglen=%d msg=%s\n"), len, fd->msglen, fd->msg);
set_jcr_job_status(jcr, JS_ErrorTerminated);
return 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;
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 Opts_Digest */
p++; /* skip space */
+ Dmsg1(dbglvl, "Stream=%d\n", stream);
if (stream == STREAM_UNIX_ATTRIBUTES || stream == STREAM_UNIX_ATTRIBUTES_EX) {
if (jcr->cached_attribute) {
- Dmsg2(dbglvl, "Cached attr. Stream=%d fname=%s\n", ar->Stream, ar->fname);
+ 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;
+ fn = jcr->fname = check_pool_memory_size(jcr->fname, fd->msglen);
while (*p != 0) {
*fn++ = *p++; /* copy filename */
}
- *fn = *p++; /* term filename and point to attribs */
- attr = p;
- len = strlen(attr);
- jcr->attr = check_pool_memory_size(jcr->attr, len);
- memcpy(jcr->attr, attr, len);
+ *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->attr = jcr->attr;
ar->fname = jcr->fname;
ar->FileIndex = file_index;
ar->Stream = stream;
jcr->cached_attribute = true;
Dmsg2(dbglvl, "dird<filed: stream=%d %s\n", stream, jcr->fname);
- Dmsg1(dbglvl, "dird<filed: attr=%s\n", attr);
+ Dmsg1(dbglvl, "dird<filed: attr=%s\n", ar->attr);
jcr->FileId = ar->FileId;
/*
* First, get STREAM_UNIX_ATTRIBUTES and fill ATTR_DBR structure
stream_to_ascii(stream), file_index, jcr->FileIndex);
continue;
}
- db_escape_string(digest, Opts_Digest, strlen(Opts_Digest));
ar->Digest = digest;
ar->DigestType = crypto_digest_stream_type(stream);
- Dmsg3(dbglvl, "DigestLen=%d Digest=%s type=%d\n", strlen(digest), digest,
- ar->DigestType);
- if (jcr->cached_attribute) {
- Dmsg2(dbglvl, "Cached attr with digest. Stream=%d fname=%s\n", ar->Stream, ar->fname);
- 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;
- } else {
- if (!db_add_digest_to_file_record(jcr, jcr->db, ar->FileId,
- ar->Digest, ar->DigestType)) {
- Jmsg(jcr, M_ERROR, 0, _("Catalog error updating file digest. %s"),
- db_strerror(jcr->db));
- }
- }
+ 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, _("<filed: Network error getting attributes. ERR=%s\n"),
- bnet_strerror(fd));
+ fd->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;
}
projects / bacula / bacula / blobdiff