#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";
{
BSOCK *fd;
char ed1[30];
+ utime_t heart_beat;
+
+ if (jcr->client->heartbeat_interval) {
+ heart_beat = jcr->client->heartbeat_interval;
+ } else {
+ heart_beat = director->heartbeat_interval;
+ }
if (!jcr->file_bsock) {
- fd = bnet_connect(jcr, retry_interval, max_retry_time,
+ fd = bnet_connect(jcr, retry_interval, max_retry_time, heart_beat,
_("File daemon"), jcr->client->address,
NULL, jcr->client->FDport, verbose);
if (fd == NULL) {
if (!bpipe) {
berrno be;
Jmsg(jcr, M_FATAL, 0, _("Cannot run program: %s. ERR=%s\n"),
- p, be.strerror());
+ p, be.bstrerror());
goto bail_out;
}
bstrncpy(buf, "F ", sizeof(buf));
if ((stat=close_bpipe(bpipe)) != 0) {
berrno be;
Jmsg(jcr, M_FATAL, 0, _("Error running program: %s. ERR=%s\n"),
- p, be.strerror(stat));
+ p, be.bstrerror(stat));
goto bail_out;
}
break;
if ((ffd = fopen(p, "rb")) == NULL) {
berrno be;
Jmsg(jcr, M_FATAL, 0, _("Cannot open included file: %s. ERR=%s\n"),
- p, be.strerror());
+ p, be.bstrerror());
goto bail_out;
}
bstrncpy(buf, "F ", sizeof(buf));
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;
}
}
}
/* TODO : we have to play with other client */
- /*
+ /*
else {
send command to an other client
}
}
+
/*
* 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;
+ 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, _("<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;
}
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, "dird<filed: stream=%d %s\n", stream, jcr->fname);
- Dmsg1(120, "dird<filed: attr=%s\n", attr);
-
- if (!db_create_file_attributes_record(jcr, jcr->db, &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, "dird<filed: stream=%d %s\n", stream, jcr->fname);
+ Dmsg1(dbglvl, "dird<filed: attr=%s\n", ar->attr);
+ 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(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));
- set_jcr_job_status(jcr, JS_ErrorTerminated);
+ 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;
}