X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=bacula%2Fsrc%2Fdird%2Fdird.c;h=b78e35d8667bf2a6d66fdc8a607a6edb8f7b628b;hb=94e47abe723b0a8c73198a74e6277b5fbc13d930;hp=65e35f0e30b20e1c26ae3561943f20b4aa8f1751;hpb=1f3edf3a27024df37e6de3d9b63b6d744808f628;p=bacula%2Fbacula

diff --git a/bacula/src/dird/dird.c b/bacula/src/dird/dird.c
index 65e35f0e30..b78e35d866 100644
--- a/bacula/src/dird/dird.c
+++ b/bacula/src/dird/dird.c
@@ -7,7 +7,7 @@
  *   Version $Id$
  */
 /*
-   Copyright (C) 2000, 2001, 2002 Kern Sibbald and John Walker
+   Copyright (C) 2000-2004 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
@@ -38,14 +38,16 @@ static void reload_config(int sig);
 
 
 /* Imported subroutines */
-extern JCR *wait_for_next_job(char *runjob);
-extern void term_scheduler();
-extern void term_ua_server();
-extern int do_backup(JCR *jcr);
-extern void backup_cleanup(void);
-extern void start_UA_server(char *addr, int port);
-extern void run_job(JCR *jcr);
-extern void init_job_server(int max_workers);
+JCR *wait_for_next_job(char *runjob);
+void term_scheduler();
+void term_ua_server();
+int do_backup(JCR *jcr);
+void backup_cleanup(void);
+void start_UA_server(char *addr, int port);
+void init_job_server(int max_workers);
+void store_jobtype(LEX *lc, struct res_items *item, int index, int pass);
+void store_level(LEX *lc, struct res_items *item, int index, int pass);
+void store_replace(LEX *lc, struct res_items *item, int index, int pass);
 
 static char *configfile = NULL;
 static char *runjob = NULL;
@@ -56,19 +58,28 @@ DIRRES *director;		      /* Director resource */
 int FDConnectTimeout;
 int SDConnectTimeout;
 
