X-Git-Url: https://git.gag.com/?a=blobdiff_plain;f=server-src%2Fdumper.c;h=1c75398dc0ea006ebdbef431cf95ad5e36b59663;hb=HEAD;hp=32f9258780d457650c3d2f575c34f646b875a734;hpb=8eb7e8e19f1373f6be7f1f7837b997748ce31d0e;p=debian%2Famanda diff --git a/server-src/dumper.c b/server-src/dumper.c index 32f9258..1c75398 100644 --- a/server-src/dumper.c +++ b/server-src/dumper.c @@ -1,6 +1,7 @@ /* * Amanda, The Advanced Maryland Automatic Network Disk Archiver * Copyright (c) 1991-1999 University of Maryland at College Park + * Copyright (c) 2007-2012 Zmanda, Inc. All Rights Reserved. * All Rights Reserved. * * Permission to use, copy, modify, distribute, and sell this software and its @@ -73,6 +74,8 @@ struct databuf { pid_t encryptpid; /* valid if fd is pipe to encrypt */ }; +struct databuf *g_databuf = NULL; + typedef struct filter_s { int fd; char *name; @@ -124,6 +127,7 @@ static int set_datafd; static char *dle_str = NULL; static char *errfname = NULL; static int errf_lines = 0; +static int max_warnings = 0; static dumpfile_t file; @@ -535,6 +539,11 @@ main( } dataport_list = newstralloc(dataport_list, cmdargs->argv[a++]); + if(a >= cmdargs->argc) { + error(_("error [dumper PORT-DUMP: not enough args: max_warnings]")); + } + max_warnings = atoi(cmdargs->argv[a++]); + if(a >= cmdargs->argc) { error(_("error [dumper PORT-DUMP: not enough args: options]")); } @@ -576,6 +585,7 @@ main( break; } databuf_init(&db, outfd); + g_databuf = &db; if (am_has_feature(their_features, fe_req_xml)) xml_check_options(options); /* note: modifies globals */ @@ -1006,14 +1016,18 @@ log_msgout( { char *line; int count = 0; + int to_unlink = 1; fflush(errf); if (fseeko(errf, 0L, SEEK_SET) < 0) { dbprintf(_("log_msgout: warning - seek failed: %s\n"), strerror(errno)); } while ((line = agets(errf)) != NULL) { - if (errf_lines >= 100 && count >= 20) + if (max_warnings > 0 && errf_lines >= max_warnings && count >= max_warnings) { + log_add(typ, "Look in the '%s' file for full error messages", errfname); + to_unlink = 0; break; + } if (line[0] != '\0') { log_add(typ, "%s", line); } @@ -1022,11 +1036,7 @@ log_msgout( } amfree(line); - if (errf_lines >= 100) { - log_add(typ, "Look in the '%s' file for full error messages", errfname); - } - - return errf_lines < 100; + return to_unlink; } /* ------------- */ @@ -1306,7 +1316,7 @@ do_dump( } /* copy the header in a file on the index dir */ - { + if (ISSET(status, HEADER_DONE)) { FILE *a; char *s; char *f = getheaderfname(hostname, diskname, dumper_timestamp, level); @@ -1557,7 +1567,6 @@ read_mesgfd( default: assert(buf != NULL); add_msg_data(buf, (size_t)size); - security_stream_read(streams[MESGFD].fd, read_mesgfd, cookie); break; } @@ -1694,8 +1703,6 @@ read_datafd( * Reset the timeout for future reads */ timeout(conf_dtimeout); - - security_stream_read(streams[DATAFD].fd, read_datafd, cookie); } /* @@ -1748,7 +1755,6 @@ read_indexfd( log_add(L_INFO, _("Index corrupted for %s:%s"), hostname, qdiskname); } } - security_stream_read(streams[INDEXFD].fd, read_indexfd, cookie); } static void @@ -1760,8 +1766,6 @@ handle_filter_stderr( char *b, *p; gint64 len; - event_release(filter->event); - if (filter->buffer == NULL) { /* allocate initial buffer */ filter->buffer = g_malloc(2048); @@ -1784,6 +1788,7 @@ handle_filter_stderr( filter->allocated_size - filter->first - filter->size - 2); if (nread <= 0) { + event_release(filter->event); aclose(filter->fd); if (filter->size > 0 && filter->buffer[filter->first + filter->size - 1] != '\n') { /* Add a '\n' at end of buffer */ @@ -1814,9 +1819,6 @@ handle_filter_stderr( if (nread <= 0) { g_free(filter->buffer); g_free(filter); - } else { - filter->event = event_register((event_id_t)filter->fd, EV_READFD, - handle_filter_stderr, filter); } } @@ -1824,25 +1826,33 @@ handle_filter_stderr( * Startup a timeout in the event handler. If the arg is 0, * then remove the timeout. */ +static event_handle_t *ev_timeout = NULL; +static time_t timeout_time; + static void timeout( time_t seconds) { - static event_handle_t *ev_timeout = NULL; + timeout_time = time(NULL) + seconds; /* - * First, remove a timeout if one is active. + * remove a timeout if seconds is 0 */ - if (ev_timeout != NULL) { - event_release(ev_timeout); - ev_timeout = NULL; + if (seconds == 0) { + if (ev_timeout != NULL) { + event_release(ev_timeout); + ev_timeout = NULL; + } + return; } /* - * Now, schedule a new one if 'seconds' is greater than 0 + * schedule a timeout if it not already scheduled */ - if (seconds > 0) - ev_timeout = event_register((event_id_t)seconds, EV_TIME, timeout_callback, NULL); + if (ev_timeout == NULL) { + ev_timeout = event_register((event_id_t)seconds, EV_TIME, + timeout_callback, NULL); + } } /* @@ -1853,8 +1863,20 @@ static void timeout_callback( void * unused) { + time_t now = time(NULL); (void)unused; /* Quiet unused parameter warning */ + if (ev_timeout != NULL) { + event_release(ev_timeout); + ev_timeout = NULL; + } + + if (timeout_time > now) { /* not a data timeout yet */ + ev_timeout = event_register((event_id_t)(timeout_time-now), EV_TIME, + timeout_callback, NULL); + return; + } + assert(unused == NULL); errstr = newstralloc(errstr, _("data timeout")); dump_result = 2; @@ -1889,6 +1911,7 @@ stop_dump(void) } } aclose(indexout); + aclose(g_databuf->fd); timeout(0); } @@ -1925,6 +1948,12 @@ runcompress( return (-1); } + if (comptype != COMP_SERVER_CUST) { + g_debug("execute: %s %s", COMPRESS_PATH, + comptype == COMP_BEST ? COMPRESS_BEST_OPT : COMPRESS_FAST_OPT); + } else { + g_debug("execute: %s", srvcompprog); + } switch (*pid = fork()) { case -1: errstr = newvstrallocf(errstr, _("couldn't fork: %s"), strerror(errno)); @@ -1948,7 +1977,6 @@ runcompress( filter->allocated_size = 0; filter->event = event_register((event_id_t)filter->fd, EV_READFD, handle_filter_stderr, filter); -g_debug("event register %s %d", name, filter->fd); return (rval); case 0: close(outpipe[1]); @@ -2021,6 +2049,7 @@ runencrypt( return (-1); } + g_debug("execute: %s", srv_encrypt); switch (*pid = fork()) { case -1: errstr = newvstrallocf(errstr, _("couldn't fork: %s"), strerror(errno)); @@ -2047,7 +2076,6 @@ runencrypt( filter->allocated_size = 0; filter->event = event_register((event_id_t)filter->fd, EV_READFD, handle_filter_stderr, filter); -g_debug("event register %s %d", "encrypt data", filter->fd); return (rval); } case 0: {