#include "bacula.h"
#include "filed.h"
-#ifdef WIN32_VSS
+
+#if defined(WIN32_VSS)
#include "vss.h"
+
static pthread_mutex_t vss_mutex = PTHREAD_MUTEX_INITIALIZER;
+static int enable_vss;
#endif
-extern char my_name[];
extern CLIENT *me; /* our client resource */
-int enable_vss = 0; /* set to use vss */
-
/* Imported functions */
extern int status_cmd(JCR *jcr);
extern int qstatus_cmd(JCR *jcr);
static void filed_free_jcr(JCR *jcr);
static int open_sd_read_session(JCR *jcr);
static int send_bootstrap_file(JCR *jcr);
+static int runscript_cmd(JCR *jcr);
static int runbefore_cmd(JCR *jcr);
static int runafter_cmd(JCR *jcr);
-static bool run_cmd(JCR *jcr, char *cmd, const char *name);
+static int runbeforenow_cmd(JCR *jcr);
static void set_options(findFOPTS *fo, const char *opts);
{"storage ", storage_cmd, 0},
{"verify", verify_cmd, 0},
{"bootstrap", bootstrap_cmd, 0},
+ {"RunBeforeNow", runbeforenow_cmd, 0},
{"RunBeforeJob", runbefore_cmd, 0},
{"RunAfterJob", runafter_cmd, 0},
+ {"Run", runscript_cmd, 0},
{NULL, NULL} /* list terminator */
};
/* Commands received from director that need scanning */
static char jobcmd[] = "JobId=%d Job=%127s SDid=%d SDtime=%d Authorization=%100s";
-static char storaddr[] = "storage address=%s port=%d ssl=%d\n";
+static char storaddr[] = "storage address=%s port=%d ssl=%d";
static char sessioncmd[] = "session %127s %ld %ld %ld %ld %ld %ld\n";
static char restorecmd[] = "restore replace=%c prelinks=%d where=%s\n";
static char restorecmd1[] = "restore replace=%c prelinks=%d where=\n";
-static char verifycmd[] = "verify level=%30s\n";
-static char estimatecmd[] = "estimate listing=%d\n";
-static char runbefore[] = "RunBeforeJob %s\n";
-static char runafter[] = "RunAfterJob %s\n";
+static char verifycmd[] = "verify level=%30s";
+static char estimatecmd[] = "estimate listing=%d";
+static char runbefore[] = "RunBeforeJob %s";
+static char runafter[] = "RunAfterJob %s";
+static char runscript[] = "Run OnSuccess=%u OnFailure=%u AbortOnError=%u When=%u Command=%s";
/* Responses sent to Director */
static char errmsg[] = "2999 Invalid command\n";
static char BADjob[] = "2901 Bad Job\n";
static char EndJob[] = "2800 End Job TermCode=%d JobFiles=%u ReadBytes=%s JobBytes=%s Errors=%u\n";
static char OKRunBefore[] = "2000 OK RunBefore\n";
+static char OKRunBeforeNow[] = "2000 OK RunBeforeNow\n";
static char OKRunAfter[] = "2000 OK RunAfter\n";
+static char OKRunScript[] = "2000 OK RunScript\n";
+
/* Responses received from Storage Daemon */
static char OK_end[] = "3000 OK end\n";
static char OK_open[] = "3000 OK open ticket = %d\n";
static char OK_data[] = "3000 OK data\n";
static char OK_append[] = "3000 OK append data\n";
-static char OKSDbootstrap[] = "3000 OK bootstrap\n";
+static char OKSDbootstrap[]= "3000 OK bootstrap\n";
/* Commands sent to Storage Daemon */
jcr->dir_bsock = dir;
jcr->ff = init_find_files();
jcr->start_time = time(NULL);
+ jcr->RunScripts = New(alist(10, not_owned_by_alist));
jcr->last_fname = get_pool_memory(PM_FNAME);
jcr->last_fname[0] = 0;
jcr->client_name = get_memory(strlen(my_name) + 1);
bnet_sig(jcr->store_bsock, BNET_TERMINATE);
}
- if (jcr->RunAfterJob && !job_canceled(jcr)) {
- run_cmd(jcr, jcr->RunAfterJob, "ClientRunAfterJob");
- }
generate_daemon_event(jcr, "JobEnd");
dequeue_messages(jcr); /* send any queued messages */
fo->wild.destroy();
fo->wilddir.destroy();
fo->wildfile.destroy();
+ fo->wildbase.destroy();
fo->base.destroy();
fo->fstype.destroy();
+ fo->drivetype.destroy();
if (fo->reader) {
free(fo->reader);
}
fo->wild.destroy();
fo->wilddir.destroy();
fo->wildfile.destroy();
+ fo->wildbase.destroy();
fo->base.destroy();
fo->fstype.destroy();
+ fo->drivetype.destroy();
}
incexe->opts_list.destroy();
incexe->name_list.destroy();
if (cjcr->store_bsock) {
cjcr->store_bsock->timed_out = 1;
cjcr->store_bsock->terminated = 1;
-#if !defined(HAVE_CYGWIN)
pthread_kill(cjcr->my_thread_id, TIMEOUT_SIGNAL);
-#endif
}
set_jcr_job_status(cjcr, JS_Canceled);
free_jcr(cjcr);
{
BSOCK *dir = jcr->dir_bsock;
POOLMEM *sd_auth_key;
-
+
sd_auth_key = get_memory(dir->msglen);
if (sscanf(dir->msg, jobcmd, &jcr->JobId, jcr->Job,
&jcr->VolSessionId, &jcr->VolSessionTime,
bool ok;
BSOCK *dir = jcr->dir_bsock;
POOLMEM *cmd = get_memory(dir->msglen+1);
+ RUNSCRIPT *script;
Dmsg1(100, "runbefore_cmd: %s", dir->msg);
if (sscanf(dir->msg, runbefore, cmd) != 1) {
unbash_spaces(cmd);
/* Run the command now */
- ok = run_cmd(jcr, cmd, "ClientRunBeforeJob");
+ script = new_runscript();
+ script->set_command(cmd);
+ script->when = SCRIPT_Before;
+ ok = script->run(jcr, "ClientRunBeforeJob");
+ free_runscript(script);
+
free_memory(cmd);
if (ok) {
bnet_fsend(dir, OKRunBefore);
}
}
+static int runbeforenow_cmd(JCR *jcr)
+{
+ BSOCK *dir = jcr->dir_bsock;
+
+ run_scripts(jcr, jcr->RunScripts, "ClientBeforeJob");
+ return bnet_fsend(dir, OKRunBeforeNow);
+}
+
static int runafter_cmd(JCR *jcr)
{
BSOCK *dir = jcr->dir_bsock;
POOLMEM *msg = get_memory(dir->msglen+1);
+ RUNSCRIPT *cmd;
Dmsg1(100, "runafter_cmd: %s", dir->msg);
if (sscanf(dir->msg, runafter, msg) != 1) {
return 0;
}
unbash_spaces(msg);
- if (jcr->RunAfterJob) {
- free_pool_memory(jcr->RunAfterJob);
- }
- jcr->RunAfterJob = get_pool_memory(PM_FNAME);
- pm_strcpy(jcr->RunAfterJob, msg);
+
+ cmd = new_runscript();
+ cmd->set_command(msg);
+ cmd->on_success = true;
+ cmd->on_failure = false;
+ cmd->when = SCRIPT_After;
+
+ jcr->RunScripts->append(cmd);
+
free_pool_memory(msg);
return bnet_fsend(dir, OKRunAfter);
}
-static bool run_cmd(JCR *jcr, char *cmd, const char *name)
+static int runscript_cmd(JCR *jcr)
{
- POOLMEM *ecmd = get_pool_memory(PM_FNAME);
- int status;
- BPIPE *bpipe;
- char line[MAXSTRING];
+ BSOCK *dir = jcr->dir_bsock;
+ POOLMEM *msg = get_memory(dir->msglen+1);
- ecmd = edit_job_codes(jcr, ecmd, cmd, "");
- bpipe = open_bpipe(ecmd, 0, "r");
- free_pool_memory(ecmd);
- if (bpipe == NULL) {
- berrno be;
- Jmsg(jcr, M_FATAL, 0, _("%s could not execute. ERR=%s\n"), name,
- be.strerror());
- return false;
- }
- while (fgets(line, sizeof(line), bpipe->rfd)) {
- int len = strlen(line);
- if (len > 0 && line[len-1] == '\n') {
- line[len-1] = 0;
- }
- Jmsg(jcr, M_INFO, 0, _("%s: %s\n"), name, line);
- }
- status = close_bpipe(bpipe);
- if (status != 0) {
- berrno be;
- Jmsg(jcr, M_FATAL, 0, _("%s returned non-zero status=%d. ERR=%s\n"), name,
- status, be.strerror(status));
- return false;
+ RUNSCRIPT *cmd = new_runscript() ;
+
+ Dmsg1(100, "runscript_cmd: '%s'\n", dir->msg);
+ if (sscanf(dir->msg, runscript, &cmd->on_success,
+ &cmd->on_failure,
+ &cmd->abort_on_error,
+ &cmd->when,
+ msg) != 5) {
+ pm_strcpy(jcr->errmsg, dir->msg);
+ Jmsg1(jcr, M_FATAL, 0, _("Bad RunScript command: %s\n"), jcr->errmsg);
+ bnet_fsend(dir, _("2905 Bad RunScript command.\n"));
+ free_runscript(cmd);
+ free_memory(msg);
+ return 0;
}
- return true;
+ unbash_spaces(msg);
+
+ cmd->set_command(msg);
+ cmd->debug();
+ jcr->RunScripts->append(cmd);
+
+ free_pool_memory(msg);
+ return bnet_fsend(dir, OKRunScript);
}
+
static bool init_fileset(JCR *jcr)
{
FF_PKT *ff;
fo->wild.init(1, true);
fo->wilddir.init(1, true);
fo->wildfile.init(1, true);
+ fo->wildbase.init(1, true);
fo->base.init(1, true);
fo->fstype.init(1, true);
+ fo->drivetype.init(1, true);
incexe->current_opts = fo;
incexe->opts_list.append(fo);
}
case '<':
Dmsg0(100, "Doing < include on client.\n");
p++; /* skip over < */
- if ((ffd = fopen(p, "r")) == NULL) {
+ if ((ffd = fopen(p, "rb")) == NULL) {
berrno be;
Jmsg(jcr, M_FATAL, 0, _("Cannot open FileSet input file: %s. ERR=%s\n"),
p, be.strerror());
break;
case 'X':
current_opts = start_options(ff);
- current_opts->fstype.append(bstrdup(item));
state = state_options;
+ if (subcode == ' ') {
+ current_opts->fstype.append(bstrdup(item));
+ } else if (subcode == 'D') {
+ current_opts->drivetype.append(bstrdup(item));
+ } else {
+ state = state_error;
+ }
break;
case 'W':
current_opts = start_options(ff);
current_opts->wilddir.append(bstrdup(item));
} else if (subcode == 'F') {
current_opts->wildfile.append(bstrdup(item));
+ } else if (subcode == 'B') {
+ current_opts->wildbase.append(bstrdup(item));
} else {
state = state_error;
}
for (k=0; k<fo->wildfile.size(); k++) {
Dmsg1(400, "WF %s\n", (char *)fo->wildfile.get(k));
}
+ for (k=0; k<fo->wildbase.size(); k++) {
+ Dmsg1(400, "WB %s\n", (char *)fo->wildbase.get(k));
+ }
for (k=0; k<fo->base.size(); k++) {
Dmsg1(400, "B %s\n", (char *)fo->base.get(k));
}
for (k=0; k<fo->fstype.size(); k++) {
Dmsg1(400, "X %s\n", (char *)fo->fstype.get(k));
}
+ for (k=0; k<fo->drivetype.size(); k++) {
+ Dmsg1(400, "XD %s\n", (char *)fo->drivetype.get(k));
+ }
if (fo->reader) {
Dmsg1(400, "D %s\n", fo->reader);
}
for (k=0; k<fo->wildfile.size(); k++) {
Dmsg1(400, "WF %s\n", (char *)fo->wildfile.get(k));
}
+ for (k=0; k<fo->wildbase.size(); k++) {
+ Dmsg1(400, "WB %s\n", (char *)fo->wildbase.get(k));
+ }
for (k=0; k<fo->base.size(); k++) {
Dmsg1(400, "B %s\n", (char *)fo->base.get(k));
}
for (k=0; k<fo->fstype.size(); k++) {
Dmsg1(400, "X %s\n", (char *)fo->fstype.get(k));
}
+ for (k=0; k<fo->drivetype.size(); k++) {
+ Dmsg1(400, "XD %s\n", (char *)fo->drivetype.get(k));
+ }
}
for (j=0; j<incexe->name_list.size(); j++) {
Dmsg1(400, "F %s\n", (char *)incexe->name_list.get(j));
case 'w':
fo->flags |= FO_IF_NEWER;
break;
+ case 'W':
+ fo->flags |= FO_ENHANCEDWILD;
+ break;
case 'Z': /* gzip compression */
fo->flags |= FO_GZIP;
fo->GZIP_level = *++p - '0';
static int fileset_cmd(JCR *jcr)
{
BSOCK *dir = jcr->dir_bsock;
+
+#if defined(WIN32_VSS)
int vss = 0;
sscanf(dir->msg, "fileset vss=%d", &vss);
enable_vss = vss;
+#endif
if (!init_fileset(jcr)) {
return 0;
}
+static pthread_mutex_t bsr_mutex = PTHREAD_MUTEX_INITIALIZER;
+static uint32_t bsr_uniq = 0;
+
/*
* The Director sends us the bootstrap file, which
* we will in turn pass to the SD.
FILE *bs;
free_bootstrap(jcr);
- Mmsg(fname, "%s/%s.%s.bootstrap", me->working_directory, me->hdr.name,
- jcr->Job);
+ P(bsr_mutex);
+ bsr_uniq++;
+ Mmsg(fname, "%s/%s.%s.%d.bootstrap", me->working_directory, me->hdr.name,
+ jcr->Job, bsr_uniq);
+ V(bsr_mutex);
Dmsg1(400, "bootstrap=%s\n", fname);
jcr->RestoreBootstrap = fname;
- bs = fopen(fname, "a+"); /* create file */
+ bs = fopen(fname, "a+b"); /* create file */
if (!bs) {
berrno be;
Jmsg(jcr, M_FATAL, 0, _("Could not create bootstrap file %s: ERR=%s\n"),
int SDJobStatus;
char ed1[50], ed2[50];
-#ifdef WIN32_VSS
+#if defined(WIN32_VSS)
// capture state here, if client is backed up by multiple directors
// and one enables vss and the other does not then enable_vss can change
// between here and where its evaluated after the job completes.
generate_daemon_event(jcr, "JobStart");
-#ifdef WIN32_VSS
+#if defined(WIN32_VSS)
/* START VSS ON WIN 32 */
if (bDoVSS) {
if (g_pVSSClient->InitializeForBackup()) {
jcr->Errors++;
} else {
/* tell user if snapshot creation of a specific drive failed */
- size_t i;
- for (i=0; i<strlen (szWinDriveLetters); i++) {
+ int i;
+ for (i=0; i < strlen(szWinDriveLetters); i++) {
if (islower(szWinDriveLetters[i])) {
Jmsg(jcr, M_WARNING, 0, _("Generate VSS snapshot of drive \"%c:\\\" failed. VSS support is disabled on this drive.\n"), szWinDriveLetters[i]);
jcr->Errors++;
bnet_suppress_error_messages(sd, 1);
bget_msg(sd); /* Read final response from append_data */
Dmsg0(110, "Error in blast_data.\n");
+ /* run shortly after end of data transmission */
+ run_scripts(jcr, jcr->RunScripts, "ClientAfterJobShort");
+
} else {
set_jcr_job_status(jcr, JS_Terminated);
+
+ /* run shortly after end of data transmission */
+ run_scripts(jcr, jcr->RunScripts, "ClientAfterJobShort");
+
if (jcr->JobStatus != JS_Terminated) {
bnet_suppress_error_messages(sd, 1);
goto cleanup; /* bail out now */
}
cleanup:
-#ifdef WIN32_VSS
+#if defined(WIN32_VSS)
/* STOP VSS ON WIN 32 */
/* tell vss to close the backup session */
if (bDoVSS) {
if (g_pVSSClient->CloseBackup()) {
/* inform user about writer states */
- for (size_t i=0; i<g_pVSSClient->GetWriterCount(); i++) {
+ for (int i=0; i<(int)g_pVSSClient->GetWriterCount(); i++) {
int msg_type = M_INFO;
if (g_pVSSClient->GetWriterState(i) < 1) {
msg_type = M_WARNING;
if (jcr->last_fname) {
free_pool_memory(jcr->last_fname);
}
- if (jcr->RunAfterJob) {
- free_pool_memory(jcr->RunAfterJob);
- }
-
+ free_runscripts(jcr->RunScripts);
+ delete jcr->RunScripts;
return;
}
if (!jcr->RestoreBootstrap) {
return 1;
}
- bs = fopen(jcr->RestoreBootstrap, "r");
+ bs = fopen(jcr->RestoreBootstrap, "rb");
if (!bs) {
berrno be;
Jmsg(jcr, M_FATAL, 0, _("Could not open bootstrap file %s: ERR=%s\n"),