/*
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.
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";
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;
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,
- name, jcr->client->address, NULL, jcr->client->FDport, verbose);
+
+ 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;
void get_level_since_time(JCR *jcr, char *since, int since_len)
{
int JobLevel;
- bool FullOk;
- utime_t now, LastFull;
+ bool have_full;
+ bool do_full = false;
+ bool do_diff = false;
+ utime_t now;
+ utime_t last_full_time;
+ utime_t last_diff_time;
since[0] = 0;
/* If job cloned and a since time already given, use it */
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 */
- FullOk = 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 (FullOk && jcr->job->MaxFullAge > 0) {
- now = btime_to_utime(get_current_btime());
- LastFull = str_to_utime(jcr->stime);
- FullOk = ((now - LastFull) < jcr->job->MaxFullAge);
+ 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 */
+ have_full = db_find_job_start_time(jcr, jcr->db, &jcr->jr, &jcr->stime);
+ if (have_full) {
+ last_full_time = str_to_utime(jcr->stime);
+ } else {
+ do_full = true; /* No full, upgrade to one */
}
- if (!FullOk) {
- /* No recent job found, so upgrade this one to Full */
+ /* 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;
+ }
+ } else {
+ /* No last differential, so use last full time */
+ last_diff_time = last_full_time;
+ }
+ do_diff = ((now - last_diff_time) >= 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);
- fd->fsend(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:
- fd->fsend(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:
- fd->fsend(levelcmd, "full", " ", 0);
+ fd->fsend(levelcmd, not_accurate, "full", " ", 0);
break;
case L_DIFFERENTIAL:
- fd->fsend(levelcmd, "differential", " ", 0);
+ fd->fsend(levelcmd, accurate, "differential", " ", 0);
send_since_time(jcr);
break;
case L_INCREMENTAL:
- fd->fsend(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);
if (fo->plugin) {
fd->fsend("G %s\n", fo->plugin);
}
+ if (fo->ignoredir) {
+ bnet_fsend(fd, "Z %s\n", fo->ignoredir);
+ }
if (fo->reader) {
fd->fsend("D %s\n", fo->reader);
}
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);
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, 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);
}
}
/* 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 */
}