*
*/
/*
- Copyright (C) 2000, 2001, 2002 Kern Sibbald and John Walker
+ Copyright (C) 2000-2003 Kern Sibbald and John Walker
This program is free software; you can redistribute it and/or
modify it under the terms of the GNU General Public License as
/* Forward referenced functions */
void terminate_stored(int sig);
static void check_config();
-static void *director_thread(void *arg);
+static void *device_allocation(void *arg);
#define CONFIG_FILE "bacula-sd.conf" /* Default config file */
/* Global variables exported */
-struct s_shm *shm; /* memory shared with children */
-BSHM bshm; /* shared memory control packet */
-
-
/* This is our own global resource */
-static STORES *me;
+STORES *me;
static pthread_mutex_t mutex = PTHREAD_MUTEX_INITIALIZER;
static uint32_t VolSessionId = 0;
uint32_t VolSessionTime;
-static char *configfile;
+char *configfile;
static int foreground = 0;
static workq_t dird_workq; /* queue for processing connections */
-static workq_t filed_workq; /* queue for processing connections */
static void usage()
{
fprintf(stderr, _(
-"\nVersion: " VERSION " (" DATE ")\n\n"
+"\nVersion: " VERSION " (" BDATE ")\n\n"
"Usage: stored [-s -f ] [-c config_file] [-d debug_level] [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"
" -s no signals (for debugging)\n"
" -t test - read config and exit\n"
+" -u userid\n"
" -? print this message.\n"
"\n"));
exit(1);
*/
int main (int argc, char *argv[])
{
- int ch, i;
+ int ch;
int no_signals = FALSE;
int test_config = FALSE;
- DEVRES *device;
- pthread_t dirid;
- int status;
+ pthread_t thid;
+ char *uid = NULL;
+ char *gid = NULL;
init_stack_dump();
my_name_is(argc, argv, "stored");
Emsg1(M_ABORT, 0, "Tape block size (%d) is not a power of 2\n", TAPE_BSIZE);
}
- while ((ch = getopt(argc, argv, "c:d:fst?")) != -1) {
+ while ((ch = getopt(argc, argv, "c:d:fg:stu:?")) != -1) {
switch (ch) {
case 'c': /* configuration file */
if (configfile != NULL) {
foreground = TRUE;
break;
+ case 'g': /* set group id */
+ gid = optarg;
+ break;
+
case 's': /* no signals */
no_signals = TRUE;
break;
test_config = TRUE;
break;
+ case 'u': /* set uid */
+ uid = optarg;
+ break;
+
case '?':
default:
usage();
parse_config(configfile);
check_config();
- bshm.size = 0;
if (test_config) {
terminate_stored(0);
}
init_stack_dump(); /* pick up new pid */
}
- create_pid_file(me->pid_directory, "bacula-sd", me->SDport);
+ drop(uid, gid);
- /* ****FIXME**** clean this up */
- /* Create and attach to shared memory. This is a
- * hold over from the days of child processes.
- * Note, in reality all memory is shared. This
- * is just a global buffer for the device packets.
- */
- shm = (s_shm *) malloc(sizeof(struct s_shm));
- /* Zero shared memory */
- memset(shm, 0, sizeof(struct s_shm));
+ create_pid_file(me->pid_directory, "bacula-sd", me->SDport);
/* Ensure that Volume Session Time and Id are both
* set and are both non-zero.
Emsg0(M_ABORT, 0, _("Volume Session Time is ZERO!\n"));
}
- LockRes();
- for (device=NULL,i=0; (device=(DEVRES *)GetNextRes(R_DEVICE, (RES *)device)); i++) {
- if (i >= MAX_DEVICES) {
- UnlockRes();
- Emsg1(M_ABORT, 0, _("Too many Device Resources. Max=%d\n"), MAX_DEVICES);
- }
- Dmsg1(90, "calling init_dev %s\n", device->device_name);
- device->dev = init_dev(&shm->dev[i], device->device_name);
- /* Copy some attributes from the Device Resource to the DEV structure */
- if (device->dev) {
- device->dev->capabilities = device->cap_bits;
- device->dev->min_block_size = device->min_block_size;
- device->dev->max_block_size = device->max_block_size;
- device->dev->max_volume_jobs = device->max_volume_jobs;
- device->dev->max_volume_files = device->max_volume_files;
- device->dev->max_volume_size = device->max_volume_size;
- device->dev->max_file_size = device->max_file_size;
- device->dev->volume_capacity = device->volume_capacity;
- device->dev->max_rewind_wait = device->max_rewind_wait;
- device->dev->device = device;
- }
- Dmsg1(10, "Init done %s\n", device->device_name);
- if (!device->dev) {
- Emsg1(M_ERROR, 0, _("Could not initialize %s\n"), device->device_name);
- }
- if (device->cap_bits & CAP_ALWAYSOPEN) {
- Dmsg1(20, "calling open_device %s\n", device->device_name);
- if (!open_device(device->dev)) {
- Emsg1(M_ERROR, 0, _("Could not open device %s\n"), device->device_name);
- }
- }
- if (device->cap_bits & CAP_AUTOMOUNT && device->dev &&
- device->dev->state & ST_OPENED) {
- DEV_BLOCK *block;
- JCR *jcr;
- block = new_block(device->dev);
- jcr = new_jcr(sizeof(JCR), stored_free_jcr);
- switch (read_dev_volume_label(jcr, device->dev, block)) {
- case VOL_OK:
- break;
- default:
- Emsg1(M_WARNING, 0, _("Could not mount device %s\n"), device->device_name);
- break;
- }
- free_jcr(jcr);
- free_block(block);
- }
- }
- UnlockRes();
- device = NULL;
+ /* Make sure on Solaris we can run concurrent, watch dog + servers + misc */
+ set_thread_concurrency(me->max_concurrent_jobs * 2 + 4);
+
+ /*
+ * Start the device allocation thread
+ */
+ if (pthread_create(&thid, NULL, device_allocation, NULL) != 0) {
+ Emsg1(M_ABORT, 0, _("Unable to create thread. ERR=%s\n"), strerror(errno));
+ }
start_watchdog(); /* start watchdog thread */
- /*
- * Here we support either listening on one port or on two ports
+ /*
+ * Sleep a bit to give device thread a chance to lock the resource
+ * chain before we start the server.
*/
- if (me->SDDport == 0 || me->SDDport == me->SDport) {
- /* Single server used for Director and File daemon */
- bnet_thread_server(me->SDport, 20, &dird_workq, connection_request);
- } else {
- /* Start the Director server */
- set_thread_concurrency(10);
- if ((status=pthread_create(&dirid, NULL, director_thread,
- (void *)me->SDport)) != 0) {
- Emsg1(M_ABORT, 0, _("Cannot create Director thread: %s\n"), strerror(status));
- }
- /* Start File daemon server */
- bnet_thread_server(me->SDDport, 10, &filed_workq, connection_from_filed);
- /* never returns */
- }
-
+ sleep(1);
+
+ /* 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);
exit(1); /* to keep compiler quiet */
}
-static void *director_thread(void *arg)
-{
- int dir_port = (int)arg;
- pthread_detach(pthread_self());
- bnet_thread_server(dir_port, 10, &dird_workq, connection_request);
- return NULL;
-}
-
/* Return a new Session Id */
uint32_t newVolSessionId()
{
me = (STORES *)GetNextRes(R_STORAGE, NULL);
if (!me) {
UnlockRes();
- Emsg1(M_ABORT, 0, _("No Storage resource defined in %s. Cannot continue.\n"),
+ Emsg1(M_ERROR_TERM, 0, _("No Storage resource defined in %s. Cannot continue.\n"),
configfile);
}
if (GetNextRes(R_STORAGE, (RES *)me) != NULL) {
UnlockRes();
- Emsg1(M_ABORT, 0, _("Only one Storage resource permitted in %s\n"),
+ Emsg1(M_ERROR_TERM, 0, _("Only one Storage resource permitted in %s\n"),
configfile);
}
if (GetNextRes(R_DIRECTOR, NULL) == NULL) {
UnlockRes();
- Emsg1(M_ABORT, 0, _("No Director resource defined in %s. Cannot continue.\n"),
+ Emsg1(M_ERROR_TERM, 0, _("No Director resource defined in %s. Cannot continue.\n"),
configfile);
}
if (GetNextRes(R_DEVICE, NULL) == NULL){
UnlockRes();
- Emsg1(M_ABORT, 0, _("No Device resource defined in %s. Cannot continue.\n"),
+ Emsg1(M_ERROR_TERM, 0, _("No Device resource defined in %s. Cannot continue.\n"),
configfile);
}
if (!me->messages) {
me->messages = (MSGS *)GetNextRes(R_MSGS, NULL);
if (!me->messages) {
- Emsg1(M_ABORT, 0, _("No Messages resource defined in %s. Cannot continue.\n"),
+ Emsg1(M_ERROR_TERM, 0, _("No Messages resource defined in %s. Cannot continue.\n"),
configfile);
}
}
UnlockRes();
if (!me->working_directory) {
- Emsg1(M_ABORT, 0, _("No Working Directory defined in %s. Cannot continue.\n"),
+ Emsg1(M_ERROR_TERM, 0, _("No Working Directory defined in %s. Cannot continue.\n"),
configfile);
}
if (stat(me->working_directory, &stat_buf) != 0) {
- Emsg1(M_ABORT, 0, _("Working Directory: %s not found. Cannot continue.\n"),
+ Emsg1(M_ERROR_TERM, 0, _("Working Directory: %s not found. Cannot continue.\n"),
me->working_directory);
}
if (!S_ISDIR(stat_buf.st_mode)) {
- Emsg1(M_ABORT, 0, _("Working Directory: %s is not a directory. Cannot continue.\n"),
+ Emsg1(M_ERROR_TERM, 0, _("Working Directory: %s is not a directory. Cannot continue.\n"),
me->working_directory);
}
working_directory = me->working_directory;
}
+/*
+ * We are started as a separate thread. The
+ * resources are alread locked.
+ */
+static void *device_allocation(void *arg)
+{
+ int i;
+ DEVRES *device;
+
+ LockRes();
+ pthread_detach(pthread_self());
+
+ for (device=NULL,i=0; (device=(DEVRES *)GetNextRes(R_DEVICE, (RES *)device)); i++) {
+ Dmsg1(90, "calling init_dev %s\n", device->device_name);
+ device->dev = init_dev(NULL, device);
+ Dmsg1(10, "SD init done %s\n", device->device_name);
+ if (!device->dev) {
+ Emsg1(M_ERROR, 0, _("Could not initialize %s\n"), device->device_name);
+ }
+ if (device->cap_bits & CAP_ALWAYSOPEN) {
+ Dmsg1(20, "calling open_device %s\n", device->device_name);
+ if (!open_device(device->dev)) {
+ Emsg1(M_ERROR, 0, _("Could not open device %s\n"), device->device_name);
+ }
+ }
+ if (device->cap_bits & CAP_AUTOMOUNT && device->dev &&
+ device->dev->state & ST_OPENED) {
+ DEV_BLOCK *block;
+ JCR *jcr;
+ block = new_block(device->dev);
+ jcr = new_jcr(sizeof(JCR), stored_free_jcr);
+ switch (read_dev_volume_label(jcr, device->dev, block)) {
+ case VOL_OK:
+ break;
+ default:
+ Emsg1(M_WARNING, 0, _("Could not mount device %s\n"), device->device_name);
+ break;
+ }
+ free_jcr(jcr);
+ free_block(block);
+ }
+ }
+ UnlockRes();
+ return NULL;
+}
+
+
/* Clean up and then exit */
void terminate_stored(int sig)
{
term_msg();
close_memory_pool();
- if (shm) {
- free(shm);
- }
-
sm_dump(False); /* dump orphaned buffers */
exit(1);
}
projects / bacula / bacula / blobdiff