/*
Bacula® - The Network Backup Solution
- Copyright (C) 2000-2008 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.
#include "bacula.h"
#include "dird.h"
+#ifdef HAVE_PYTHON
+
+#undef _POSIX_C_SOURCE
+#include <Python.h>
+
+#include "lib/pythonlib.h"
+
+/* Imported Functions */
+extern PyObject *job_getattr(PyObject *self, char *attrname);
+extern int job_setattr(PyObject *self, char *attrname, PyObject *value);
+
+#endif /* HAVE_PYTHON */
+
/* Forward referenced subroutines */
void terminate_dird(int sig);
static bool check_resources();
-static bool check_catalog();
static void dir_sql_query(JCR *jcr, const char *cmd);
/* Exported subroutines */
extern "C" void reload_config(int sig);
extern void invalidate_schedules();
-
+extern bool parse_dir_config(CONFIG *config, const char *configfile, int exit_code);
/* Imported subroutines */
JCR *wait_for_next_job(char *runjob);
void *start_heap;
/* Globals Imported */
-extern int r_first, r_last; /* first and last resources */
-extern RES_TABLE resources[];
-extern RES **res_head;
extern RES_ITEM job_items[];
-extern int res_all_size;
-
#if defined(_MSC_VER)
extern "C" { // work around visual compiler mangling variables
- extern URES res_all;
+ extern URES res_all;
}
#else
extern URES res_all;
#endif
+typedef enum {
+ CHECK_CONNECTION, /* Check catalog connection */
+ UPDATE_CATALOG, /* Ensure that catalog is ok with conf */
+ UPDATE_AND_FIX /* Ensure that catalog is ok, and fix old jobs */
+} cat_op;
+static bool check_catalog(cat_op mode);
+
#define CONFIG_FILE "bacula-dir.conf" /* default configuration file */
+
static void usage()
{
fprintf(stderr, _(
bool test_config = false;
char *uid = NULL;
char *gid = NULL;
+#ifdef HAVE_PYTHON
+ init_python_interpreter_args python_args;
+#endif /* HAVE_PYTHON */
start_heap = sbrk(0);
setlocale(LC_ALL, "");
}
config = new_config_parser();
- config->init(configfile, NULL, M_ERROR_TERM, (void *)&res_all, res_all_size,
- r_first, r_last, resources, res_head);
- config->parse_config();
+ parse_dir_config(config, configfile, M_ERROR_TERM);
if (init_crypto() != 0) {
Jmsg((JCR *)NULL, M_ERROR_TERM, 0, _("Cryptography library initialization failed.\n"));
drop(uid, gid); /* reduce privileges if requested */
- if (!check_catalog()) {
+ /* If we are in testing mode, we don't try to fix the catalog */
+ cat_op mode=(test_config)?CHECK_CONNECTION:UPDATE_AND_FIX;
+
+ if (!check_catalog(mode)) {
Jmsg((JCR *)NULL, M_ERROR_TERM, 0, _("Please correct configuration file: %s\n"), configfile);
}
-
- if (test_config) {
+
+ if (test_config) {
terminate_dird(0);
}
FDConnectTimeout = (int)director->FDConnectTimeout;
SDConnectTimeout = (int)director->SDConnectTimeout;
-
#if !defined(HAVE_WIN32)
signal(SIGHUP, reload_config);
#endif
init_console_msg(working_directory);
- init_python_interpreter(director->name(), director->scripts_directory,
- "DirStartUp");
+#ifdef HAVE_PYTHON
+ python_args.progname = director->name();
+ python_args.scriptdir = director->scripts_directory;
+ python_args.modulename = "DirStartUp";
+ python_args.configfile = configfile;
+ python_args.workingdir = director->working_directory;
+ python_args.job_getattr = job_getattr;
+ python_args.job_setattr = job_setattr;
+ init_python_interpreter(&python_args);
+#endif /* HAVE_PYTHON */
+
+ set_jcr_in_tsd(INVALID_JCR);
set_thread_concurrency(director->MaxConcurrentJobs * 2 +
4 /* UA */ + 4 /* sched+watchdog+jobsvr+misc */);
init_job_server(director->MaxConcurrentJobs);
+ dbg_jcr_add_hook(_dbg_print_db); /* used to debug B_DB connexion after fatal signal */
+
// init_device_resources();
Dmsg0(200, "wait for next job\n");
while ( (jcr = wait_for_next_job(runjob)) ) {
run_job(jcr); /* run job */
free_jcr(jcr); /* release jcr */
+ set_jcr_in_tsd(INVALID_JCR);
if (runjob) { /* command line, run a single job? */
break; /* yes, terminate */
}
exit(1);
}
already_here = true;
+ debug_level = 0; /* turn off debug */
stop_watchdog();
generate_daemon_event(NULL, "Exit");
unload_plugins();
if (debug_level > 5) {
print_memory_pool_stats();
}
- config->free_resources();
- free(config);
- config = NULL;
+ if (config) {
+ config->free_resources();
+ free(config);
+ config = NULL;
+ }
term_ua_server();
term_msg(); /* terminate message handler */
cleanup_crypto();
close_memory_pool(); /* release free memory in pool */
+ lmgr_cleanup_main();
sm_dump(false);
exit(sig);
}
reload_table[table].res_table = config->save_resources();
Dmsg1(100, "Saved old config in table %d\n", table);
- ok = parse_config(configfile, 0, M_ERROR); /* no exit on error */
+ ok = parse_dir_config(config, configfile, M_ERROR);
Dmsg0(100, "Reloaded config file\n");
- if (!ok || !check_resources() || !check_catalog()) {
+ if (!ok || !check_resources() || !check_catalog(UPDATE_CATALOG)) {
rtable = find_free_reload_table_entry(); /* save new, bad table */
if (rtable < 0) {
Jmsg(NULL, M_ERROR, 0, _("Please correct configuration file: %s\n"), configfile);
* Hook all active jobs so that they release this table
*/
foreach_jcr(jcr) {
- if (jcr->JobType != JT_SYSTEM) {
+ if (jcr->get_JobType() != JT_SYSTEM) {
reload_table[table].job_count++;
job_end_push(jcr, reload_job_end_cb, (void *)((long int)table));
njobs++;
/* Transfer default items from JobDefs Resource */
for (i=0; job_items[i].name; i++) {
char **def_svalue, **svalue; /* string value */
- int *def_ivalue, *ivalue; /* integer value */
+ uint32_t *def_ivalue, *ivalue; /* integer value */
bool *def_bvalue, *bvalue; /* bool value */
int64_t *def_lvalue, *lvalue; /* 64 bit values */
uint32_t offset;
* Note, our store_bit does not handle bitmaped fields
*/
} else if (job_items[i].handler == store_bit ||
- job_items[i].handler == store_pint ||
+ job_items[i].handler == store_pint32 ||
job_items[i].handler == store_jobtype ||
job_items[i].handler == store_level ||
- job_items[i].handler == store_pint ||
+ job_items[i].handler == store_int32 ||
job_items[i].handler == store_migtype ||
job_items[i].handler == store_replace) {
- def_ivalue = (int *)((char *)(job->jobdefs) + offset);
+ def_ivalue = (uint32_t *)((char *)(job->jobdefs) + offset);
Dmsg5(400, "Job \"%s\", field \"%s\" def_ivalue=%d item %d offset=%u\n",
job->name(), job_items[i].name, *def_ivalue, i, offset);
- ivalue = (int *)((char *)job + offset);
+ ivalue = (uint32_t *)((char *)job + offset);
*ivalue = *def_ivalue;
set_bit(i, job->hdr.item_present);
/*
return OK;
}
-static bool check_catalog()
+/*
+ * In this routine,
+ * - we can check the connection (mode=CHECK_CONNECTION)
+ * - we can synchronize the catalog with the configuration (mode=UPDATE_CATALOG)
+ * - we can synchronize, and fix old job records (mode=UPDATE_AND_FIX)
+ */
+static bool check_catalog(cat_op mode)
{
bool OK = true;
bool need_tls;
continue;
}
+ /* we are in testing mode, so don't touch anything in the catalog */
+ if (mode == CHECK_CONNECTION) {
+ db_close_database(NULL, db);
+ continue;
+ }
+
/* Loop over all pools, defining/updating them in each database */
POOL *pool;
foreach_res(pool, R_POOL) {
*/
if (!pool->catalog || pool->catalog == catalog) {
create_pool(NULL, db, pool, POOL_OP_UPDATE); /* update request */
- update_pool_recyclepool(NULL, db, pool);
}
}
+ /* Once they are created, we can loop over them again, updating
+ * references (RecyclePool)
+ */
+ foreach_res(pool, R_POOL) {
+ /*
+ * If the Pool has a catalog resource update the pool only
+ * in that catalog.
+ */
+ if (!pool->catalog || pool->catalog == catalog) {
+ update_pool_references(NULL, db, pool);
+ }
+ }
+
+ /* Ensure basic client record is in DB */
+ CLIENT *client;
+ foreach_res(client, R_CLIENT) {
+ CLIENT_DBR cr;
+ memset(&cr, 0, sizeof(cr));
+ bstrncpy(cr.Name, client->name(), sizeof(cr.Name));
+ db_create_client_record(NULL, db, &cr);
+ }
+
+ /* Ensure basic storage record is in DB */
STORE *store;
foreach_res(store, R_STORAGE) {
STORAGE_DBR sr;
MEDIATYPE_DBR mr;
+ memset(&sr, 0, sizeof(sr));
+ memset(&mr, 0, sizeof(mr));
if (store->media_type) {
bstrncpy(mr.MediaType, store->media_type, sizeof(mr.MediaType));
mr.ReadOnly = 0;
db_create_storage_record(NULL, db, &sr);
store->StorageId = sr.StorageId; /* set storage Id */
if (!sr.created) { /* if not created, update it */
+ sr.AutoChanger = store->autochanger;
db_update_storage_record(NULL, db, &sr);
}
counter->CurrentValue = counter->MinValue; /* default value */
}
}
+ /* cleanup old job records */
+ if (mode == UPDATE_AND_FIX) {
+ db_sql_query(db, cleanup_created_job, NULL, NULL);
+ db_sql_query(db, cleanup_running_job, NULL, NULL);
+ db_sql_query(db, "CREATE INDEX basefiles_jobid_idx ON BaseFiles ( JobId )" , NULL, NULL);
+ }
+
db_close_database(NULL, db);
}
/* Set type in global for debugging */