/*
Bacula® - The Network Backup Solution
- Copyright (C) 2000-2009 Free Software Foundation Europe e.V.
+ Copyright (C) 2000-2010 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.
This program is Free Software; you can redistribute it and/or
- modify it under the terms of version two of the GNU General Public
+ modify it under the terms of version three of the GNU Affero General Public
License as published by the Free Software Foundation and included
in the file LICENSE.
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
General Public License for more details.
- You should have received a copy of the GNU General Public License
+ You should have received a copy of the GNU Affero General Public License
along with this program; if not, write to the Free Software
Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
02110-1301, USA.
*
* Kern Sibbald, October MM
*
- * Version $Id$
- *
*/
#include "bacula.h"
static int runbeforenow_cmd(JCR *jcr);
static void set_options(findFOPTS *fo, const char *opts);
static void set_storage_auth_key(JCR *jcr, char *key);
+static int sm_dump_cmd(JCR *jcr);
+#ifdef DEVELOPER
+static int exit_cmd(JCR *jcr);
+#endif
/* Exported functions */
{"RunAfterJob", runafter_cmd, 0},
{"Run", runscript_cmd, 0},
{"accurate", accurate_cmd, 0},
+ {"sm_dump", sm_dump_cmd, 0},
+#ifdef DEVELOPER
+ {"exit", exit_cmd, 0},
+#endif
{NULL, NULL} /* list terminator */
};
free_jcr(jcr); /* destroy JCR record */
Dmsg0(100, "Done with free_jcr\n");
Dsm_check(1);
+ garbage_collect_memory_pool();
return NULL;
}
-/*
+static int sm_dump_cmd(JCR *jcr)
+{
+ close_memory_pool();
+ sm_dump(false, true);
+ jcr->dir_bsock->fsend("2000 sm_dump OK\n");
+ return 1;
+}
+
+#ifdef DEVELOPER
+static int exit_cmd(JCR *jcr)
+{
+ jcr->dir_bsock->fsend("2000 exit OK\n");
+ terminate_filed(0);
+ return 0;
+}
+#endif
+
+
+/**
* Hello from Director he must identify himself and provide his
* password.
*/
if (cjcr->store_bsock) {
cjcr->store_bsock->set_timed_out();
cjcr->store_bsock->set_terminated();
- pthread_kill(cjcr->my_thread_id, TIMEOUT_SIGNAL);
+ cjcr->my_thread_send_signal(TIMEOUT_SIGNAL);
}
generate_plugin_event(cjcr, bEventCancelCommand, NULL);
set_jcr_job_status(cjcr, JS_Canceled);
* Add fname to include/exclude fileset list. First check for
* | and < and if necessary perform command.
*/
-static void add_file_to_fileset(JCR *jcr, const char *fname, findFILESET *fileset,
- bool is_file)
+void add_file_to_fileset(JCR *jcr, const char *fname, findFILESET *fileset,
+ bool is_file)
{
char *p;
BPIPE *bpipe;
}
}
+findFILESET *new_exclude(JCR *jcr)
+{
+ FF_PKT *ff = jcr->ff;
+ findFILESET *fileset = ff->fileset;
+
+ /* New exclude */
+ fileset->incexe = (findINCEXE *)malloc(sizeof(findINCEXE));
+ memset(fileset->incexe, 0, sizeof(findINCEXE));
+ fileset->incexe->opts_list.init(1, true);
+ fileset->incexe->name_list.init();
+ fileset->incexe->plugin_list.init();
+ fileset->exclude_list.append(fileset->incexe);
+ return fileset;
+}
+
static void add_fileset(JCR *jcr, const char *item)
{
fileset->include_list.append(fileset->incexe);
break;
case 'E':
- /* New exclude */
- fileset->incexe = (findINCEXE *)malloc(sizeof(findINCEXE));
- memset(fileset->incexe, 0, sizeof(findINCEXE));
- fileset->incexe->opts_list.init(1, true);
- fileset->incexe->name_list.init();
- fileset->incexe->plugin_list.init();
- fileset->exclude_list.append(fileset->incexe);
+ fileset = new_exclude(jcr);
break;
case 'N':
state = state_none;
}
fo->AccurateOpts[j] = 0;
break;
+ case 'J': /* Basejob options */
+ /* Copy BaseJob Options */
+ for (j=0; *p && *p != ':'; p++) {
+ fo->BaseJobOpts[j] = *p;
+ if (j < (int)sizeof(fo->BaseJobOpts) - 1) {
+ j++;
+ }
+ }
+ fo->BaseJobOpts[j] = 0;
+ break;
case 'P': /* strip path */
/* Get integer */
p++; /* skip P */
level = get_memory(dir->msglen+1);
Dmsg1(100, "level_cmd: %s", dir->msg);
+
+ /* keep compatibility with older directors */
if (strstr(dir->msg, "accurate")) {
jcr->accurate = true;
}
buf = get_memory(dir->msglen+1);
utime_t since_time, adj;
btime_t his_time, bt_start, rt=0, bt_adj=0;
- if (jcr->get_JobLevel() == L_NONE) {
+ if (jcr->getJobLevel() == L_NONE) {
jcr->set_JobLevel(L_SINCE); /* if no other job level set, do it now */
}
if (sscanf(dir->msg, "level = since_utime %s mtime_only=%d",
if (buf) {
free_memory(buf);
}
- generate_plugin_event(jcr, bEventLevel, (void *)jcr->get_JobLevel());
+ generate_plugin_event(jcr, bEventLevel, (void *)jcr->getJobLevel());
return dir->fsend(OKlevel);
bail_out:
if (get_win32_driveletters(jcr->ff, szWinDriveLetters)) {
Jmsg(jcr, M_INFO, 0, _("Generate VSS snapshots. Driver=\"%s\", Drive(s)=\"%s\"\n"), g_pVSSClient->GetDriverName(), szWinDriveLetters);
if (!g_pVSSClient->CreateSnapshots(szWinDriveLetters)) {
- Jmsg(jcr, M_WARNING, 0, _("Generate VSS snapshots failed.\n"));
- jcr->JobErrors++;
+ berrno be;
+ Jmsg(jcr, M_FATAL, 0, _("Generate VSS snapshots failed. ERR=%s\n"), be.bstrerror());
} else {
/* tell user if snapshot creation of a specific drive failed */
int i;
dir->fsend(OKverify);
generate_daemon_event(jcr, "JobStart");
- generate_plugin_event(jcr, bEventLevel, (void *)jcr->get_JobLevel());
+ generate_plugin_event(jcr, bEventLevel, (void *)jcr->getJobLevel());
generate_plugin_event(jcr, bEventStartVerifyJob);
Dmsg1(110, "filed>dird: %s", dir->msg);
- switch (jcr->get_JobLevel()) {
+ switch (jcr->getJobLevel()) {
case L_VERIFY_INIT:
case L_VERIFY_CATALOG:
do_verify(jcr);
ret = 0; /* we stop here */
}
+ if (job_canceled(jcr)) {
+ ret = 0; /* we stop here */
+ }
+
return ret;
}