From: Kern Sibbald Date: Sun, 22 Feb 2004 21:26:43 +0000 (+0000) Subject: Implement state file and save/restore last_jobs list X-Git-Tag: Release-1.34.0~111 X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=529f3c46ef08884c08d87eb4b788c639f784e135;p=bacula%2Fbacula Implement state file and save/restore last_jobs list git-svn-id: https://bacula.svn.sourceforge.net/svnroot/bacula/trunk@1068 91ce42f0-d328-0410-95d8-f526ca767f89 --- diff --git a/bacula/src/dird/dird.c b/bacula/src/dird/dird.c index 6fb1cd4e28..d6532e6ba7 100644 --- a/bacula/src/dird/dird.c +++ b/bacula/src/dird/dird.c @@ -208,6 +208,7 @@ 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); drop(uid, gid); /* reduce priveleges if requested */ @@ -249,8 +250,9 @@ static void terminate_dird(int sig) exit(1); } already_here = TRUE; - delete_pid_file(director->pid_directory, "bacula-dir", - director->DIRport); + Dmsg0(000, "write_state_file\n"); + 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) { diff --git a/bacula/src/filed/filed.c b/bacula/src/filed/filed.c index ffc4648c06..e13257ec65 100644 --- a/bacula/src/filed/filed.c +++ b/bacula/src/filed/filed.c @@ -214,6 +214,7 @@ Without that I don't know who I am :-(\n"), configfile); /* Maximum 1 daemon at a time */ create_pid_file(me->pid_directory, "bacula-fd", me->FDport); + read_state_file(me->working_directory, "bacula-fd", me->FDport); drop(uid, gid); @@ -253,6 +254,7 @@ void terminate_filed(int sig) if (debug_level > 5) { print_memory_pool_stats(); } + write_state_file(me->working_directory, "bacula-fd", me->FDport); delete_pid_file(me->pid_directory, "bacula-fd", me->FDport); free_config_resources(); term_msg(); diff --git a/bacula/src/lib/bsys.c b/bacula/src/lib/bsys.c index 014dfa44bb..f1ee04a5b3 100644 --- a/bacula/src/lib/bsys.c +++ b/bacula/src/lib/bsys.c @@ -329,6 +329,7 @@ void create_pid_file(char *dir, const char *progname, int port) #endif } + /* * Delete the pid file if we created it */ @@ -349,6 +350,78 @@ int delete_pid_file(char *dir, const char *progname, int port) return 1; } +struct s_state_hdr { + char id[14]; + int32_t version; + uint32_t last_jobs_addr; + uint32_t reserved[20]; +}; + +static struct s_state_hdr state_hdr = { + "Bacula State\n", + 1, + 0 +}; + +/* + * Open and read the state file for the daemon + */ +void read_state_file(char *dir, const char *progname, int port) +{ + int sfd; + POOLMEM *fname = get_pool_memory(PM_FNAME); + struct s_state_hdr hdr; + + Mmsg(&fname, "%s/%s.%d.state", dir, progname, port); + /* If file exists, see what we have */ + if ((sfd = open(mp_chr(fname), O_RDONLY)) < 0 || + read(sfd, &hdr, sizeof(hdr)) < 0 || + hdr.version != state_hdr.version) { + goto bail_out; + } + hdr.id[13] = 0; + if (strcmp(hdr.id, state_hdr.id) != 0) { + goto bail_out; + } + read_last_jobs_list(sfd, hdr.last_jobs_addr); +bail_out: + if (sfd >= 0) { + close(sfd); + } + free_pool_memory(fname); +} + +/* + * Write the state file + */ +void write_state_file(char *dir, const char *progname, int port) +{ + int sfd; + POOLMEM *fname = get_pool_memory(PM_FNAME); + + Mmsg(&fname, "%s/%s.%d.state", dir, progname, port); + /* Create new state file */ + if ((sfd = open(mp_chr(fname), O_CREAT | O_TRUNC | O_WRONLY, 0640)) < 0) { + Emsg2(M_ERROR, 0, _("Could not create state file. %s ERR=%s\n"), fname, strerror(errno)); + goto bail_out; + } + if (write(sfd, &state_hdr, sizeof(state_hdr)) < 0) { + goto bail_out; + } + state_hdr.last_jobs_addr = sizeof(state_hdr); + state_hdr.reserved[0] = write_last_jobs_list(sfd, state_hdr.last_jobs_addr); + if (lseek(sfd, 0, SEEK_SET) < 0) { + goto bail_out; + } + write(sfd, &state_hdr, sizeof(state_hdr)); +bail_out: + if (sfd >= 0) { + close(sfd); + } + free_pool_memory(fname); +} + + /* * Drop to privilege new userid and new gid if non-NULL */ diff --git a/bacula/src/lib/jcr.c b/bacula/src/lib/jcr.c index 1bb7e5d810..20f2fe7a80 100755 --- a/bacula/src/lib/jcr.c +++ b/bacula/src/lib/jcr.c @@ -53,25 +53,76 @@ void init_last_jobs_list() if (!last_jobs) { last_jobs = new dlist(job_entry, &job_entry->link); memset(&last_job, 0, sizeof(last_job)); - } - if ((errstat=rwl_init(&lock)) != 0) { - Emsg1(M_ABORT, 0, _("Unable to initialize jcr_chain lock. ERR=%s\n"), - strerror(errstat)); + if ((errstat=rwl_init(&lock)) != 0) { + Emsg1(M_ABORT, 0, _("Unable to initialize jcr_chain lock. ERR=%s\n"), + strerror(errstat)); + } } } void term_last_jobs_list() { - char *je; + struct s_last_job *je; if (last_jobs) { foreach_dlist(je, last_jobs) { free(je); } delete last_jobs; last_jobs = NULL; + rwl_destroy(&lock); + } +} + +void read_last_jobs_list(int fd, uint64_t addr) +{ + struct s_last_job *je; + + if (addr == 0 || lseek(fd, addr, SEEK_SET) < 0) { + return; + } + for ( ;; ) { + if (read(fd, &last_job, sizeof(last_job)) < 0) { + return; + } + if (last_job.JobId > 0) { + je = (struct s_last_job *)malloc(sizeof(struct s_last_job)); + memcpy((char *)je, (char *)&last_job, sizeof(last_job)); + if (!last_jobs) { + init_last_jobs_list(); + } + last_jobs->append(je); + if (last_jobs->size() > MAX_LAST_JOBS) { + last_jobs->remove(last_jobs->first()); + } + last_job.JobId = 0; /* zap last job */ + } else { + break; + } + } +} + +uint64_t write_last_jobs_list(int fd, uint64_t addr) +{ + struct s_last_job *je; + if (lseek(fd, addr, SEEK_SET) < 0) { + return 0; + } + if (last_jobs) { + foreach_dlist(je, last_jobs) { + if (write(fd, je, sizeof(struct s_last_job)) < 0) { + return 0; + } + } + } + memset(&last_job, 0, sizeof(last_job)); + write(fd, &last_job, sizeof(last_job)); + ssize_t stat = lseek(fd, 0, SEEK_CUR); + if (stat < 0) { + return 0; } - rwl_destroy(&lock); + return stat; + } void lock_last_jobs_list() diff --git a/bacula/src/lib/protos.h b/bacula/src/lib/protos.h index 87588cece8..84432493db 100644 --- a/bacula/src/lib/protos.h +++ b/bacula/src/lib/protos.h @@ -26,137 +26,141 @@ struct JCR; /* attr.c */ -ATTR *new_attr(); -void free_attr(ATTR *attr); -int unpack_attributes_record(JCR *jcr, int32_t stream, char *rec, ATTR *attr); -void build_attr_output_fnames(JCR *jcr, ATTR *attr); -void print_ls_output(JCR *jcr, ATTR *attr); +ATTR *new_attr(); +void free_attr(ATTR *attr); +int unpack_attributes_record(JCR *jcr, int32_t stream, char *rec, ATTR *attr); +void build_attr_output_fnames(JCR *jcr, ATTR *attr); +void print_ls_output(JCR *jcr, ATTR *attr); /* base64.c */ -void base64_init (void); -int to_base64 (intmax_t value, char *where); -int from_base64 (intmax_t *value, char *where); -int bin_to_base64 (char *buf, char *bin, int len); +void base64_init (void); +int to_base64 (intmax_t value, char *where); +int from_base64 (intmax_t *value, char *where); +int bin_to_base64 (char *buf, char *bin, int len); /* bsys.c */ -char *bstrncpy (char *dest, const char *src, int maxlen); -char *bstrncat (char *dest, const char *src, int maxlen); -void *b_malloc (const char *file, int line, size_t size); +char *bstrncpy (char *dest, const char *src, int maxlen); +char *bstrncat (char *dest, const char *src, int maxlen); +void *b_malloc (const char *file, int line, size_t size); #ifndef DEBUG -void *bmalloc (size_t size); +void *bmalloc (size_t size); #endif -void *brealloc (void *buf, size_t size); -void *bcalloc (size_t size1, size_t size2); -int bsnprintf (char *str, int32_t size, const char *format, ...); -int bvsnprintf (char *str, int32_t size, const char *format, va_list ap); -int pool_sprintf (char *pool_buf, const char *fmt, ...); -void create_pid_file (char *dir, const char *progname, int port); -int delete_pid_file (char *dir, const char *progname, int port); -void drop (char *uid, char *gid); -int bmicrosleep (time_t sec, long usec); -char *bfgets (char *s, int size, FILE *fd); -void make_unique_filename (POOLMEM **name, int Id, char *what); +void *brealloc (void *buf, size_t size); +void *bcalloc (size_t size1, size_t size2); +int bsnprintf (char *str, int32_t size, const char *format, ...); +int bvsnprintf (char *str, int32_t size, const char *format, va_list ap); +int pool_sprintf (char *pool_buf, const char *fmt, ...); +void create_pid_file (char *dir, const char *progname, int port); +int delete_pid_file (char *dir, const char *progname, int port); +void drop (char *uid, char *gid); +int bmicrosleep (time_t sec, long usec); +char *bfgets (char *s, int size, FILE *fd); +void make_unique_filename (POOLMEM **name, int Id, char *what); #ifndef HAVE_STRTOLL -long long int strtoll (const char *ptr, char **endptr, int base); +long long int strtoll (const char *ptr, char **endptr, int base); #endif +void read_state_file(char *dir, const char *progname, int port); /* bnet.c */ -int32_t bnet_recv (BSOCK *bsock); -int bnet_send (BSOCK *bsock); -int bnet_fsend (BSOCK *bs, const char *fmt, ...); -int bnet_set_buffer_size (BSOCK *bs, uint32_t size, int rw); -int bnet_sig (BSOCK *bs, int sig); -int bnet_ssl_server (BSOCK *bsock, char *password, int ssl_need, int ssl_has); -int bnet_ssl_client (BSOCK *bsock, char *password, int ssl_need); -BSOCK * bnet_connect (JCR *jcr, int retry_interval, - int max_retry_time, const char *name, char *host, char *service, - int port, int verbose); -void bnet_close (BSOCK *bsock); -BSOCK * init_bsock (JCR *jcr, int sockfd, const char *who, char *ip, - int port, struct sockaddr_in *client_addr); -BSOCK * dup_bsock (BSOCK *bsock); -void term_bsock (BSOCK *bsock); -char * bnet_strerror (BSOCK *bsock); -char * bnet_sig_to_ascii (BSOCK *bsock); -int bnet_wait_data (BSOCK *bsock, int sec); -int bnet_wait_data_intr (BSOCK *bsock, int sec); -int bnet_despool_to_bsock (BSOCK *bsock); -int is_bnet_stop (BSOCK *bsock); -int is_bnet_error (BSOCK *bsock); -void bnet_suppress_error_messages(BSOCK *bsock, int flag); +int32_t bnet_recv (BSOCK *bsock); +int bnet_send (BSOCK *bsock); +int bnet_fsend (BSOCK *bs, const char *fmt, ...); +int bnet_set_buffer_size (BSOCK *bs, uint32_t size, int rw); +int bnet_sig (BSOCK *bs, int sig); +int bnet_ssl_server (BSOCK *bsock, char *password, int ssl_need, int ssl_has); +int bnet_ssl_client (BSOCK *bsock, char *password, int ssl_need); +BSOCK * bnet_connect (JCR *jcr, int retry_interval, + int max_retry_time, const char *name, char *host, char *service, + int port, int verbose); +void bnet_close (BSOCK *bsock); +BSOCK * init_bsock (JCR *jcr, int sockfd, const char *who, char *ip, + int port, struct sockaddr_in *client_addr); +BSOCK * dup_bsock (BSOCK *bsock); +void term_bsock (BSOCK *bsock); +char * bnet_strerror (BSOCK *bsock); +char * bnet_sig_to_ascii (BSOCK *bsock); +int bnet_wait_data (BSOCK *bsock, int sec); +int bnet_wait_data_intr (BSOCK *bsock, int sec); +int bnet_despool_to_bsock (BSOCK *bsock); +int is_bnet_stop (BSOCK *bsock); +int is_bnet_error (BSOCK *bsock); +void bnet_suppress_error_messages(BSOCK *bsock, int flag); /* bget_msg.c */ -int bget_msg(BSOCK *sock); +int bget_msg(BSOCK *sock); /* bpipe.c */ -BPIPE * open_bpipe(char *prog, int wait, const char *mode); -int close_wpipe(BPIPE *bpipe); -int close_bpipe(BPIPE *bpipe); +BPIPE * open_bpipe(char *prog, int wait, const char *mode); +int close_wpipe(BPIPE *bpipe); +int close_bpipe(BPIPE *bpipe); /* cram-md5.c */ int cram_md5_get_auth(BSOCK *bs, char *password, int ssl_need); int cram_md5_auth(BSOCK *bs, char *password, int ssl_need); void hmac_md5(uint8_t* text, int text_len, uint8_t* key, - int key_len, uint8_t *hmac); + int key_len, uint8_t *hmac); /* crc32.c */ uint32_t bcrc32(uint8_t *buf, int len); /* daemon.c */ -void daemon_start (); +void daemon_start (); /* edit.c */ -uint64_t str_to_uint64(char *str); -int64_t str_to_int64(char *str); -char * edit_uint64_with_commas (uint64_t val, char *buf); -char * add_commas (char *val, char *buf); -char * edit_uint64 (uint64_t val, char *buf); -int duration_to_utime (char *str, utime_t *value); -int size_to_uint64(char *str, int str_len, uint64_t *rtn_value); -char *edit_utime (utime_t val, char *buf); -int is_a_number (const char *num); -int is_an_integer (const char *n); -bool is_name_valid (char *name, POOLMEM **msg); +uint64_t str_to_uint64(char *str); +int64_t str_to_int64(char *str); +char * edit_uint64_with_commas (uint64_t val, char *buf); +char * add_commas (char *val, char *buf); +char * edit_uint64 (uint64_t val, char *buf); +int duration_to_utime (char *str, utime_t *value); +int size_to_uint64(char *str, int str_len, uint64_t *rtn_value); +char *edit_utime (utime_t val, char *buf); +int is_a_number (const char *num); +int is_an_integer (const char *n); +bool is_name_valid (char *name, POOLMEM **msg); /* jcr.c (most definitions are in src/jcr.h) */ void init_last_jobs_list(); void term_last_jobs_list(); void lock_last_jobs_list(); void unlock_last_jobs_list(); +void read_last_jobs_list(int fd, uint64_t addr); +uint64_t write_last_jobs_list(int fd, uint64_t addr); +void write_state_file(char *dir, const char *progname, int port); /* lex.c */ -LEX * lex_close_file (LEX *lf); -LEX * lex_open_file (LEX *lf, char *fname, LEX_ERROR_HANDLER *scan_error); -int lex_get_char (LEX *lf); -void lex_unget_char (LEX *lf); -const char * lex_tok_to_str (int token); -int lex_get_token (LEX *lf, int expect); +LEX * lex_close_file (LEX *lf); +LEX * lex_open_file (LEX *lf, char *fname, LEX_ERROR_HANDLER *scan_error); +int lex_get_char (LEX *lf); +void lex_unget_char (LEX *lf); +const char * lex_tok_to_str (int token); +int lex_get_token (LEX *lf, int expect); /* message.c */ -void my_name_is (int argc, char *argv[], const char *name); -void init_msg (JCR *jcr, MSGS *msg); -void term_msg (void); -void close_msg (JCR *jcr); -void add_msg_dest (MSGS *msg, int dest, int type, char *where, char *dest_code); -void rem_msg_dest (MSGS *msg, int dest, int type, char *where); -void Jmsg (JCR *jcr, int type, int level, const char *fmt, ...); -void dispatch_message (JCR *jcr, int type, int level, char *buf); -void init_console_msg (char *wd); -void free_msgs_res (MSGS *msgs); -int open_spool_file (JCR *jcr, BSOCK *bs); -int close_spool_file (JCR *jcr, BSOCK *bs); -void dequeue_messages (JCR *jcr); +void my_name_is (int argc, char *argv[], const char *name); +void init_msg (JCR *jcr, MSGS *msg); +void term_msg (void); +void close_msg (JCR *jcr); +void add_msg_dest (MSGS *msg, int dest, int type, char *where, char *dest_code); +void rem_msg_dest (MSGS *msg, int dest, int type, char *where); +void Jmsg (JCR *jcr, int type, int level, const char *fmt, ...); +void dispatch_message (JCR *jcr, int type, int level, char *buf); +void init_console_msg (char *wd); +void free_msgs_res (MSGS *msgs); +int open_spool_file (JCR *jcr, BSOCK *bs); +int close_spool_file (JCR *jcr, BSOCK *bs); +void dequeue_messages (JCR *jcr); /* bnet_server.c */ -void bnet_thread_server(char *bind_addr, int port, int max_clients, workq_t *client_wq, - void *handle_client_request(void *bsock)); -void bnet_server (int port, void handle_client_request(BSOCK *bsock)); -int net_connect (int port); -BSOCK * bnet_bind (int port); -BSOCK * bnet_accept (BSOCK *bsock, char *who); +void bnet_thread_server(char *bind_addr, int port, int max_clients, workq_t *client_wq, + void *handle_client_request(void *bsock)); +void bnet_server (int port, void handle_client_request(BSOCK *bsock)); +int net_connect (int port); +BSOCK * bnet_bind (int port); +BSOCK * bnet_accept (BSOCK *bsock, char *who); /* idcache.c */ char *getuser(uid_t uid); @@ -166,37 +170,37 @@ void free_getgroup_cache(); /* signal.c */ -void init_signals (void terminate(int sig)); -void init_stack_dump (void); +void init_signals (void terminate(int sig)); +void init_stack_dump (void); /* scan.c */ -void strip_trailing_junk (char *str); -void strip_trailing_slashes (char *dir); -bool skip_spaces (char **msg); -bool skip_nonspaces (char **msg); -int fstrsch (char *a, char *b); -int parse_args(POOLMEM *cmd, POOLMEM **args, int *argc, - char **argk, char **argv, int max_args); -char *next_arg(char **s); +void strip_trailing_junk (char *str); +void strip_trailing_slashes (char *dir); +bool skip_spaces (char **msg); +bool skip_nonspaces (char **msg); +int fstrsch (char *a, char *b); +int parse_args(POOLMEM *cmd, POOLMEM **args, int *argc, + char **argk, char **argv, int max_args); +char *next_arg(char **s); /* util.c */ -int is_buf_zero (char *buf, int len); -void lcase (char *str); -void bash_spaces (char *str); -void unbash_spaces (char *str); -char * encode_time (time_t time, char *buf); -char * encode_mode (mode_t mode, char *buf); -int do_shell_expansion (char *name, int name_len); -void jobstatus_to_ascii (int JobStatus, char *msg, int maxlen); -int pm_strcat (POOLMEM **pm, const char *str); -int pm_strcpy (POOLMEM **pm, const char *str); -int run_program (char *prog, int wait, POOLMEM *results); -char * job_type_to_str (int type); -char * job_status_to_str (int stat); -char * job_level_to_str (int level); -void make_session_key (char *key, char *seed, int mode); -POOLMEM *edit_job_codes(JCR *jcr, char *omsg, char *imsg, const char *to); -void set_working_directory(char *wd); +int is_buf_zero (char *buf, int len); +void lcase (char *str); +void bash_spaces (char *str); +void unbash_spaces (char *str); +char * encode_time (time_t time, char *buf); +char * encode_mode (mode_t mode, char *buf); +int do_shell_expansion (char *name, int name_len); +void jobstatus_to_ascii (int JobStatus, char *msg, int maxlen); +int pm_strcat (POOLMEM **pm, const char *str); +int pm_strcpy (POOLMEM **pm, const char *str); +int run_program (char *prog, int wait, POOLMEM *results); +char * job_type_to_str (int type); +char * job_status_to_str (int stat); +char * job_level_to_str (int level); +void make_session_key (char *key, char *seed, int mode); +POOLMEM *edit_job_codes(JCR *jcr, char *omsg, char *imsg, const char *to); +void set_working_directory(char *wd); /* watchdog.c */ diff --git a/bacula/src/stored/stored.c b/bacula/src/stored/stored.c index 3559143b88..ddb3f7f5dd 100644 --- a/bacula/src/stored/stored.c +++ b/bacula/src/stored/stored.c @@ -186,6 +186,7 @@ int main (int argc, char *argv[]) } create_pid_file(me->pid_directory, "bacula-sd", me->SDport); + read_state_file(me->working_directory, "bacula-sd", me->SDport); drop(uid, gid); @@ -373,6 +374,7 @@ void terminate_stored(int sig) 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); Dmsg1(200, "In terminate_stored() sig=%d\n", sig);