static char exc[] = "exclude\n";
static char jobcmd[] = "JobId=%d Job=%s SDid=%u SDtime=%u Authorization=%s\n";
static char levelcmd[] = "level = %s%s mtime_only=%d\n";
+static char runbefore[] = "RunBeforeJob %s\n";
+static char runafter[] = "RunAfterJob %s\n";
/* Responses received from File daemon */
static char OKjob[] = "2000 OK Job";
static char OKbootstrap[] = "2000 OK bootstrap\n";
static char OKlevel[] = "2000 OK level\n";
+static char OKRunBefore[] = "2000 OK RunBefore\n";
+static char OKRunAfter[] = "2000 OK RunAfter\n";
/* Forward referenced functions */
/*
* Open connection with File daemon.
- * Try connecting every 10 seconds, give up after 1 hour.
+ * Try connecting every retry_interval (default 10 sec), and
+ * give up after max_retry_time (default 30 mins).
*/
int connect_to_file_daemon(JCR *jcr, int retry_interval, int max_retry_time,
memset(jcr->sd_auth_key, 0, strlen(jcr->sd_auth_key));
}
Dmsg1(100, ">filed: %s", fd->msg);
- if (bnet_recv(fd) > 0) {
+ if (bget_dirmsg(fd) > 0) {
Dmsg1(110, "<filed: %s", fd->msg);
if (strncmp(fd->msg, OKjob, strlen(OKjob)) != 0) {
Jmsg(jcr, M_FATAL, 0, _("File daemon \"%s\" rejected Job command: %s\n"),
return 1;
}
-
+/*
+ * This subroutine edits the last job start time into a
+ * "since=date/time" buffer that is returned in the
+ * variable since. This is used for display purposes in
+ * the job report. The time in jcr->stime is later
+ * passed to tell the File daemon what to do.
+ */
void get_level_since_time(JCR *jcr, char *since, int since_len)
{
/* Lookup the last
jcr->stime[0] = 0;
since[0] = 0;
switch (jcr->JobLevel) {
- case L_DIFFERENTIAL:
- case L_INCREMENTAL:
- /* Look up start time of last job */
- jcr->jr.JobId = 0;
- if (!db_find_job_start_time(jcr, jcr->db, &jcr->jr, &jcr->stime)) {
- Jmsg(jcr, M_INFO, 0, "%s", db_strerror(jcr->db));
- Jmsg(jcr, M_INFO, 0, _("No prior or suitable Full backup found. Doing FULL backup.\n"));
- bsnprintf(since, since_len, " (upgraded from %s)",
- level_to_str(jcr->JobLevel));
- jcr->JobLevel = jcr->jr.Level = L_FULL;
- } else {
- bstrncpy(since, ", since=", sizeof(since));
- bstrncat(since, jcr->stime, sizeof(since));
- }
- Dmsg1(115, "Last start time = %s\n", jcr->stime);
- break;
+ case L_DIFFERENTIAL:
+ case L_INCREMENTAL:
+ /* Look up start time of last job */
+ jcr->jr.JobId = 0;
+ if (!db_find_job_start_time(jcr, jcr->db, &jcr->jr, &jcr->stime)) {
+ Jmsg(jcr, M_INFO, 0, "%s", db_strerror(jcr->db));
+ Jmsg(jcr, M_INFO, 0, _("No prior or suitable Full backup found. Doing FULL backup.\n"));
+ bsnprintf(since, since_len, " (upgraded from %s)",
+ level_to_str(jcr->JobLevel));
+ jcr->JobLevel = jcr->jr.Level = L_FULL;
+ } else {
+ bstrncpy(since, ", since=", since_len);
+ bstrncat(since, jcr->stime, since_len);
+ }
+ Dmsg1(100, "Last start time = %s\n", jcr->stime);
+ break;
}
}
/*
- * Send level command for backup and estimate
+ * Send level command to FD.
+ * Used for backup jobs and estimate command.
*/
int send_level_command(JCR *jcr)
{
BSOCK *fd = jcr->file_bsock;
+ utime_t stime;
+ char ed1[50];
/*
* Send Level command to File daemon
*/
case L_BASE:
bnet_fsend(fd, levelcmd, "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);
break;
case L_DIFFERENTIAL:
case L_INCREMENTAL:
- bnet_fsend(fd, levelcmd, "since ", jcr->stime, 0);
+// bnet_fsend(fd, levelcmd, "since ", jcr->stime, 0); /* old code, deprecated */
+ stime = str_to_utime(jcr->stime);
+ bnet_fsend(fd, levelcmd, "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);
+ }
break;
case L_SINCE:
default:
}
fo = ie->opts_list[0];
for (int j=0; j<fo->match.size(); j++) {
- Dmsg1(000, "Match=%s\n", fo->match.get(j));
+ Dmsg1(100, "Match=%s\n", fo->match.get(j));
}
- for (int j=0; j<ie->num_names; j++) {
- p = ie->name_list[j];
+ for (int 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) {
}
/* Copy File options */
if (ie->num_opts) {
- strcpy(buf, ie->opts_list[0]->opts);
- strcat(buf, " ");
+ bstrncpy(buf, ie->opts_list[0]->opts, sizeof(buf));
+ bstrncat(buf, " ", sizeof(buf));
} else {
- strcpy(buf, "0 ");
+ bstrncpy(buf, "0 ", sizeof(buf));
}
+ Dmsg1(100, "Opts=%s\n", buf);
optlen = strlen(buf);
while (fgets(buf+optlen, sizeof(buf)-optlen, bpipe->rfd)) {
fd->msglen = Mmsg(&fd->msg, "%s", buf);
}
/* Copy File options */
if (ie->num_opts) {
- strcpy(buf, ie->opts_list[0]->opts);
- strcat(buf, " ");
+ bstrncpy(buf, ie->opts_list[0]->opts, sizeof(buf));
+ bstrncat(buf, " ", sizeof(buf));
} else {
- strcpy(buf, "0 ");
+ bstrncpy(buf, "0 ", sizeof(buf));
}
+ Dmsg1(100, "Opts=%s\n", buf);
optlen = strlen(buf);
while (fgets(buf+optlen, sizeof(buf)-optlen, ffd)) {
fd->msglen = Mmsg(&fd->msg, "%s", buf);
p++; /* skip over \ */
/* Note, fall through wanted */
default:
+ Dmsg2(100, "numopts=%d opts=%s\n", ie->num_opts, NPRT(ie->opts_list[0]->opts));
if (ie->num_opts) {
pm_strcpy(&fd->msg, ie->opts_list[0]->opts);
pm_strcat(&fd->msg, " ");
} else {
pm_strcpy(&fd->msg, "0 ");
}
- pm_strcat(&fd->msg, p);
+ fd->msglen = pm_strcat(&fd->msg, p);
Dmsg1(100, "Inc/Exc name=%s\n", fd->msg);
- fd->msglen = strlen(fd->msg);
if (!bnet_send(fd)) {
Jmsg(jcr, M_FATAL, 0, _(">filed: write error on socket\n"));
goto bail_out;
int send_include_list(JCR *jcr)
{
BSOCK *fd = jcr->file_bsock;
- fd->msglen = sprintf(fd->msg, inc);
+ fd->msglen = pm_strcpy(&fd->msg, inc);
bnet_send(fd);
return send_list(jcr, INC_LIST);
}
int send_exclude_list(JCR *jcr)
{
BSOCK *fd = jcr->file_bsock;
- fd->msglen = sprintf(fd->msg, exc);
+ fd->msglen = pm_strcpy(&fd->msg, exc);
bnet_send(fd);
return send_list(jcr, EXC_LIST);
}
set_jcr_job_status(jcr, JS_ErrorTerminated);
return 0;
}
- strcpy(fd->msg, bootstrap);
- fd->msglen = strlen(fd->msg);
- bnet_send(fd);
+ bnet_fsend(fd, bootstrap);
while (fgets(buf, sizeof(buf), bs)) {
- fd->msglen = Mmsg(&fd->msg, "%s", buf);
- bnet_send(fd);
+ bnet_fsend(fd, "%s", buf);
}
bnet_sig(fd, BNET_EOD);
fclose(bs);
return 1;
}
+/*
+ * Send ClientRunBeforeJob and ClientRunAfterJob to File daemon
+ */
+int send_run_before_and_after_commands(JCR *jcr)
+{
+ POOLMEM *msg = get_pool_memory(PM_FNAME);
+ BSOCK *fd = jcr->file_bsock;
+ if (jcr->job->ClientRunBeforeJob) {
+ pm_strcpy(&msg, jcr->job->ClientRunBeforeJob);
+ bash_spaces(msg);
+ bnet_fsend(fd, runbefore, msg);
+ if (!response(jcr, fd, OKRunBefore, "ClientRunBeforeJob", DISPLAY_ERROR)) {
+ set_jcr_job_status(jcr, JS_ErrorTerminated);
+ free_pool_memory(msg);
+ return 0;
+ }
+ }
+ if (jcr->job->ClientRunAfterJob) {
+ fd->msglen = pm_strcpy(&msg, jcr->job->ClientRunAfterJob);
+ bash_spaces(msg);
+ bnet_fsend(fd, runafter, msg);
+ if (!response(jcr, fd, OKRunAfter, "ClientRunAfterJob", DISPLAY_ERROR)) {
+ set_jcr_job_status(jcr, JS_ErrorTerminated);
+ free_pool_memory(msg);
+ return 0;
+ }
+ }
+ free_pool_memory(msg);
+ return 1;
+}
+
/*
* Read the attributes from the File daemon for
projects / bacula / bacula / blobdiff