X-Git-Url: https://git.gag.com/?a=blobdiff_plain;f=server-src%2Fdumper.c;h=1c75398dc0ea006ebdbef431cf95ad5e36b59663;hb=HEAD;hp=996c9ddf46c947b87a606b9d87d3e4880f7678f6;hpb=b116e9366c7b2ea2c2eb53b0a13df4090e176235;p=debian%2Famanda

diff --git a/server-src/dumper.c b/server-src/dumper.c
index 996c9dd..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;
@@ -122,6 +125,9 @@ static time_t conf_dtimeout;
 static int indexfderror;
 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;
 
@@ -162,7 +168,7 @@ static void	process_dumpeof(void);
 static void	process_dumpline(const char *);
 static void	add_msg_data(const char *, size_t);
 static void	parse_info_line(char *);
-static void	log_msgout(logtype_t);
+static int	log_msgout(logtype_t);
 static char *	dumper_get_security_conf (char *, void *);
 
 static int	runcompress(int, pid_t *, comp_t, char *);
@@ -326,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.
@@ -528,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]"));
 	    }
@@ -569,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 */
@@ -905,6 +922,7 @@ bad_line:
 	break;
     }
     g_fprintf(errf, "%s\n", str);
+    errf_lines++;
     amfree(buf);
 }
 
@@ -992,24 +1010,33 @@ add_msg_data(
 }
 
 
-static void
+static int
 log_msgout(
     logtype_t	typ)
 {
     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 (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);
 	}
 	amfree(line);
+	count++;
     }
+    amfree(line);
 
-    afclose(errf);
+    return to_unlink;
 }
 
 /* ------------- */
@@ -1157,13 +1184,14 @@ do_dump(
     char *indexfile_tmp = NULL;
     char *indexfile_real = NULL;
     char level_str[NUM_STR_SIZE];
+    char *time_str;
     char *fn;
     char *q;
     times_t runtime;
     double dumptime;	/* Time dump took in secs */
-    char *errfname = NULL;
     pid_t indexpid = -1;
     char *m;
+    int to_unlink = 1;
 
     startclock();
 
@@ -1174,23 +1202,29 @@ do_dump(
     fh_init(&file);
 
     g_snprintf(level_str, SIZEOF(level_str), "%d", level);
+    time_str = get_timestamp_from_time(0);
     fn = sanitise_filename(diskname);
+    errf_lines = 0;
+    errfname = newvstralloc(errfname,
+			    AMANDA_DBGDIR,
+			    "/log.error", NULL);
+    mkdir(errfname, 0700);
     errfname = newvstralloc(errfname,
-			    AMANDA_TMPDIR,
-			    "/", hostname,
+			    AMANDA_DBGDIR,
+			    "/log.error/", hostname,
 			    ".", fn,
 			    ".", level_str,
+			    ".", time_str,
 			    ".errout",
 			    NULL);
     amfree(fn);
+    amfree(time_str);
     if((errf = fopen(errfname, "w+")) == NULL) {
 	errstr = newvstrallocf(errstr, "errfile open \"%s\": %s",
 			      errfname, strerror(errno));
 	amfree(errfname);
 	goto failed;
     }
-    unlink(errfname);				/* so it goes away on close */
-    amfree(errfname);
 
     if (streams[INDEXFD].fd != NULL) {
 	indexfile_real = getindexfname(hostname, diskname, dumper_timestamp, level);
@@ -1267,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;
 
@@ -1298,40 +1421,23 @@ do_dump(
     case 1:
 	log_start_multiline();
 	log_add(L_STRANGE, "%s %s %d [%s]", hostname, qdiskname, level, errstr);
-	log_msgout(L_STRANGE);
+	to_unlink = log_msgout(L_STRANGE);
 	log_end_multiline();
 
 	break;
     }
 
-    if (errf) afclose(errf);
+    if (errf)
+	afclose(errf);
+    if (errfname) {
+	if (to_unlink)
+	    unlink(errfname);
+	amfree(errfname);
+    }
 
     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);
 
@@ -1398,11 +1504,17 @@ failed:
     log_add(L_FAIL, _("%s %s %s %d [%s]"), hostname, qdiskname, dumper_timestamp,
 	    level, errstr);
     if (errf) {
-	log_msgout(L_FAIL);
+	to_unlink = log_msgout(L_FAIL);
     }
     log_end_multiline();
 
-    if (errf) afclose(errf);
+    if (errf)
+	afclose(errf);
+    if (errfname) {
+	if (to_unlink)
+	    unlink(errfname);
+	amfree(errfname);
+    }
 
     if (indexfile_tmp) {
 	unlink(indexfile_tmp);
@@ -1410,6 +1522,9 @@ failed:
 	amfree(indexfile_real);
     }
 
+    amfree(errstr);
+    dumpfile_free_data(&file);
+
     return 0;
 }
 
@@ -1452,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;
     }
 
@@ -1460,7 +1574,11 @@ read_mesgfd(
 	/* Use the first in the dataport_list */
 	in_port_t data_port;
 	char *data_host = dataport_list;
-	char *s= strchr(dataport_list, ':');
+	char *s;
+
+	s = strchr(dataport_list, ',');
+	if (s) *s = '\0';  /* use first data_port */
+	s = strrchr(dataport_list, ':');
 	*s = '\0';
 	s++;
 	data_port = atoi(s);
@@ -1473,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);
@@ -1484,7 +1600,7 @@ read_mesgfd(
 				   STREAM_BUFSIZE, 0, NULL, 0);
 	    if (db->fd == -1) {
 		errstr = newvstrallocf(errstr,
-				       _("Can't opendata output stream: %s"),
+				       _("Can't open data output stream: %s"),
 				       strerror(errno));
 		dump_result = 2;
 		stop_dump();
@@ -1587,8 +1703,6 @@ read_datafd(
      * Reset the timeout for future reads
      */
     timeout(conf_dtimeout);
-
-    security_stream_read(streams[DATAFD].fd, read_datafd, cookie);
 }
 
 /*
@@ -1641,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
@@ -1653,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);
@@ -1676,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 */
@@ -1705,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);
     }
 }
 
@@ -1720,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);
+    }
 }
 
 /*
@@ -1749,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;
@@ -1771,7 +1897,7 @@ stop_dump(void)
     cmdargs = get_pending_cmd();
     if (cmdargs) {
 	if (cmdargs->cmd != ABORT) {
-	    error(_("beurk"));
+	    error(_("beurk %d"), cmdargs->cmd);
 	}
 	amfree(errstr);
 	errstr = stralloc(cmdargs->argv[1]);
@@ -1785,6 +1911,7 @@ stop_dump(void)
 	}
     }
     aclose(indexout);
+    aclose(g_databuf->fd);
     timeout(0);
 }
 
@@ -1821,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));
@@ -1844,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]);
@@ -1917,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));
@@ -1925,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));
@@ -1934,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) {
@@ -2096,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);
@@ -2226,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;
@@ -2292,7 +2428,7 @@ startup_dump(
 	}
 	vstrextend(&p, "  <level>", level_string, "</level>\n", NULL);
 	vstrextend(&p, options+1, "</dle>\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;
@@ -2302,7 +2438,6 @@ startup_dump(
 	amfree(req);
 	return 2;
     } else {
-	authopt = strstr(options, "auth=");
 	if (auth == NULL) {
 	    auth = "BSD";
 	}