+/* Globals Imported */
+extern int r_first, r_last;	      /* first and last resources */
+extern struct res_items job_items[];
+extern URES res_all;
+
+
 #define CONFIG_FILE "./bacula-dir.conf" /* default configuration file */
 
 static void usage()
 {
    fprintf(stderr, _(
-"\nVersion: " VERSION " (" DATE ")\n\n"
+"\nVersion: " VERSION " (" BDATE ")\n\n"
 "Usage: dird [-f -s] [-c config_file] [-d debug_level] [config_file]\n"
 "       -c <file>   set configuration file to file\n"
 "       -dnn        set debug level to nn\n"
 "       -f          run in foreground (for debugging)\n"
+"       -g          groupid\n"
 "       -r <job>    run <job> now\n"
 "       -s          no signals\n"
 "       -t          test - read configuration and exit\n"
+"       -u          userid\n"
+"       -v          verbose user messages\n"
 "       -?          print this message.\n"  
 "\n"));
 
@@ -87,54 +98,68 @@ int main (int argc, char *argv[])
    JCR *jcr;
    int no_signals = FALSE;
    int test_config = FALSE;
+   char *uid = NULL;
+   char *gid = NULL;
 
    init_stack_dump();
    my_name_is(argc, argv, "bacula-dir");
+   textdomain("bacula-dir");
    init_msg(NULL, NULL);	      /* initialize message handler */
    daemon_start_time = time(NULL);
-   memset(&last_job, 0, sizeof(last_job));
 
-   while ((ch = getopt(argc, argv, "c:d:fr:st?")) != -1) {
+   while ((ch = getopt(argc, argv, "c:d:fg:r:stu:v?")) != -1) {
       switch (ch) {
-         case 'c':                    /* specify config file */
-	    if (configfile != NULL) {
-	       free(configfile);
-	    }
-	    configfile = bstrdup(optarg);
-	    break;
+      case 'c':                    /* specify config file */
+	 if (configfile != NULL) {
+	    free(configfile);
+	 }
+	 configfile = bstrdup(optarg);
+	 break;
 
-         case 'd':                    /* set debug level */
-	    debug_level = atoi(optarg);
-	    if (debug_level <= 0) {
-	       debug_level = 1; 
-	    }
-            Dmsg1(0, "Debug level = %d\n", debug_level);
-	    break;
+      case 'd':                    /* set debug level */
+	 debug_level = atoi(optarg);
+	 if (debug_level <= 0) {
+	    debug_level = 1; 
+	 }
+         Dmsg1(0, "Debug level = %d\n", debug_level);
+	 break;
 
-         case 'f':                    /* run in foreground */
-	    background = FALSE;
-	    break;
+      case 'f':                    /* run in foreground */
+	 background = FALSE;
+	 break;
 
-         case 'r':                    /* run job */
-	    if (runjob != NULL) {
-	       free(runjob);
-	    }
-	    if (optarg) {
-	       runjob = bstrdup(optarg);
-	    }
-	    break;
+      case 'g':                    /* set group id */
+	 gid = optarg;
+	 break;
+
+      case 'r':                    /* run job */
+	 if (runjob != NULL) {
+	    free(runjob);
+	 }
+	 if (optarg) {
+	    runjob = bstrdup(optarg);
+	 }
+	 break;
+
+      case 's':                    /* turn off signals */
+	 no_signals = TRUE;
+	 break;
+
+      case 't':                    /* test config */
+	 test_config = TRUE;
+	 break;
 
-         case 's':                    /* turn off signals */
-	    no_signals = TRUE;
-	    break;
+      case 'u':                    /* set uid */
+	 uid = optarg;
+	 break;
 
-         case 't':                    /* test config */
-	    test_config = TRUE;
-	    break;
+      case 'v':                    /* verbose */
+	 verbose++;
+	 break;
 
-         case '?':
-	 default:
-	    usage();
+      case '?':
+      default:
+	 usage();
 
       }  
    }
@@ -144,7 +169,6 @@ int main (int argc, char *argv[])
    if (!no_signals) {
       init_signals(terminate_dird);
    }
-   signal(SIGCHLD, SIG_IGN);
 
    if (argc) {
       if (configfile != NULL) {
@@ -165,7 +189,7 @@ int main (int argc, char *argv[])
    parse_config(configfile);
 
    if (!check_resources()) {
-      Jmsg(NULL, M_ERROR_TERM, 0, "Please correct configuration file: %s\n", configfile);
+      Jmsg((JCR *)NULL, M_ERROR_TERM, 0, _("Please correct configuration file: %s\n"), configfile);
    }
 
    if (test_config) {
@@ -184,8 +208,11 @@ int main (int argc, char *argv[])
 
    /* Create pid must come after we are a daemon -- so we have our final pid */
    create_pid_file(director->pid_directory, "bacula-dir", director->DIRport);
+   read_state_file(director->working_directory, "bacula-dir", director->DIRport);
 
-/* signal(SIGHUP, reload_config); */
+   drop(uid, gid);		      /* reduce priveleges if requested */
+
+   signal(SIGHUP, reload_config);
 
    init_console_msg(working_directory);
 
@@ -197,12 +224,15 @@ int main (int argc, char *argv[])
 
    start_watchdog();		      /* start network watchdog thread */
 
+   init_jcr_subsystem();	      /* start JCR watchdogs etc. */
+
    init_job_server(director->MaxConcurrentJobs);
   
    Dmsg0(200, "wait for next job\n");
    /* Main loop -- call scheduler to get next job to run */
    while ((jcr = wait_for_next_job(runjob))) {
       run_job(jcr);		      /* run job */
+      free_jcr(jcr);		      /* release jcr */
       if (runjob) {		      /* command line, run a single job? */
 	 break; 		      /* yes, terminate */
       }
@@ -220,10 +250,9 @@ static void terminate_dird(int sig)
       exit(1);
    }
    already_here = TRUE;
-   delete_pid_file(director->pid_directory, "bacula-dir",  
-		   director->DIRport);
-   stop_watchdog();
-   signal(SIGCHLD, SIG_IGN);          /* don't worry about children now */
+   write_state_file(director->working_directory, "bacula-dir", director->DIRport);
+   delete_pid_file(director->pid_directory, "bacula-dir", director->DIRport);
+// signal(SIGCHLD, SIG_IGN);          /* don't worry about children now */
    term_scheduler();
    if (runjob) {
       free(runjob);
@@ -237,6 +266,7 @@ static void terminate_dird(int sig)
    free_config_resources();
    term_ua_server();
    term_msg();			      /* terminate message handler */
+   stop_watchdog();
    close_memory_pool(); 	      /* release free memory in pool */
    sm_dump(False);
    exit(sig != 0);
@@ -251,8 +281,10 @@ static void terminate_dird(int sig)
  */
 static void reload_config(int sig)
 {
-   static int already_here = FALSE;
+   static bool already_here = false;
    sigset_t set;	
+   JCR *jcr;
+   int njobs = 0;
 
    if (already_here) {
       abort();			      /* Oops, recursion -> die */
@@ -261,24 +293,39 @@ static void reload_config(int sig)
    sigfillset(&set);
    sigprocmask(SIG_BLOCK, &set, NULL);
 
+   lock_jcr_chain();
+   LockRes();
+
+   foreach_jcr(jcr) {
+      if (jcr->JobId != 0) {	  /* this is a console */
+	 njobs++;
+      }
+      free_locked_jcr(jcr);
+   }
+   if (njobs > 0) {
+      goto bail_out;
+   }
+
    free_config_resources();
 
    parse_config(configfile);
 
-   Dmsg0(200, "check_resources()\n");
    if (!check_resources()) {
       Jmsg(NULL, M_ERROR_TERM, 0, _("Please correct configuration file: %s\n"), configfile);
    }
 
    /* Reset globals */
-   working_directory = director->working_directory;
+   set_working_directory(director->working_directory);
    FDConnectTimeout = director->FDConnectTimeout;
    SDConnectTimeout = director->SDConnectTimeout;
- 
+   Dmsg0(0, "Director's configuration file reread.\n");
+
+bail_out:
+   UnlockRes();
+   unlock_jcr_chain();
    sigprocmask(SIG_UNBLOCK, &set, NULL);
    signal(SIGHUP, reload_config);
-   already_here = FALSE;
-   Dmsg0(0, "Director's configuration file reread.\n");
+   already_here = false;
 }
 
 /*
@@ -290,57 +337,129 @@ static void reload_config(int sig)
  */
 static int check_resources()
 {
-   int OK = TRUE;
+   bool OK = true;
    JOB *job;
 
    LockRes();
 
-   job	= (JOB *)GetNextRes(R_JOB, NULL);
+   job = (JOB *)GetNextRes(R_JOB, NULL);
    director = (DIRRES *)GetNextRes(R_DIRECTOR, NULL);
    if (!director) {
       Jmsg(NULL, M_FATAL, 0, _("No Director resource defined in %s\n\
 Without that I don't know who I am :-(\n"), configfile);
-      OK = FALSE;
+      OK = false;
    } else {
-      if (!director->working_directory) {
-         Jmsg(NULL, M_FATAL, 0, _("No working directory specified. Cannot continue.\n"));
-	 OK = FALSE;
-      }       
-      working_directory = director->working_directory;
+      set_working_directory(director->working_directory);
       if (!director->messages) {       /* If message resource not specified */
 	 director->messages = (MSGS *)GetNextRes(R_MSGS, NULL);
 	 if (!director->messages) {
             Jmsg(NULL, M_FATAL, 0, _("No Messages resource defined in %s\n"), configfile);
-	    OK = FALSE;
+	    OK = false;
 	 }
       }
       if (GetNextRes(R_DIRECTOR, (RES *)director) != NULL) {
          Jmsg(NULL, M_FATAL, 0, _("Only one Director resource permitted in %s\n"),
 	    configfile);
-	 OK = FALSE;
+	 OK = false;
       } 
    }
 
    if (!job) {
       Jmsg(NULL, M_FATAL, 0, _("No Job records defined in %s\n"), configfile);
-      OK = FALSE;
+      OK = false;
    }
-   for (job=NULL; (job = (JOB *)GetNextRes(R_JOB, (RES *)job)); ) {
-      if (!job->client) {
-         Jmsg(NULL, M_FATAL, 0, _("No Client record defined for job %s\n"), job->hdr.name);
-	 OK = FALSE;
-      }
-      if (!job->fileset) {
-         Jmsg(NULL, M_FATAL, 0, _("No FileSet record defined for job %s\n"), job->hdr.name);
-	 OK = FALSE;
-      }
-      if (!job->storage && job->JobType != JT_VERIFY) {
-         Jmsg(NULL, M_FATAL, 0, _("No Storage resource defined for job %s\n"), job->hdr.name);
-	 OK = FALSE;
+   foreach_res(job, R_JOB) {
+      int i;
+
+      if (job->jobdefs) {
+	 /* 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 */
+	    int64_t *def_lvalue, *lvalue; /* 64 bit values */
+	    uint32_t offset;
+
+            Dmsg4(400, "Job \"%s\", field \"%s\" bit=%d def=%d\n",
+		job->hdr.name, job_items[i].name, 
+		bit_is_set(i, job->hdr.item_present),  
+		bit_is_set(i, job->jobdefs->hdr.item_present));
+
+	    if (!bit_is_set(i, job->hdr.item_present) &&
+		 bit_is_set(i, job->jobdefs->hdr.item_present)) { 
+               Dmsg2(400, "Job \"%s\", field \"%s\": getting default.\n",
+		 job->hdr.name, job_items[i].name);
+	       offset = (char *)(job_items[i].value) - (char *)&res_all;   
+	       /*
+		* Handle strings and directory strings
+		*/
+	       if (job_items[i].handler == store_str ||
+		   job_items[i].handler == store_dir) {
+		  def_svalue = (char **)((char *)(job->jobdefs) + offset);
+                  Dmsg5(400, "Job \"%s\", field \"%s\" def_svalue=%s item %d offset=%u\n", 
+		       job->hdr.name, job_items[i].name, *def_svalue, i, offset);
+		  svalue = (char **)((char *)job + offset);
+		  if (*svalue) {
+                     Dmsg1(000, "Hey something is wrong. p=0x%u\n", (unsigned)*svalue);
+		  }
+		  *svalue = bstrdup(*def_svalue);
+		  set_bit(i, job->hdr.item_present);
+	       } else if (job_items[i].handler == store_res) {
+		  def_svalue = (char **)((char *)(job->jobdefs) + offset);
+                  Dmsg4(400, "Job \"%s\", field \"%s\" item %d offset=%u\n", 
+		       job->hdr.name, job_items[i].name, i, offset);
+		  svalue = (char **)((char *)job + offset);
+		  if (*svalue) {
+                     Dmsg1(000, "Hey something is wrong. p=0x%u\n", (unsigned)*svalue);
+		  }
+		  *svalue = *def_svalue;
+		  set_bit(i, job->hdr.item_present);
+	       /*
+		* Handle integer fields 
+		*    Note, our store_yesno does not handle bitmaped fields
+		*/
+	       } else if (job_items[i].handler == store_yesno	||
+			  job_items[i].handler == store_pint	||
+			  job_items[i].handler == store_jobtype ||
+			  job_items[i].handler == store_level	||
+			  job_items[i].handler == store_pint	||
+			  job_items[i].handler == store_replace) {
+		  def_ivalue = (int *)((char *)(job->jobdefs) + offset);
+                  Dmsg5(400, "Job \"%s\", field \"%s\" def_ivalue=%d item %d offset=%u\n", 
+		       job->hdr.name, job_items[i].name, *def_ivalue, i, offset);
+		  ivalue = (int *)((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_int64) {
+		  def_lvalue = (int64_t *)((char *)(job->jobdefs) + offset);
+                  Dmsg5(400, "Job \"%s\", field \"%s\" def_lvalue=%" lld " item %d offset=%u\n", 
+		       job->hdr.name, job_items[i].name, *def_lvalue, i, offset);
+		  lvalue = (int64_t *)((char *)job + offset);
+		  *lvalue = *def_lvalue;
+		  set_bit(i, job->hdr.item_present);
+	       }
+	    }
+	 }
       }
-      if (!job->pool) {
-         Jmsg(NULL, M_FATAL, 0, _("No Pool resource defined for job %s\n"), job->hdr.name);
-	 OK = FALSE;
+      /* 
+       * Ensure that all required items are present
+       */
+      for (i=0; job_items[i].name; i++) {
+	 if (job_items[i].flags & ITEM_REQUIRED) {
+	       if (!bit_is_set(i, job->hdr.item_present)) {  
+                  Jmsg(NULL, M_FATAL, 0, "Field \"%s\" in Job \"%s\" resource is required, but not found.\n",
+		    job_items[i].name, job->hdr.name);
+		  OK = false;
+		}
+	 }
+	 /* If this triggers, take a look at lib/parse_conf.h */
+	 if (i >= MAX_RES_ITEMS) {
+            Emsg0(M_ERROR_TERM, 0, "Too many items in Job resource\n");
+	 }
       }
       if (job->client && job->client->catalog) {
 	 CAT *catalog = job->client->catalog;
@@ -351,25 +470,49 @@ Without that I don't know who I am :-(\n"), configfile);
 	  * message because the server is probably not running.
 	  */
 	 db = db_init_database(NULL, catalog->db_name, catalog->db_user,
-			    catalog->db_password);
-	 if (!db_open_database(NULL, db)) {
-            Jmsg(NULL, M_FATAL,  0, "%s", db_strerror(db));
+			    catalog->db_password, catalog->db_address,
+			    catalog->db_port, catalog->db_socket);
+	 if (!db || !db_open_database(NULL, db)) {
+            Jmsg(NULL, M_FATAL, 0, _("Could not open database \"%s\".\n"),
+		 catalog->db_name);
+	    if (db) {
+               Jmsg(NULL, M_FATAL, 0, _("%s"), db_strerror(db));
+	    }
+	    OK = false;
 	 } else {
 	    /* If a pool is defined for this job, create the pool DB	   
 	     *	record if it is not already created. 
 	     */
 	    if (job->pool) {
-	       create_pool(NULL, db, job->pool);
+	       create_pool(NULL, db, job->pool, POOL_OP_UPDATE);  /* update request */
+	    }
+	    /* Set default value in all counters */
+	    COUNTER *counter;
+	    foreach_res(counter, R_COUNTER) {
+	       /* Write to catalog? */
+	       if (!counter->created && counter->Catalog == catalog) {
+		  COUNTER_DBR cr;
+		  bstrncpy(cr.Counter, counter->hdr.name, sizeof(cr.Counter));
+		  cr.MinValue = counter->MinValue;
+		  cr.MaxValue = counter->MaxValue;
+		  cr.CurrentValue = counter->MinValue;
+		  if (counter->WrapCounter) {
+		     bstrncpy(cr.WrapCounter, counter->WrapCounter->hdr.name, sizeof(cr.WrapCounter));
+		  } else {
+		     cr.WrapCounter[0] = 0;  /* empty string */
+		  }
+		  if (db_create_counter_record(NULL, db, &cr)) {
+		     counter->CurrentValue = cr.CurrentValue;
+		     counter->created = true;
+                     Dmsg2(100, "Create counter %s val=%d\n", counter->hdr.name, counter->CurrentValue);
+		  }
+	       } 
+	       if (!counter->created) {
+		  counter->CurrentValue = counter->MinValue;  /* default value */
+	       }
 	    }
-	    db_close_database(NULL, db);
-	 }
-
-      } else {
-	 if (job->client) {
-            Jmsg(NULL, M_FATAL, 0, _("No Catalog resource defined for client %s\n"), 
-	       job->client->hdr.name);
-	    OK = FALSE;
 	 }
+	 db_close_database(NULL, db);
       }
    }