#include "dird.h"
/* Commands sent to File daemon */
-static char inc[] = "include\n";
-static char exc[] = "exclude\n";
static char fileset[] = "fileset\n"; /* set full fileset */
static char jobcmd[] = "JobId=%d Job=%s SDid=%u SDtime=%u Authorization=%s\n";
/* Note, mtime_only is not used here -- implemented as file option */
/* Responses received from File daemon */
static char OKinc[] = "2000 OK include\n";
-static char OKexc[] = "2000 OK exclude\n";
static char OKjob[] = "2000 OK Job";
static char OKbootstrap[] = "2000 OK bootstrap\n";
static char OKlevel[] = "2000 OK level\n";
void get_level_since_time(JCR *jcr, char *since, int since_len)
{
int JobLevel;
- /* Lookup the last FULL backup job to get the time/date for a
- * differential or incremental save.
- */
+
+ since[0] = 0;
+ if (jcr->cloned) {
+ if ( jcr->stime && jcr->stime[0]) {
+ bstrncpy(since, ", since=", since_len);
+ bstrncat(since, jcr->stime, since_len);
+ }
+ return;
+ }
if (!jcr->stime) {
jcr->stime = get_pool_memory(PM_MESSAGE);
- }
+ }
jcr->stime[0] = 0;
- since[0] = 0;
+ /* 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:
Dmsg2(100, "Level=%c last start time=%s\n", jcr->JobLevel, jcr->stime);
}
+static void send_since_time(JCR *jcr)
+{
+ BSOCK *fd = jcr->file_bsock;
+ utime_t stime;
+ char ed1[50];
+
+ 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);
+ }
+}
+
/*
* Send level command to FD.
* Used for backup jobs and estimate command.
*/
-int send_level_command(JCR *jcr)
+bool send_level_command(JCR *jcr)
{
BSOCK *fd = jcr->file_bsock;
- utime_t stime;
- char ed1[50];
/*
* Send Level command to File daemon
*/
bnet_fsend(fd, levelcmd, "full", " ", 0);
break;
case L_DIFFERENTIAL:
+ bnet_fsend(fd, levelcmd, "differential", " ", 0);
+ send_since_time(jcr);
+ break;
case L_INCREMENTAL:
- 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);
- }
+ bnet_fsend(fd, levelcmd, "incremental", " ", 0);
+ send_since_time(jcr);
break;
case L_SINCE:
default:
return 1;
}
-
-/*
- * Send either an Included or an Excluded list to FD
- */
-static int send_list(JCR *jcr, int list)
-{
- FILESET *fileset;
- BSOCK *fd;
- int num;
-
- fd = jcr->file_bsock;
- fileset = jcr->fileset;
-
- if (list == INC_LIST) {
- num = fileset->num_includes;
- } else {
- num = fileset->num_excludes;
- }
-
- for (int i=0; i<num; i++) {
- BPIPE *bpipe;
- FILE *ffd;
- char buf[2000];
- char *p;
- int optlen, stat;
- INCEXE *ie;
-
-
- if (list == INC_LIST) {
- ie = fileset->include_items[i];
- } else {
- ie = fileset->exclude_items[i];
- }
- 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) {
- berrno be;
- Jmsg(jcr, M_FATAL, 0, _("Cannot run program: %s. ERR=%s\n"),
- p, be.strerror());
- goto bail_out;
- }
- /* Copy File options */
- if (ie->num_opts) {
- bstrncpy(buf, ie->opts_list[0]->opts, sizeof(buf));
- bstrncat(buf, " ", sizeof(buf));
- } else {
- bstrncpy(buf, "0 ", 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 %p: ERR=%s\n"),
- p, be.strerror(stat));
- goto bail_out;
- }
- break;
- case '<':
- p++; /* skip over < */
- if ((ffd = fopen(p, "r")) == NULL) {
- Jmsg(jcr, M_FATAL, 0, _("Cannot open %s file: %s. ERR=%s\n"),
- list==INC_LIST?"included":"excluded", p, strerror(errno));
- goto bail_out;
- }
- /* Copy File options */
- if (ie->num_opts) {
- bstrncpy(buf, ie->opts_list[0]->opts, sizeof(buf));
- bstrncat(buf, " ", sizeof(buf));
- } else {
- bstrncpy(buf, "0 ", 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:
- if (ie->num_opts) {
- Dmsg2(500, "numopts=%d opts=%s\n", ie->num_opts, NPRT(ie->opts_list[0]->opts));
- pm_strcpy(fd->msg, ie->opts_list[0]->opts);
- pm_strcat(fd->msg, " ");
- } else {
- pm_strcpy(fd->msg, "0 ");
- }
- 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;
- }
- }
- }
- bnet_sig(fd, BNET_EOD); /* end of data */
- if (list == INC_LIST) {
- if (!response(jcr, fd, OKinc, "Include", DISPLAY_ERROR)) {
- goto bail_out;
- }
- } else if (!response(jcr, fd, OKexc, "Exclude", DISPLAY_ERROR)) {
- goto bail_out;
- }
- return 1;
-
-bail_out:
- set_jcr_job_status(jcr, JS_ErrorTerminated);
- return 0;
-
-}
-
-
/*
* Send either an Included or an Excluded list to FD
*/
/*
* Send include list to File daemon
*/
-int send_include_list(JCR *jcr)
+bool send_include_list(JCR *jcr)
{
BSOCK *fd = jcr->file_bsock;
if (jcr->fileset->new_include) {
bnet_fsend(fd, fileset);
return send_fileset(jcr);
- } else {
- bnet_fsend(fd, inc);
}
- return send_list(jcr, INC_LIST);
+ return true;
}
/*
* Send exclude list to File daemon
+ * Under the new scheme, the Exclude list
+ * is part of the FileSet sent with the
+ * "include_list" above.
*/
-int send_exclude_list(JCR *jcr)
+bool send_exclude_list(JCR *jcr)
{
- BSOCK *fd = jcr->file_bsock;
- if (jcr->fileset->new_include) {
- return 1;
- }
- bnet_fsend(fd, exc);
- return send_list(jcr, EXC_LIST);
+ return true;
}
* Send bootstrap file if any to the File daemon.
* This is used for restore and verify VolumeToCatalog
*/
-int send_bootstrap_file(JCR *jcr)
+bool send_bootstrap_file(JCR *jcr)
{
FILE *bs;
char buf[1000];
projects / bacula / bacula / blobdiff