X-Git-Url: https://git.gag.com/?a=blobdiff_plain;f=server-src%2Fdriverio.c;h=57782754606b943b9410bf5a930cc72ff9329864;hb=refs%2Ftags%2Fupstream%2F3.3.1;hp=326c1be40845d29908bec2f08554a50a6f0e02dd;hpb=94a044f90357edefa6f4ae9f0b1d5885b0e34aee;p=debian%2Famanda diff --git a/server-src/driverio.c b/server-src/driverio.c index 326c1be..5778275 100644 --- a/server-src/driverio.c +++ b/server-src/driverio.c @@ -37,7 +37,7 @@ #include "diskfile.h" #include "infofile.h" #include "logfile.h" -#include "token.h" +#include "timestamp.h" #define GLOBAL /* the global variables defined here */ #include "driverio.h" @@ -51,7 +51,7 @@ init_driverio(void) { dumper_t *dumper; - taper = -1; + taper_fd = -1; for(dumper = dmptable; dumper < dmptable + MAX_DUMPERS; dumper++) { dumper->fd = -1; @@ -66,7 +66,7 @@ childstr( static char buf[NUM_STR_SIZE + 32]; dumper_t *dumper; - if (fd == taper) + if (fd == taper_fd) return ("taper"); for (dumper = dmptable; dumper < dmptable + MAX_DUMPERS; dumper++) { @@ -82,10 +82,42 @@ childstr( void startup_tape_process( - char *taper_program) + char *taper_program, + int taper_parallel_write, + gboolean no_taper) { - int fd[2]; - char **config_options; + int fd[2]; + int i; + char **config_options; + taper_t *taper; + + /* always allocate the tapetable */ + tapetable = calloc(sizeof(taper_t), taper_parallel_write+1); + + for (taper = tapetable, i = 0; i < taper_parallel_write; taper++, i++) { + taper->name = g_strdup_printf("worker%d", i); + taper->sendresult = 0; + taper->input_error = NULL; + taper->tape_error = NULL; + taper->result = 0; + taper->dumper = NULL; + taper->disk = NULL; + taper->first_label = NULL; + taper->first_fileno = 0; + taper->state = TAPER_STATE_DEFAULT; + taper->left = 0; + taper->written = 0; + + /* jump right to degraded mode if there's no taper */ + if (no_taper) { + taper->tape_error = g_strdup("no taper started (--no-taper)"); + taper->result = BOGUS; + } + } + + /* don't start the taper if we're not supposed to */ + if (no_taper) + return; if(socketpair(AF_UNIX, SOCK_STREAM, 0, fd) == -1) { error(_("taper pipe: %s"), strerror(errno)); @@ -113,7 +145,7 @@ startup_tape_process( error(_("taper dup2: %s"), strerror(errno)); config_options = get_config_options(2); config_options[0] = "taper"; - config_options[1] = config_name; + config_options[1] = get_config_name(); safe_fd(-1, 0); execve(taper_program, config_options, safe_env()); error("exec %s: %s", taper_program, strerror(errno)); @@ -121,7 +153,7 @@ startup_tape_process( default: /* parent process */ aclose(fd[1]); - taper = fd[0]; + taper_fd = fd[0]; taper_ev_read = NULL; } } @@ -150,7 +182,7 @@ startup_dump_process( error(_("%s dup2: %s"), dumper->name, strerror(errno)); config_options = get_config_options(2); config_options[0] = dumper->name ? dumper->name : "dumper", - config_options[1] = config_name; + config_options[1] = get_config_name(); safe_fd(-1, 0); execve(dumper_program, config_options, safe_env()); error(_("exec %s (%s): %s"), dumper_program, @@ -188,7 +220,7 @@ startup_dump_processes( chktable[i].fd = -1; startup_dump_process(dumper, dumper_program); - dumper_cmd(dumper, START, (void *)timestamp); + dumper_cmd(dumper, START, NULL, (void *)timestamp); } } @@ -218,7 +250,7 @@ startup_chunk_process( } config_options = get_config_options(2); config_options[0] = chunker->name ? chunker->name : "chunker", - config_options[1] = config_name; + config_options[1] = get_config_name(); safe_fd(-1, 0); execve(chunker_program, config_options, safe_env()); error(_("exec %s (%s): %s"), chunker_program, @@ -241,21 +273,20 @@ getresult( int fd, int show, int *result_argc, - char **result_argv, - int max_arg) + char ***result_argv) { - int arg; cmd_t t; char *line; if((line = areads(fd)) == NULL) { if(errno) { - error(_("reading result from %s: %s"), childstr(fd), strerror(errno)); - /*NOTREACHED*/ + g_fprintf(stderr, _("reading result from %s: %s"), childstr(fd), strerror(errno)); } + *result_argv = NULL; *result_argc = 0; /* EOF */ } else { - *result_argc = split(line, result_argv, max_arg, " "); + *result_argv = split_quoted_strings(line); + *result_argc = g_strv_length(*result_argv); } if(show) { @@ -263,9 +294,7 @@ getresult( walltime_str(curclock()), childstr(fd)); if(line) { - for(arg = 1; arg <= *result_argc; arg++) { - g_printf(" %s", result_argv[arg]); - } + g_printf(" %s", line); putchar('\n'); } else { g_printf(" (eof)\n"); @@ -274,21 +303,105 @@ getresult( } amfree(line); -#ifdef DEBUG - g_printf("argc = %d\n", *result_argc); - for(arg = 0; arg < *result_argc; arg++) - g_printf("argv[%d] = \"%s\"\n", arg, result_argv[arg]); -#endif - if(*result_argc < 1) return BOGUS; for(t = (cmd_t)(BOGUS+1); t < LAST_TOK; t++) - if(strcmp(result_argv[1], cmdstr[t]) == 0) return t; + if(strcmp((*result_argv)[0], cmdstr[t]) == 0) return t; return BOGUS; } +static char * +taper_splitting_args( + disk_t *dp) +{ + GString *args = NULL; + char *q = NULL; + dumptype_t *dt = dp->config; + tapetype_t *tt; + + tt = lookup_tapetype(getconf_str(CNF_TAPETYPE)); + g_assert(tt != NULL); + + args = g_string_new(""); + + /* old dumptype-based parameters, using empty strings when not seen */ + if (dt) { /* 'dt' may be NULL for flushes */ + if (dumptype_seen(dt, DUMPTYPE_TAPE_SPLITSIZE)) { + g_string_append_printf(args, "%ju ", + (uintmax_t)dumptype_get_tape_splitsize(dt)*1024); + } else { + g_string_append(args, "\"\" "); + } + + q = quote_string(dumptype_seen(dt, DUMPTYPE_SPLIT_DISKBUFFER)? + dumptype_get_split_diskbuffer(dt) : ""); + g_string_append_printf(args, "%s ", q); + g_free(q); + + if (dumptype_seen(dt, DUMPTYPE_FALLBACK_SPLITSIZE)) { + g_string_append_printf(args, "%ju ", + (uintmax_t)dumptype_get_fallback_splitsize(dt)*1024); + } else { + g_string_append(args, "\"\" "); + } + + if (dumptype_seen(dt, DUMPTYPE_ALLOW_SPLIT)) { + g_string_append_printf(args, "%d ", + (int)dumptype_get_allow_split(dt)); + } else { + g_string_append(args, "\"\" "); + } + } else { + g_string_append(args, "\"\" \"\" \"\" \"\" "); + } + + /* new tapetype-based parameters */ + if (tapetype_seen(tt, TAPETYPE_PART_SIZE)) { + g_string_append_printf(args, "%ju ", + (uintmax_t)tapetype_get_part_size(tt)*1024); + } else { + g_string_append(args, "\"\" "); + } + + q = ""; + if (tapetype_seen(tt, TAPETYPE_PART_CACHE_TYPE)) { + switch (tapetype_get_part_cache_type(tt)) { + default: + case PART_CACHE_TYPE_NONE: + q = "none"; + break; + + case PART_CACHE_TYPE_MEMORY: + q = "memory"; + break; + + case PART_CACHE_TYPE_DISK: + q = "disk"; + break; + } + } + q = quote_string(q); + g_string_append_printf(args, "%s ", q); + g_free(q); + + q = quote_string(tapetype_seen(tt, TAPETYPE_PART_CACHE_DIR)? + tapetype_get_part_cache_dir(tt) : ""); + g_string_append_printf(args, "%s ", q); + g_free(q); + + if (tapetype_seen(tt, TAPETYPE_PART_CACHE_MAX_SIZE)) { + g_string_append_printf(args, "%ju ", + (uintmax_t)tapetype_get_part_cache_max_size(tt)*1024); + } else { + g_string_append(args, "\"\" "); + } + + + return g_string_free(args, FALSE); +} + int taper_cmd( cmd_t cmd, @@ -299,76 +412,132 @@ taper_cmd( { char *cmdline = NULL; char number[NUM_STR_SIZE]; - char splitsize[NUM_STR_SIZE]; - char fallback_splitsize[NUM_STR_SIZE]; - char *diskbuffer = NULL; + char orig_kb[NUM_STR_SIZE]; + char *data_path; disk_t *dp; char *qname; char *qdest; + char *q; + char *splitargs; + uintmax_t origsize; switch(cmd) { case START_TAPER: - cmdline = vstralloc(cmdstr[cmd], " ", (char *)ptr, "\n", NULL); + cmdline = vstralloc(cmdstr[cmd], + " ", destname, + " ", datestamp, + "\n", NULL); + break; + case CLOSE_VOLUME: + dp = (disk_t *) ptr; + cmdline = g_strjoin(NULL, cmdstr[cmd], + " ", sched(dp)->taper->name, + "\n", NULL); break; case FILE_WRITE: dp = (disk_t *) ptr; qname = quote_string(dp->name); qdest = quote_string(destname); g_snprintf(number, SIZEOF(number), "%d", level); - g_snprintf(splitsize, SIZEOF(splitsize), "%lld", - (long long)dp->tape_splitsize * 1024); + if (sched(dp)->origsize >= 0) + origsize = sched(dp)->origsize; + else + origsize = 0; + g_snprintf(orig_kb, SIZEOF(orig_kb), "%ju", origsize); + splitargs = taper_splitting_args(dp); cmdline = vstralloc(cmdstr[cmd], + " ", sched(dp)->taper->name, " ", disk2serial(dp), " ", qdest, " ", dp->host->hostname, " ", qname, " ", number, " ", datestamp, - " ", splitsize, + " ", splitargs, + orig_kb, "\n", NULL); + amfree(splitargs); amfree(qdest); amfree(qname); break; + case PORT_WRITE: dp = (disk_t *) ptr; qname = quote_string(dp->name); g_snprintf(number, SIZEOF(number), "%d", level); + data_path = data_path_to_string(dp->data_path); /* If we haven't been given a place to buffer split dumps to disk, make the argument something besides and empty string so's taper won't get confused */ - if(!dp->split_diskbuffer || dp->split_diskbuffer[0] == '\0'){ - diskbuffer = "NULL"; - } else { - diskbuffer = dp->split_diskbuffer; - } - g_snprintf(splitsize, SIZEOF(splitsize), "%lld", - (long long)dp->tape_splitsize * 1024); - g_snprintf(fallback_splitsize, SIZEOF(fallback_splitsize), "%lld", - (long long)dp->fallback_splitsize * 1024); + splitargs = taper_splitting_args(dp); cmdline = vstralloc(cmdstr[cmd], + " ", sched(dp)->taper->name, " ", disk2serial(dp), " ", dp->host->hostname, " ", qname, " ", number, " ", datestamp, - " ", splitsize, - " ", diskbuffer, - " ", fallback_splitsize, + " ", splitargs, + data_path, "\n", NULL); + amfree(splitargs); amfree(qname); break; case DONE: /* handle */ + dp = (disk_t *) ptr; + if (sched(dp)->origsize >= 0) + origsize = sched(dp)->origsize; + else + origsize = 0; + g_snprintf(number, SIZEOF(number), "%ju", origsize); + cmdline = vstralloc(cmdstr[cmd], + " ", sched(dp)->taper->name, + " ", disk2serial(dp), + " ", number, + "\n", NULL); + break; case FAILED: /* handle */ dp = (disk_t *) ptr; cmdline = vstralloc(cmdstr[cmd], + " ", sched(dp)->taper->name, " ", disk2serial(dp), "\n", NULL); break; - case NEW_TAPE: case NO_NEW_TAPE: + dp = (disk_t *) ptr; + q = quote_string(destname); /* reason why no new tape */ + cmdline = vstralloc(cmdstr[cmd], + " ", sched(dp)->taper->name, + " ", disk2serial(dp), + " ", q, + "\n", NULL); + amfree(q); + break; + case NEW_TAPE: + dp = (disk_t *) ptr; + cmdline = vstralloc(cmdstr[cmd], + " ", sched(dp)->taper->name, + " ", disk2serial(dp), + "\n", NULL); + break; + case START_SCAN: + dp = (disk_t *) ptr; + cmdline = vstralloc(cmdstr[cmd], + " ", sched(dp)->taper->name, + " ", disk2serial(dp), + "\n", NULL); + break; + case TAKE_SCRIBE_FROM: + dp = (disk_t *) ptr; + cmdline = vstralloc(cmdstr[cmd], + " ", sched(dp)->taper->name, + " ", disk2serial(dp), + " ", destname, /* name of worker */ + "\n", NULL); + break; case QUIT: cmdline = stralloc2(cmdstr[cmd], "\n"); break; @@ -383,14 +552,14 @@ taper_cmd( g_printf(_("driver: send-cmd time %s to taper: %s"), walltime_str(curclock()), cmdline); fflush(stdout); - if ((fullwrite(taper, cmdline, strlen(cmdline))) < 0) { + if ((full_write(taper_fd, cmdline, strlen(cmdline))) < strlen(cmdline)) { g_printf(_("writing taper command '%s' failed: %s\n"), cmdline, strerror(errno)); fflush(stdout); amfree(cmdline); return 0; } - if(cmd == QUIT) aclose(taper); + if(cmd == QUIT) aclose(taper_fd); amfree(cmdline); return 1; } @@ -399,20 +568,21 @@ int dumper_cmd( dumper_t *dumper, cmd_t cmd, - disk_t *dp) + disk_t *dp, + char *mesg) { char *cmdline = NULL; char number[NUM_STR_SIZE]; char numberport[NUM_STR_SIZE]; - char *o; + char *o, *oo; char *device; char *features; char *qname; - char *qdest; + char *qmesg; switch(cmd) { case START: - cmdline = vstralloc(cmdstr[cmd], " ", (char *)dp, "\n", NULL); + cmdline = vstralloc(cmdstr[cmd], " ", mesg, "\n", NULL); break; case PORT_DUMP: if(dp && dp->device) { @@ -423,16 +593,60 @@ dumper_cmd( } if (dp != NULL) { + application_t *application = NULL; + char *plugin; + char *qplugin; + char *qamandad_path; + char *qclient_username; + char *qclient_port; + char *qssh_keys; + char *d_prop; + + if (dp->application != NULL) { + application = lookup_application(dp->application); + g_assert(application != NULL); + } + device = quote_string((dp->device) ? dp->device : "NODEVICE"); qname = quote_string(dp->name); g_snprintf(number, SIZEOF(number), "%d", sched(dp)->level); g_snprintf(numberport, SIZEOF(numberport), "%d", dumper->output_port); features = am_feature_to_string(dp->host->features); - o = optionstr(dp, dp->host->features, NULL); - if ( o == NULL ) { - error(_("problem with option string, check the dumptype definition.\n")); + if (am_has_feature(dp->host->features, fe_req_xml)) { + o = xml_optionstr(dp, 1); + + d_prop = xml_dumptype_properties(dp); + vstrextend(&o, d_prop, NULL); + amfree(d_prop); + + if (application) { + char *xml_app; + xml_app = xml_application(dp, application, + dp->host->features); + vstrextend(&o, xml_app, NULL); + amfree(xml_app); + } + oo = quote_string(o); + amfree(o); + o = oo; + } else { + o = optionstr(dp); } - + + g_assert(dp->program); + if (0 == strcmp(dp->program, "APPLICATION")) { + g_assert(application != NULL); + plugin = application_get_plugin(application); + } else { + plugin = dp->program; + } + qplugin = quote_string(plugin); + qamandad_path = quote_string(dp->amandad_path); + qclient_username = quote_string(dp->client_username); + qclient_port = quote_string(dp->client_port); + qssh_keys = quote_string(dp->ssh_keys); + dbprintf("security_driver %s\n", dp->auth); + cmdline = vstralloc(cmdstr[cmd], " ", disk2serial(dp), " ", numberport, @@ -442,12 +656,21 @@ dumper_cmd( " ", device, " ", number, " ", sched(dp)->dumpdate, - " ", dp->program, - " ", dp->amandad_path, - " ", dp->client_username, - " ", dp->ssh_keys, + " ", qplugin, + " ", qamandad_path, + " ", qclient_username, + " ", qclient_port, + " ", qssh_keys, + " ", dp->auth, + " ", data_path_to_string(dp->data_path), + " ", dp->dataport_list, " |", o, "\n", NULL); + amfree(qplugin); + amfree(qamandad_path); + amfree(qclient_username); + amfree(qclient_port); + amfree(qssh_keys); amfree(features); amfree(o); amfree(qname); @@ -459,15 +682,9 @@ dumper_cmd( break; case QUIT: case ABORT: - if( dp ) { - qdest = quote_string(sched(dp)->destname); - cmdline = vstralloc(cmdstr[cmd], - " ", qdest, - "\n", NULL ); - amfree(qdest); - } else { - cmdline = stralloc2(cmdstr[cmd], "\n"); - } + qmesg = quote_string(mesg); + cmdline = vstralloc(cmdstr[cmd], " ", qmesg, "\n", NULL ); + amfree(qmesg); break; default: error(_("Don't know how to send %s command to dumper"), cmdstr[cmd]); @@ -484,7 +701,7 @@ dumper_cmd( g_printf(_("driver: send-cmd time %s to %s: %s"), walltime_str(curclock()), dumper->name, cmdline); fflush(stdout); - if (fullwrite(dumper->fd, cmdline, strlen(cmdline)) < 0) { + if (full_write(dumper->fd, cmdline, strlen(cmdline)) < strlen(cmdline)) { g_printf(_("writing %s command: %s\n"), dumper->name, strerror(errno)); fflush(stdout); amfree(cmdline); @@ -500,7 +717,8 @@ int chunker_cmd( chunker_t *chunker, cmd_t cmd, - disk_t *dp) + disk_t *dp, + char *mesg) { char *cmdline = NULL; char number[NUM_STR_SIZE]; @@ -515,7 +733,7 @@ chunker_cmd( switch(cmd) { case START: - cmdline = vstralloc(cmdstr[cmd], " ", (char *)dp, "\n", NULL); + cmdline = vstralloc(cmdstr[cmd], " ", mesg, "\n", NULL); break; case PORT_WRITE: if(dp && sched(dp) && sched(dp)->holdp) { @@ -533,10 +751,7 @@ chunker_cmd( g_snprintf(use, SIZEOF(use), "%lld", (long long)h[0]->reserved); features = am_feature_to_string(dp->host->features); - o = optionstr(dp, dp->host->features, NULL); - if ( o == NULL ) { - error(_("problem with option string, check the dumptype definition.\n")); - } + o = optionstr(dp); cmdline = vstralloc(cmdstr[cmd], " ", disk2serial(dp), " ", qdest, @@ -588,7 +803,11 @@ chunker_cmd( break; case QUIT: case ABORT: - cmdline = stralloc2(cmdstr[cmd], "\n"); + { + char *q = quote_string(mesg); + cmdline = vstralloc(cmdstr[cmd], " ", q, "\n", NULL); + amfree(q); + } break; case DONE: case FAILED: @@ -597,7 +816,7 @@ chunker_cmd( " ", disk2serial(dp), "\n", NULL); } else { - cmdline = vstralloc(cmdstr[cmd], "\n"); + cmdline = vstralloc(cmdstr[cmd], "\n", NULL); } break; default: @@ -611,7 +830,7 @@ chunker_cmd( g_printf(_("driver: send-cmd time %s to %s: %s"), walltime_str(curclock()), chunker->name, cmdline); fflush(stdout); - if (fullwrite(chunker->fd, cmdline, strlen(cmdline)) < 0) { + if (full_write(chunker->fd, cmdline, strlen(cmdline)) < strlen(cmdline)) { g_printf(_("writing %s command: %s\n"), chunker->name, strerror(errno)); fflush(stdout); amfree(cmdline); @@ -622,7 +841,7 @@ chunker_cmd( return 1; } -#define MAX_SERIAL MAX_DUMPERS+1 /* one for the taper */ +#define MAX_SERIAL MAX_DUMPERS*2 /* one for each dumper and taper */ long generation = 1; @@ -690,8 +909,8 @@ free_serial_dp( } } - g_printf(_("driver: error time %s serial not found\n"), - walltime_str(curclock())); + g_printf(_("driver: error time %s serial not found for disk %s\n"), + walltime_str(curclock()), dp->name); } @@ -781,7 +1000,11 @@ update_info_dumper( infp->size = origsize; infp->csize = dumpsize; infp->secs = dumptime; - infp->date = sched(dp)->timestamp; + if (sched(dp)->timestamp == 0) { + infp->date = 0; + } else { + infp->date = get_time_from_timestamp(sched(dp)->datestamp); + } if(level == 0) perfp = &info.full; else perfp = &info.incr; @@ -797,13 +1020,13 @@ update_info_dumper( newperf(perfp->rate, (double)dumpsize/(double)dumptime); } - if(getconf_int(CNF_RESERVE)<100) { + if(origsize >= (off_t)0 && getconf_int(CNF_RESERVE)<100) { info.command = NO_COMMAND; } - if(level == info.last_level) + if (origsize >= (off_t)0 && level == info.last_level) { info.consecutive_runs++; - else { + } else if (origsize >= (off_t)0) { info.last_level = level; info.consecutive_runs = 1; } @@ -816,12 +1039,22 @@ update_info_dumper( info.history[0].level = level; info.history[0].size = origsize; info.history[0].csize = dumpsize; - info.history[0].date = sched(dp)->timestamp; + if (sched(dp)->timestamp == 0) { + info.history[0].date = 0; + } else { + info.history[0].date = get_time_from_timestamp(sched(dp)->datestamp); + } info.history[0].secs = dumptime; } - if(put_info(dp->host->hostname, dp->name, &info)) { - error(_("infofile update failed (%s,'%s')\n"), dp->host->hostname, dp->name); + if (put_info(dp->host->hostname, dp->name, &info)) { + int save_errno = errno; + g_fprintf(stderr, _("infofile update failed (%s,'%s'): %s\n"), + dp->host->hostname, dp->name, strerror(save_errno)); + log_add(L_ERROR, _("infofile update failed (%s,'%s'): %s\n"), + dp->host->hostname, dp->name, strerror(save_errno)); + error(_("infofile update failed (%s,'%s'): %s\n"), + dp->host->hostname, dp->name, strerror(save_errno)); /*NOTREACHED*/ } @@ -856,8 +1089,14 @@ update_info_taper( info.command = NO_COMMAND; - if(put_info(dp->host->hostname, dp->name, &info)) { - error(_("infofile update failed (%s,'%s')\n"), dp->host->hostname, dp->name); + if (put_info(dp->host->hostname, dp->name, &info)) { + int save_errno = errno; + g_fprintf(stderr, _("infofile update failed (%s,'%s'): %s\n"), + dp->host->hostname, dp->name, strerror(save_errno)); + log_add(L_ERROR, _("infofile update failed (%s,'%s'): %s\n"), + dp->host->hostname, dp->name, strerror(save_errno)); + error(_("infofile update failed (%s,'%s'): %s\n"), + dp->host->hostname, dp->name, strerror(save_errno)); /*NOTREACHED*/ } close_infofile();