/* Forward referenced functions */
void terminate_stored(int sig);
static void check_config();
-static void *device_allocation(void *arg);
+
+extern "C" void *device_allocation(void *arg);
+
+
#define CONFIG_FILE "bacula-sd.conf" /* Default config file */
/* Global variables exported */
char OK_msg[] = "3000 OK\n";
char TERM_msg[] = "3999 Terminate\n";
-STORES *me; /* our Global resource */
+STORES *me = NULL; /* our Global resource */
+bool forge_on = false; /* proceed inspite of I/O errors */
static uint32_t VolSessionId = 0;
uint32_t VolSessionTime;
static pthread_mutex_t mutex = PTHREAD_MUTEX_INITIALIZER;
static workq_t dird_workq; /* queue for processing connections */
+
static void usage()
{
fprintf(stderr, _(
+"Copyright (C) 2000-2004 Kern Sibbald and John Walker.\n"
"\nVersion: " VERSION " (" BDATE ")\n\n"
-"Usage: stored [-s -f ] [-c config_file] [-d debug_level] [config_file]\n"
+"Usage: stored [options] [-c config_file] [config_file]\n"
" -c <file> use <file> as configuration file\n"
" -dnn set debug level to nn\n"
" -f run in foreground (for debugging)\n"
-" -g groupid\n"
+" -g <group> set groupid to group\n"
+" -p proceed despite I/O errors\n"
" -s no signals (for debugging)\n"
" -t test - read config and exit\n"
-" -u userid\n"
+" -u <user> userid to <user>\n"
" -v verbose user messages\n"
" -? print this message.\n"
"\n"));
init_stack_dump();
my_name_is(argc, argv, "bacula-sd");
- textdomain("bacula-sd");
+ textdomain("bacula");
init_msg(NULL, NULL);
daemon_start_time = time(NULL);
Emsg1(M_ABORT, 0, "Tape block size (%d) is not a power of 2\n", TAPE_BSIZE);
}
- while ((ch = getopt(argc, argv, "c:d:fg:stu:v?")) != -1) {
+ while ((ch = getopt(argc, argv, "c:d:fg:pstu:v?")) != -1) {
switch (ch) {
case 'c': /* configuration file */
if (configfile != NULL) {
gid = optarg;
break;
+ case 'p': /* proceed in spite of I/O errors */
+ forge_on = true;
+ break;
+
case 's': /* no signals */
no_signals = TRUE;
break;
init_stack_dump(); /* pick up new pid */
}
- create_pid_file(me->pid_directory, "bacula-sd", me->SDport);
- read_state_file(me->working_directory, "bacula-sd", me->SDport);
+ create_pid_file(me->pid_directory, "bacula-sd", get_first_port_host_order(me->sdaddrs));
+ read_state_file(me->working_directory, "bacula-sd", get_first_port_host_order(me->sdaddrs));
drop(uid, gid);
bmicrosleep(1, 0);
/* Single server used for Director and File daemon */
- bnet_thread_server(me->SDaddr, me->SDport, me->max_concurrent_jobs * 2 + 1,
- &dird_workq, connection_request);
+ bnet_thread_server(me->sdaddrs, me->max_concurrent_jobs * 2 + 1,
+ &dird_workq, handle_connection_request);
exit(1); /* to keep compiler quiet */
}
* We are started as a separate thread. The
* resources are alread locked.
*/
-static void *device_allocation(void *arg)
+extern "C"
+void *device_allocation(void *arg)
{
DEVRES *device;
JCR *jcr;
DCR *dcr;
jcr = new_jcr(sizeof(JCR), stored_free_jcr);
+ jcr->JobType = JT_SYSTEM;
+ /* Initialize FD start condition variable */
+ int errstat = pthread_cond_init(&jcr->job_start_wait, NULL);
+ if (errstat != 0) {
+ Jmsg1(jcr, M_ABORT, 0, _("Unable to init job cond variable: ERR=%s\n"), strerror(errstat));
+ }
jcr->device = device;
dcr = new_dcr(jcr, device->dev);
- switch (read_dev_volume_label(jcr, device->dev, dcr->block)) {
+ switch (read_dev_volume_label(dcr, dcr->block)) {
case VOL_OK:
break;
default:
bmicrosleep(0, 500000); /* give them 1/2 sec to clean up */
}
- write_state_file(me->working_directory, "bacula-sd", me->SDport);
- delete_pid_file(me->pid_directory, "bacula-sd", me->SDport);
+ write_state_file(me->working_directory, "bacula-sd", get_first_port_host_order(me->sdaddrs));
+ delete_pid_file(me->pid_directory, "bacula-sd", get_first_port_host_order(me->sdaddrs));
Dmsg1(200, "In terminate_stored() sig=%d\n", sig);
stop_watchdog();
close_memory_pool();
- sm_dump(False); /* dump orphaned buffers */
+ sm_dump(false); /* dump orphaned buffers */
exit(sig);
}