X-Git-Url: https://git.gag.com/?a=blobdiff_plain;f=server-src%2Fdumper.c;h=1c75398dc0ea006ebdbef431cf95ad5e36b59663;hb=e7c9810a75f51ad43cc8e18f92099d7f717d6da7;hp=407628bba83f9d08dfcdd8f5383438b17fb78c3d;hpb=cd0b924f27312d57bd42f6c4fae2b795139e2d0b;p=debian%2Famanda diff --git a/server-src/dumper.c b/server-src/dumper.c index 407628b..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; @@ -328,6 +332,11 @@ main( char *cfg_opt = NULL; int dumper_setuid; + if (argc > 1 && argv && argv[1] && g_str_equal(argv[1], "--version")) { + printf("dumper-%s\n", VERSION); + return (0); + } + /* * Configure program for internationalization: * 1) Only set the message locale for now. @@ -530,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]")); } @@ -571,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 */ @@ -1001,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); } @@ -1017,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; } /* ------------- */ @@ -1286,6 +1301,95 @@ do_dump( if (!errstr) errstr = stralloc(_("got no data")); } + if (indexfile_tmp) { + amwait_t index_status; + + /*@i@*/ aclose(indexout); + waitpid(indexpid,&index_status,0); + log_add(L_INFO, "pid-done %ld", (long)indexpid); + if (rename(indexfile_tmp, indexfile_real) != 0) { + log_add(L_WARNING, _("could not rename \"%s\" to \"%s\": %s"), + indexfile_tmp, indexfile_real, strerror(errno)); + } + amfree(indexfile_tmp); + amfree(indexfile_real); + } + + /* 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); + a = fopen(f,"w"); + if (a) { + s = build_header(&file, NULL, DISK_BLOCK_BYTES); + fprintf(a,"%s", s); + g_free(s); + fclose(a); + } + g_free(f); + } + + if (db->compresspid != -1 && dump_result < 2) { + amwait_t wait_status; + char *errmsg = NULL; + + waitpid(db->compresspid, &wait_status, 0); + if (WIFSIGNALED(wait_status)) { + errmsg = g_strdup_printf(_("%s terminated with signal %d"), + "compress", WTERMSIG(wait_status)); + } else if (WIFEXITED(wait_status)) { + if (WEXITSTATUS(wait_status) != 0) { + errmsg = g_strdup_printf(_("%s exited with status %d"), + "compress", WEXITSTATUS(wait_status)); + } + } else { + errmsg = g_strdup_printf(_("%s got bad exit"), + "compress"); + } + if (errmsg) { + g_fprintf(errf, _("? %s\n"), errmsg); + g_debug("%s", errmsg); + dump_result = max(dump_result, 2); + if (!errstr) + errstr = errmsg; + else + g_free(errmsg); + } + log_add(L_INFO, "pid-done %ld", (long)db->compresspid); + db->compresspid = -1; + } + + if (db->encryptpid != -1 && dump_result < 2) { + amwait_t wait_status; + char *errmsg = NULL; + + waitpid(db->encryptpid, &wait_status, 0); + if (WIFSIGNALED(wait_status)) { + errmsg = g_strdup_printf(_("%s terminated with signal %d"), + "encrypt", WTERMSIG(wait_status)); + } else if (WIFEXITED(wait_status)) { + if (WEXITSTATUS(wait_status) != 0) { + errmsg = g_strdup_printf(_("%s exited with status %d"), + "encrypt", WEXITSTATUS(wait_status)); + } + } else { + errmsg = g_strdup_printf(_("%s got bad exit"), + "encrypt"); + } + if (errmsg) { + g_fprintf(errf, _("? %s\n"), errmsg); + g_debug("%s", errmsg); + dump_result = max(dump_result, 2); + if (!errstr) + errstr = errmsg; + else + g_free(errmsg); + } + log_add(L_INFO, "pid-done %ld", (long)db->encryptpid); + db->encryptpid = -1; + } + if (dump_result > 1) goto failed; @@ -1334,29 +1438,6 @@ do_dump( if (data_path == DATA_PATH_AMANDA) aclose(db->fd); - if (indexfile_tmp) { - amwait_t index_status; - - /*@i@*/ aclose(indexout); - waitpid(indexpid,&index_status,0); - log_add(L_INFO, "pid-done %ld", (long)indexpid); - if (rename(indexfile_tmp, indexfile_real) != 0) { - log_add(L_WARNING, _("could not rename \"%s\" to \"%s\": %s"), - indexfile_tmp, indexfile_real, strerror(errno)); - } - amfree(indexfile_tmp); - amfree(indexfile_real); - } - - if(db->compresspid != -1) { - waitpid(db->compresspid,NULL,0); - log_add(L_INFO, "pid-done %ld", (long)db->compresspid); - } - if(db->encryptpid != -1) { - waitpid(db->encryptpid,NULL,0); - log_add(L_INFO, "pid-done %ld", (long)db->encryptpid); - } - amfree(errstr); dumpfile_free_data(&file); @@ -1441,6 +1522,9 @@ failed: amfree(indexfile_real); } + amfree(errstr); + dumpfile_free_data(&file); + return 0; } @@ -1483,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; } @@ -1508,10 +1591,8 @@ read_mesgfd( strerror(errno)); dump_result = 2; stop_dump(); - dumpfile_free_data(&file); return; } - dumpfile_free_data(&file); aclose(db->fd); if (data_path == DATA_PATH_AMANDA) { g_debug(_("Sending data to %s:%d\n"), data_host, data_port); @@ -1622,8 +1703,6 @@ read_datafd( * Reset the timeout for future reads */ timeout(conf_dtimeout); - - security_stream_read(streams[DATAFD].fd, read_datafd, cookie); } /* @@ -1676,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 @@ -1688,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); @@ -1711,11 +1787,8 @@ handle_filter_stderr( nread = read(filter->fd, filter->buffer + filter->first + filter->size, filter->allocated_size - filter->first - filter->size - 2); - if (nread != 0) { - dump_result = max(dump_result, 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 */ @@ -1740,14 +1813,12 @@ handle_filter_stderr( filter->first += len; filter->size -= len; b = p + 1; + dump_result = max(dump_result, 1); } 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); } } @@ -1755,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); + } } /* @@ -1784,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; @@ -1820,6 +1911,7 @@ stop_dump(void) } } aclose(indexout); + aclose(g_databuf->fd); timeout(0); } @@ -1856,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)); @@ -1879,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]); @@ -1952,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)); @@ -1960,7 +2058,8 @@ runencrypt( aclose(errpipe[0]); aclose(errpipe[1]); return (-1); - default: + default: { + char *base; rval = dup2(outpipe[1], outfd); if (rval < 0) errstr = newvstrallocf(errstr, _("couldn't dup2: %s"), strerror(errno)); @@ -1969,14 +2068,16 @@ runencrypt( aclose(errpipe[1]); filter = g_new0(filter_t, 1); filter->fd = errpipe[0]; - filter->name = "encrypt"; + base = g_strdup(srv_encrypt); + filter->name = g_strdup(basename(base)); + amfree(base); filter->buffer = NULL; filter->size = 0; 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: { char *base; if (dup2(outpipe[0], 0) < 0) { @@ -2131,6 +2232,7 @@ bad_nak: *p++ = '\0'; if(strncmp_const_skip(tok, "features=", tok, ch) == 0) { char *u = strchr(tok, ';'); + ch = ch; if (u) *u = '\0'; am_release_feature_set(their_features); @@ -2261,7 +2363,6 @@ startup_dump( { char level_string[NUM_STR_SIZE]; char *req = NULL; - char *authopt; int response_error; const security_driver_t *secdrv; char *application_api; @@ -2327,7 +2428,7 @@ startup_dump( } vstrextend(&p, " ", level_string, "\n", NULL); vstrextend(&p, options+1, "\n", NULL); - pclean = clean_dle_str_for_client(p); + pclean = clean_dle_str_for_client(p, their_features); vstrextend(&req, pclean, NULL); amfree(pclean); dle_str = p; @@ -2337,7 +2438,6 @@ startup_dump( amfree(req); return 2; } else { - authopt = strstr(options, "auth="); if (auth == NULL) { auth = "BSD"; }