X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=bacula%2Fsrc%2Fdird%2Fdird.c;h=1c74ea049170772121247d73a8d595c7431a86f2;hb=786be614c53783a10956e6ea4c9ef1f643edf07a;hp=9cdab0fb86320ba800712c806228b2cf89f74837;hpb=9ee7f2a97d0d94d80579886307168d8ec23faa80;p=bacula%2Fbacula diff --git a/bacula/src/dird/dird.c b/bacula/src/dird/dird.c index 9cdab0fb86..1c74ea0491 100644 --- a/bacula/src/dird/dird.c +++ b/bacula/src/dird/dird.c @@ -1,26 +1,26 @@ /* Bacula® - The Network Backup Solution - Copyright (C) 2000-2007 Free Software Foundation Europe e.V. + Copyright (C) 2000-2012 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 - License as published by the Free Software Foundation plus additions - that are listed in the file LICENSE. + 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. This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of 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. - 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. @@ -31,22 +31,34 @@ * * Kern Sibbald, March MM * - * Version $Id$ */ #include "bacula.h" #include "dird.h" +#ifdef HAVE_PYTHON + +#undef _POSIX_C_SOURCE +#include + +#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); +static void cleanup_old_files(); /* 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); @@ -58,12 +70,14 @@ void term_job_server(); void store_jobtype(LEX *lc, RES_ITEM *item, int index, int pass); void store_level(LEX *lc, RES_ITEM *item, int index, int pass); void store_replace(LEX *lc, RES_ITEM *item, int index, int pass); +void store_migtype(LEX *lc, RES_ITEM *item, int index, int pass); void init_device_resources(); static char *runjob = NULL; -static int background = 1; +static bool background = true; static void init_reload(void); - +static CONFIG *config; + /* Globals Exported */ DIRRES *director; /* Director resource */ int FDConnectTimeout; @@ -72,31 +86,37 @@ char *configfile = NULL; 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[]; - #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, _( PROG_COPYRIGHT "\nVersion: %s (%s)\n\n" -"Usage: dird [-f -s] [-c config_file] [-d debug_level] [config_file]\n" +"Usage: bacula-dir [-f -s] [-c config_file] [-d debug_level] [config_file]\n" " -c set configuration file to file\n" -" -dnn set debug level to nn\n" +" -d set debug level to \n" +" -dt print timestamp in debug output\n" " -f run in foreground (for debugging)\n" " -g groupid\n" +" -m print kaboom output (for debugging)\n" " -r run now\n" " -s no signals\n" " -t test - read configuration and exit\n" @@ -111,7 +131,7 @@ PROG_COPYRIGHT /********************************************************************* * - * Main Bacula Server program + * Main Bacula Director Server program * */ #if defined(HAVE_WIN32) @@ -123,10 +143,13 @@ int main (int argc, char *argv[]) { int ch; JCR *jcr; - int no_signals = FALSE; - int test_config = FALSE; + bool no_signals = false; + 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, ""); @@ -139,7 +162,9 @@ int main (int argc, char *argv[]) init_reload(); daemon_start_time = time(NULL); - while ((ch = getopt(argc, argv, "c:d:fg:r:stu:v?")) != -1) { + console_command = run_console_command; + + while ((ch = getopt(argc, argv, "c:d:fg:mr:stu:v?")) != -1) { switch (ch) { case 'c': /* specify config file */ if (configfile != NULL) { @@ -149,21 +174,29 @@ int main (int argc, char *argv[]) break; case 'd': /* set debug level */ - debug_level = atoi(optarg); - if (debug_level <= 0) { - debug_level = 1; + if (*optarg == 't') { + dbg_timestamp = true; + } else { + debug_level = atoi(optarg); + if (debug_level <= 0) { + debug_level = 1; + } } - Dmsg1(0, "Debug level = %d\n", debug_level); + Dmsg1(10, "Debug level = %d\n", debug_level); break; case 'f': /* run in foreground */ - background = FALSE; + background = false; break; case 'g': /* set group id */ gid = optarg; break; + case 'm': /* print kaboom output */ + prt_kaboom = true; + break; + case 'r': /* run job */ if (runjob != NULL) { free(runjob); @@ -174,11 +207,11 @@ int main (int argc, char *argv[]) break; case 's': /* turn off signals */ - no_signals = TRUE; + no_signals = true; break; case 't': /* test config */ - test_config = TRUE; + test_config = true; break; case 'u': /* set uid */ @@ -218,7 +251,8 @@ int main (int argc, char *argv[]) configfile = bstrdup(CONFIG_FILE); } - parse_config(configfile); + config = new_config_parser(); + parse_dir_config(config, configfile, M_ERROR_TERM); if (init_crypto() != 0) { Jmsg((JCR *)NULL, M_ERROR_TERM, 0, _("Cryptography library initialization failed.\n")); @@ -228,46 +262,66 @@ int main (int argc, char *argv[]) Jmsg((JCR *)NULL, M_ERROR_TERM, 0, _("Please correct configuration file: %s\n"), configfile); } - drop(uid, gid); /* reduce privileges if requested */ + if (!test_config) { /* we don't need to do this block in test mode */ + if (background) { + daemon_start(); + init_stack_dump(); /* grab new pid */ + } + /* Create pid must come after we are a daemon -- so we have our final pid */ + create_pid_file(director->pid_directory, "bacula-dir", + get_first_port_host_order(director->DIRaddrs)); + read_state_file(director->working_directory, "bacula-dir", + get_first_port_host_order(director->DIRaddrs)); + } + + set_jcr_in_tsd(INVALID_JCR); + set_thread_concurrency(director->MaxConcurrentJobs * 2 + + 4 /* UA */ + 5 /* sched+watchdog+jobsvr+misc */); + lmgr_init_thread(); /* initialize the lockmanager stack */ + + load_dir_plugins(director->plugin_directory); + + drop(uid, gid, false); /* reduce privileges if requested */ + + cleanup_old_files(); - 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); } my_name_is(0, NULL, director->name()); /* set user defined name */ /* Plug database interface for library routines */ - p_sql_query = (sql_query)dir_sql_query; - p_sql_escape = (sql_escape)db_escape_string; + p_sql_query = (sql_query_func)dir_sql_query; + p_sql_escape = (sql_escape_func)db_escape_string; FDConnectTimeout = (int)director->FDConnectTimeout; SDConnectTimeout = (int)director->SDConnectTimeout; - if (background) { - daemon_start(); - init_stack_dump(); /* grab new pid */ - } - - /* Create pid must come after we are a daemon -- so we have our final pid */ - create_pid_file(director->pid_directory, "bacula-dir", get_first_port_host_order(director->DIRaddrs)); - read_state_file(director->working_directory, "bacula-dir", get_first_port_host_order(director->DIRaddrs)); - - #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; - set_thread_concurrency(director->MaxConcurrentJobs * 2 + - 4 /* UA */ + 4 /* sched+watchdog+jobsvr+misc */); + init_python_interpreter(&python_args); +#endif /* HAVE_PYTHON */ Dmsg0(200, "Start UA server\n"); start_UA_server(director->DIRaddrs); @@ -278,6 +332,8 @@ int main (int argc, char *argv[]) init_job_server(director->MaxConcurrentJobs); + dbg_jcr_add_hook(db_debug_print); /* used to debug B_DB connexion after fatal signal */ + // init_device_resources(); Dmsg0(200, "wait for next job\n"); @@ -285,6 +341,7 @@ int main (int argc, char *argv[]) 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 */ } @@ -295,6 +352,14 @@ int main (int argc, char *argv[]) return 0; } +/* + * This allows the message handler to operate on the database + * by using a pointer to this function. The pointer is + * needed because the other daemons do not have access + * to the database. If the pointer is + * not defined (other daemons), then writing the database + * is disabled. + */ static void dir_sql_query(JCR *jcr, const char *cmd) { if (!jcr || !jcr->db) { @@ -309,14 +374,16 @@ void terminate_dird(int sig) static bool already_here = false; if (already_here) { /* avoid recursive temination problems */ + bmicrosleep(2, 0); /* yield */ exit(1); } already_here = true; + debug_level = 0; /* turn off debug */ stop_watchdog(); generate_daemon_event(NULL, "Exit"); + unload_plugins(); write_state_file(director->working_directory, "bacula-dir", get_first_port_host_order(director->DIRaddrs)); delete_pid_file(director->pid_directory, "bacula-dir", get_first_port_host_order(director->DIRaddrs)); -// signal(SIGCHLD, SIG_IGN); /* don't worry about children now */ term_scheduler(); term_job_server(); if (runjob) { @@ -328,11 +395,16 @@ void terminate_dird(int sig) if (debug_level > 5) { print_memory_pool_stats(); } - free_config_resources(); + 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); } @@ -378,7 +450,7 @@ static void free_saved_resources(int table) */ static void reload_job_end_cb(JCR *jcr, void *ctx) { - int reload_id = (int)((long int)ctx); + int reload_id = (int)((intptr_t)ctx); Dmsg3(100, "reload job_end JobId=%d table=%d cnt=%d\n", jcr->JobId, reload_id, reload_table[reload_id].job_count); lock_jobs(); @@ -454,13 +526,13 @@ void reload_config(int sig) } Dmsg1(100, "Reload_config njobs=%d\n", njobs); - reload_table[table].res_table = save_config_resources(); + 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()) { + 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); @@ -469,7 +541,7 @@ void reload_config(int sig) Jmsg(NULL, M_ERROR, 0, _("Please correct configuration file: %s\n"), configfile); Jmsg(NULL, M_ERROR, 0, _("Resetting previous configuration.\n")); } - reload_table[rtable].res_table = save_config_resources(); + reload_table[rtable].res_table = config->save_resources(); /* Now restore old resoure values */ int num = r_last - r_first + 1; RES **res_tab = reload_table[table].res_table; @@ -483,7 +555,7 @@ void reload_config(int sig) * Hook all active jobs so that they release this table */ foreach_jcr(jcr) { - if (jcr->JobType != JT_SYSTEM) { + if (jcr->getJobType() != JT_SYSTEM) { reload_table[table].job_count++; job_end_push(jcr, reload_job_end_cb, (void *)((long int)table)); njobs++; @@ -496,7 +568,7 @@ void reload_config(int sig) set_working_directory(director->working_directory); FDConnectTimeout = director->FDConnectTimeout; SDConnectTimeout = director->SDConnectTimeout; - Dmsg0(0, "Director's configuration file reread.\n"); + Dmsg0(10, "Director's configuration file reread.\n"); /* Now release saved resources, if no jobs using the resources */ if (njobs == 0) { @@ -524,6 +596,7 @@ static bool check_resources() { bool OK = true; JOB *job; + bool need_tls; LockRes(); @@ -557,19 +630,22 @@ static bool check_resources() } } - if (!director->tls_certfile && director->tls_enable) { + need_tls = director->tls_enable || director->tls_authenticate; + + if (!director->tls_certfile && need_tls) { Jmsg(NULL, M_FATAL, 0, _("\"TLS Certificate\" file not defined for Director \"%s\" in %s.\n"), director->name(), configfile); OK = false; } - if (!director->tls_keyfile && director->tls_enable) { + if (!director->tls_keyfile && need_tls) { Jmsg(NULL, M_FATAL, 0, _("\"TLS Key\" file not defined for Director \"%s\" in %s.\n"), director->name(), configfile); OK = false; } - if ((!director->tls_ca_certfile && !director->tls_ca_certdir) && director->tls_enable && director->tls_verify_peer) { + if ((!director->tls_ca_certfile && !director->tls_ca_certdir) && + need_tls && director->tls_verify_peer) { Jmsg(NULL, M_FATAL, 0, _("Neither \"TLS CA Certificate\" or \"TLS CA" " Certificate Dir\" are defined for Director \"%s\" in %s." " At least one CA certificate store is required" @@ -579,7 +655,7 @@ static bool check_resources() } /* If everything is well, attempt to initialize our per-resource TLS context */ - if (OK && (director->tls_enable || director->tls_require)) { + if (OK && (need_tls || director->tls_require)) { /* Initialize TLS context: * Args: CA certfile, CA certdir, Certfile, Keyfile, * Keyfile PEM Callback, Keyfile CB Userdata, DHfile, Verify Peer */ @@ -630,7 +706,7 @@ static bool check_resources() /* 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; @@ -684,22 +760,24 @@ static bool check_resources() * 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_size32 || + 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); /* * Handle 64 bit integer fields */ } else if (job_items[i].handler == store_time || - job_items[i].handler == store_size || + job_items[i].handler == store_size64 || job_items[i].handler == store_int64) { def_lvalue = (int64_t *)((char *)(job->jobdefs) + offset); Dmsg5(400, "Job \"%s\", field \"%s\" def_lvalue=%" lld " item %d offset=%u\n", @@ -759,19 +837,22 @@ static bool check_resources() } } - if (!cons->tls_certfile && cons->tls_enable) { + need_tls = cons->tls_enable || cons->tls_authenticate; + + if (!cons->tls_certfile && need_tls) { Jmsg(NULL, M_FATAL, 0, _("\"TLS Certificate\" file not defined for Console \"%s\" in %s.\n"), cons->name(), configfile); OK = false; } - if (!cons->tls_keyfile && cons->tls_enable) { + if (!cons->tls_keyfile && need_tls) { Jmsg(NULL, M_FATAL, 0, _("\"TLS Key\" file not defined for Console \"%s\" in %s.\n"), cons->name(), configfile); OK = false; } - if ((!cons->tls_ca_certfile && !cons->tls_ca_certdir) && cons->tls_enable && cons->tls_verify_peer) { + if ((!cons->tls_ca_certfile && !cons->tls_ca_certdir) + && need_tls && cons->tls_verify_peer) { Jmsg(NULL, M_FATAL, 0, _("Neither \"TLS CA Certificate\" or \"TLS CA" " Certificate Dir\" are defined for Console \"%s\" in %s." " At least one CA certificate store is required" @@ -780,7 +861,7 @@ static bool check_resources() OK = false; } /* If everything is well, attempt to initialize our per-resource TLS context */ - if (OK && (cons->tls_enable || cons->tls_require)) { + if (OK && (need_tls || cons->tls_require)) { /* Initialize TLS context: * Args: CA certfile, CA certdir, Certfile, Keyfile, * Keyfile PEM Callback, Keyfile CB Userdata, DHfile, Verify Peer */ @@ -810,8 +891,8 @@ static bool check_resources() continue; } } - - if ((!client->tls_ca_certfile && !client->tls_ca_certdir) && client->tls_enable) { + need_tls = client->tls_enable || client->tls_authenticate; + if ((!client->tls_ca_certfile && !client->tls_ca_certdir) && need_tls) { Jmsg(NULL, M_FATAL, 0, _("Neither \"TLS CA Certificate\"" " or \"TLS CA Certificate Dir\" are defined for File daemon \"%s\" in %s.\n"), client->name(), configfile); @@ -819,7 +900,7 @@ static bool check_resources() } /* If everything is well, attempt to initialize our per-resource TLS context */ - if (OK && (client->tls_enable || client->tls_require)) { + if (OK && (need_tls || client->tls_require)) { /* Initialize TLS context: * Args: CA certfile, CA certdir, Certfile, Keyfile, * Keyfile PEM Callback, Keyfile CB Userdata, DHfile, Verify Peer */ @@ -836,6 +917,46 @@ static bool check_resources() } } + /* Loop over Storages */ + STORE *store; + foreach_res(store, R_STORAGE) { + /* tls_require implies tls_enable */ + if (store->tls_require) { + if (have_tls) { + store->tls_enable = true; + } else { + Jmsg(NULL, M_FATAL, 0, _("TLS required but not configured in Bacula.\n")); + OK = false; + continue; + } + } + + need_tls = store->tls_enable || store->tls_authenticate; + + if ((!store->tls_ca_certfile && !store->tls_ca_certdir) && need_tls) { + Jmsg(NULL, M_FATAL, 0, _("Neither \"TLS CA Certificate\"" + " or \"TLS CA Certificate Dir\" are defined for Storage \"%s\" in %s.\n"), + store->name(), configfile); + OK = false; + } + + /* If everything is well, attempt to initialize our per-resource TLS context */ + if (OK && (need_tls || store->tls_require)) { + /* Initialize TLS context: + * Args: CA certfile, CA certdir, Certfile, Keyfile, + * Keyfile PEM Callback, Keyfile CB Userdata, DHfile, Verify Peer */ + store->tls_ctx = new_tls_context(store->tls_ca_certfile, + store->tls_ca_certdir, store->tls_certfile, + store->tls_keyfile, NULL, NULL, NULL, true); + + if (!store->tls_ctx) { + Jmsg(NULL, M_FATAL, 0, _("Failed to initialize TLS context for Storage \"%s\" in %s.\n"), + store->name(), configfile); + OK = false; + } + } + } + UnlockRes(); if (OK) { close_msg(NULL); /* close temp message handler */ @@ -844,7 +965,13 @@ static bool check_resources() 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; @@ -856,10 +983,11 @@ static bool check_catalog() * Make sure we can open catalog, otherwise print a warning * message because the server is probably not running. */ - db = db_init_database(NULL, catalog->db_name, catalog->db_user, - catalog->db_password, catalog->db_address, - catalog->db_port, catalog->db_socket, - catalog->mult_db_connections); + db = db_init_database(NULL, catalog->db_driver, catalog->db_name, catalog->db_user, + catalog->db_password, catalog->db_address, + catalog->db_port, catalog->db_socket, + catalog->mult_db_connections, + catalog->disable_batch_insert); if (!db || !db_open_database(NULL, db)) { Pmsg2(000, _("Could not open Catalog \"%s\", database \"%s\".\n"), catalog->name(), catalog->db_name); @@ -874,65 +1002,87 @@ static bool check_catalog() continue; } + /* Display a message if the db max_connections is too low */ + if (!db_check_max_connections(NULL, db, director->MaxConcurrentJobs)) { + Pmsg1(000, "Warning, settings problem for Catalog=%s\n", catalog->name()); + Pmsg1(000, "%s", db_strerror(db)); + } + + /* 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) { - create_pool(NULL, db, pool, POOL_OP_UPDATE); /* update request */ + /* + * If the Pool has a catalog resource create the pool only + * in that catalog. + */ + if (!pool->catalog || pool->catalog == catalog) { + create_pool(NULL, db, pool, POOL_OP_UPDATE); /* update request */ + } } - /* Loop over all pools for updating RecyclePool */ + /* Once they are created, we can loop over them again, updating + * references (RecyclePool) + */ foreach_res(pool, R_POOL) { - update_pool_recyclepool(NULL, db, 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; + /* Create clients only if they use the current catalog */ + if (client->catalog != catalog) { + Dmsg3(500, "Skip client=%s with cat=%s not catalog=%s\n", + client->name(), client->catalog->name(), catalog->name()); + continue; + } + Dmsg2(500, "create cat=%s for client=%s\n", + client->catalog->name(), client->name()); + 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; + MEDIATYPE_DBR mtr; + memset(&sr, 0, sizeof(sr)); + memset(&mtr, 0, sizeof(mtr)); if (store->media_type) { - bstrncpy(mr.MediaType, store->media_type, sizeof(mr.MediaType)); - mr.ReadOnly = 0; - db_create_mediatype_record(NULL, db, &mr); + bstrncpy(mtr.MediaType, store->media_type, sizeof(mtr.MediaType)); + mtr.ReadOnly = 0; + db_create_mediatype_record(NULL, db, &mtr); } else { - mr.MediaTypeId = 0; + mtr.MediaTypeId = 0; } bstrncpy(sr.Name, store->name(), sizeof(sr.Name)); sr.AutoChanger = store->autochanger; - db_create_storage_record(NULL, db, &sr); - store->StorageId = sr.StorageId; /* set storage Id */ - if (!sr.created) { /* if not created, update it */ - db_update_storage_record(NULL, db, &sr); - } - - /* tls_require implies tls_enable */ - if (store->tls_require) { - if (have_tls) { - store->tls_enable = true; - } else { - Jmsg(NULL, M_FATAL, 0, _("TLS required but not configured in Bacula.\n")); - OK = false; - } - } - - if ((!store->tls_ca_certfile && !store->tls_ca_certdir) && store->tls_enable) { - Jmsg(NULL, M_FATAL, 0, _("Neither \"TLS CA Certificate\"" - " or \"TLS CA Certificate Dir\" are defined for Storage \"%s\" in %s.\n"), - store->name(), configfile); + if (!db_create_storage_record(NULL, db, &sr)) { + Jmsg(NULL, M_FATAL, 0, _("Could not create storage record for %s\n"), + store->name()); OK = false; } - - /* If everything is well, attempt to initialize our per-resource TLS context */ - if (OK && (store->tls_enable || store->tls_require)) { - /* Initialize TLS context: - * Args: CA certfile, CA certdir, Certfile, Keyfile, - * Keyfile PEM Callback, Keyfile CB Userdata, DHfile, Verify Peer */ - store->tls_ctx = new_tls_context(store->tls_ca_certfile, - store->tls_ca_certdir, store->tls_certfile, - store->tls_keyfile, NULL, NULL, NULL, true); - - if (!store->tls_ctx) { - Jmsg(NULL, M_FATAL, 0, _("Failed to initialize TLS context for Storage \"%s\" in %s.\n"), - store->name(), configfile); + store->StorageId = sr.StorageId; /* set storage Id */ + if (!sr.created) { /* if not created, update it */ + sr.AutoChanger = store->autochanger; + if (!db_update_storage_record(NULL, db, &sr)) { + Jmsg(NULL, M_FATAL, 0, _("Could not update storage record for %s\n"), + store->name()); OK = false; } } @@ -964,9 +1114,45 @@ static bool check_catalog() 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); + } + + /* Set type in global for debugging */ + set_db_type(db_get_type(db)); + db_close_database(NULL, db); } - /* Set type in global for debugging */ - set_db_type(db_get_type()); return OK; } + +static void copy_base_name(POOLMEM *cleanup) +{ + int len = strlen(director->working_directory); +#if defined(HAVE_WIN32) + pm_strcpy(cleanup, "del /q "); +#else + pm_strcpy(cleanup, "/bin/rm -f "); +#endif + pm_strcat(cleanup, director->working_directory); + if (len > 0 && !IsPathSeparator(director->working_directory[len-1])) { + pm_strcat(cleanup, "/"); + } + pm_strcat(cleanup, my_name); +} + +static void cleanup_old_files() +{ + POOLMEM *cleanup = get_pool_memory(PM_MESSAGE); + POOLMEM *results = get_pool_memory(PM_MESSAGE); + copy_base_name(cleanup); + pm_strcat(cleanup, "*.restore.*.bsr"); + run_program(cleanup, 0, results); + copy_base_name(cleanup); + pm_strcat(cleanup, "*.mail"); + run_program(cleanup, 0, results); + free_pool_memory(cleanup); + free_pool_memory(results); +}