#include "infofile.h"
#include "logfile.h"
#include "fsusage.h"
-#include "version.h"
#include "driverio.h"
#include "server_util.h"
#include "timestamp.h"
static void start_degraded_mode(disklist_t *queuep);
static void start_some_dumps(disklist_t *rq);
static void continue_port_dumps(void);
-static void update_failed_dump_to_tape(disk_t *);
+static void update_failed_dump(disk_t *);
typedef enum {
TAPE_ACTION_NO_ACTION = 0,
TAPE_ACTION_START_A_FLUSH = (1 << 2)
} TapeAction;
-static TapeAction tape_action(void);
+static TapeAction tape_action(char **why_no_new_tape);
static const char *idle_strings[] = {
#define NOT_IDLE 0
char *newdir = NULL;
struct fs_usage fsusage;
holdingdisk_t *hdp;
+ identlist_t il;
unsigned long reserve = 100;
char *conf_diskfile;
cmd_t cmd;
int result_argc;
- char *result_argv[MAX_ARGS+1];
+ char **result_argv = NULL;
char *taper_program;
char *conf_tapetype;
tapetype_t *tape;
char *line;
char hostname[1025];
intmax_t kb_avail;
- config_overwrites_t *cfg_ovr = NULL;
+ config_overrides_t *cfg_ovr = NULL;
char *cfg_opt = NULL;
holdalloc_t *ha, *ha_last;
/* Don't die when child closes pipe */
signal(SIGPIPE, SIG_IGN);
- erroutput_type = (ERR_AMANDALOG|ERR_INTERACTIVE);
- set_logerror(logerror);
+ add_amanda_log_handler(amanda_log_stderr);
+ add_amanda_log_handler(amanda_log_trace_log);
startclock();
- cfg_ovr = extract_commandline_config_overwrites(&argc, &argv);
+ cfg_ovr = extract_commandline_config_overrides(&argc, &argv);
if (argc > 1)
cfg_opt = argv[1];
- config_init(CONFIG_INIT_EXPLICIT_NAME | CONFIG_INIT_USE_CWD | CONFIG_INIT_FATAL,
- cfg_opt);
- apply_config_overwrites(cfg_ovr);
+ set_config_overrides(cfg_ovr);
+ config_init(CONFIG_INIT_EXPLICIT_NAME | CONFIG_INIT_USE_CWD, cfg_opt);
+ conf_diskfile = config_dir_relative(getconf_str(CNF_DISKFILE));
+ read_diskfile(conf_diskfile, &origq);
+ disable_skip_disk(&origq);
+ amfree(conf_diskfile);
+
+ if (config_errors(NULL) >= CFGERR_WARNINGS) {
+ config_print_errors();
+ if (config_errors(NULL) >= CFGERR_ERRORS) {
+ g_critical(_("errors processing config file"));
+ }
+ }
+
+ log_add(L_INFO, "%s pid %ld", get_pname(), (long)getpid());
g_printf(_("%s: pid %ld executable %s version %s\n"),
- get_pname(), (long) getpid(), argv[0], version());
+ get_pname(), (long) getpid(), argv[0], VERSION);
if(argc > 2) {
if(strncmp(argv[2], "nodump", 6) == 0) {
check_running_as(RUNNING_AS_DUMPUSER);
- dbrename(config_name, DBG_SUBDIR_SERVER);
+ dbrename(get_config_name(), DBG_SUBDIR_SERVER);
amfree(driver_timestamp);
/* read timestamp from stdin */
hd_driver_timestamp = stralloc(driver_timestamp);
}
- taper_program = vstralloc(amlibexecdir, "/", "taper", versionsuffix(), NULL);
- dumper_program = vstralloc(amlibexecdir, "/", "dumper", versionsuffix(),
- NULL);
- chunker_program = vstralloc(amlibexecdir, "/", "chunker", versionsuffix(),
- NULL);
+ taper_program = vstralloc(amlibexecdir, "/", "taper", NULL);
+ dumper_program = vstralloc(amlibexecdir, "/", "dumper", NULL);
+ chunker_program = vstralloc(amlibexecdir, "/", "chunker", NULL);
conf_taperalgo = getconf_taperalgo(CNF_TAPERALGO);
conf_tapetype = getconf_str(CNF_TAPETYPE);
conf_runtapes = getconf_int(CNF_RUNTAPES);
tape = lookup_tapetype(conf_tapetype);
tape_length = tapetype_get_length(tape);
+ g_printf("driver: tape size %lld\n", (long long)tape_length);
conf_flush_threshold_dumped = getconf_int(CNF_FLUSH_THRESHOLD_DUMPED);
conf_flush_threshold_scheduled = getconf_int(CNF_FLUSH_THRESHOLD_SCHEDULED);
conf_taperflush = getconf_int(CNF_TAPERFLUSH);
driver_debug(1, _("flush_threshold_scheduled: %lld\n"), (long long)flush_threshold_scheduled);
driver_debug(1, _("taperflush: %lld\n"), (long long)taperflush);
- /* start initializing: read in databases */
-
- conf_diskfile = config_dir_relative(getconf_str(CNF_DISKFILE));
- if (read_diskfile(conf_diskfile, &origq) < 0) {
- error(_("could not load disklist \"%s\""), conf_diskfile);
- /*NOTREACHED*/
- }
- amfree(conf_diskfile);
-
/* set up any configuration-dependent variables */
inparallel = getconf_int(CNF_INPARALLEL);
total_disksize = (off_t)0;
ha_last = NULL;
num_holdalloc = 0;
- for(hdp = getconf_holdingdisks(), dsk = 0; hdp != NULL; hdp = holdingdisk_next(hdp), dsk++) {
+ for (il = getconf_identlist(CNF_HOLDINGDISK), dsk = 0;
+ il != NULL;
+ il = il->next, dsk++) {
+ hdp = lookup_holdingdisk(il->data);
ha = alloc(SIZEOF(holdalloc_t));
num_holdalloc++;
/* ok, planner is done, now lets see if the tape is ready */
if (conf_runtapes > 0) {
- cmd = getresult(taper, 1, &result_argc, result_argv, MAX_ARGS+1);
+ cmd = getresult(taper, 1, &result_argc, &result_argv);
if (cmd != TAPER_OK) {
/* no tape, go into degraded mode: dump to holding disk */
need_degraded = 1;
tape_left = tape_length;
taper_busy = 0;
- taper_input_error = NULL;
- taper_tape_error = NULL;
+ amfree(taper_input_error);
+ amfree(taper_tape_error);
taper_disk = NULL;
taper_ev_read = NULL;
/* handle any remaining dumps by dumping directly to tape, if possible */
while(!empty(directq) && taper > 0) {
- diskp = dequeue_disk(&directq);
+ time_t sleep_time = 100000000;
+ disk_t *sleep_diskp = NULL;
+ time_t now = time(0);
+
+ /* Find one we can do immediately or the sonner */
+ for (diskp = directq.head; diskp != NULL; diskp = diskp->next) {
+ if (diskp->to_holdingdisk == HOLD_REQUIRED ||
+ degraded_mode) {
+ sleep_time = 0;
+ sleep_diskp = diskp;
+ } else if (diskp->host->start_t - now < sleep_time &&
+ diskp->start_t -now < sleep_time) {
+ if (diskp->host->start_t > diskp->start_t)
+ sleep_time = diskp->host->start_t - now;
+ else
+ sleep_time = diskp->start_t - now;
+ sleep_diskp = diskp;
+ }
+ }
+ diskp = sleep_diskp;
+ if (sleep_time > 0)
+ sleep(sleep_time);
+ remove_disk(&directq, diskp);
+
if (diskp->to_holdingdisk == HOLD_REQUIRED) {
- log_add(L_FAIL, _("%s %s %s %d [%s]"),
- diskp->host->hostname, diskp->name, sched(diskp)->datestamp,
+ char *qname = quote_string(diskp->name);
+ log_add(L_FAIL, "%s %s %s %d [%s]",
+ diskp->host->hostname, qname, sched(diskp)->datestamp,
sched(diskp)->level,
_("can't dump required holdingdisk"));
+ amfree(qname);
}
else if (!degraded_mode) {
taper_state |= TAPER_STATE_DUMP_TO_TAPE;
dump_to_tape(diskp);
event_loop(0);
- taper_state &= !TAPER_STATE_DUMP_TO_TAPE;
+ taper_state &= ~TAPER_STATE_DUMP_TO_TAPE;
}
- else
- log_add(L_FAIL, _("%s %s %s %d [%s]"),
- diskp->host->hostname, diskp->name, sched(diskp)->datestamp,
+ else {
+ char *qname = quote_string(diskp->name);
+ log_add(L_FAIL, "%s %s %s %d [%s]",
+ diskp->host->hostname, qname, sched(diskp)->datestamp,
sched(diskp)->level,
- diskp->to_holdingdisk == HOLD_AUTO ?
- _("no more holding disk space") :
- _("can't dump no-hold disk in degraded mode"));
+ num_holdalloc == 0 ?
+ _("can't do degraded dump without holding disk") :
+ diskp->to_holdingdisk != HOLD_NEVER ?
+ _("out of holding space in degraded mode") :
+ _("can't dump 'holdingdisk never' dle in degraded mode"));
+ amfree(qname);
+ }
}
/* fill up the tape or start new one for taperflush */
if(!nodump) {
for(dumper = dmptable; dumper < dmptable + inparallel; dumper++) {
if(dumper->fd >= 0)
- dumper_cmd(dumper, QUIT, NULL);
+ dumper_cmd(dumper, QUIT, NULL, NULL);
}
}
g_printf(_("driver: FINISHED time %s\n"), walltime_str(curclock()));
fflush(stdout);
log_add(L_FINISH,_("date %s time %s"), driver_timestamp, walltime_str(curclock()));
+ log_add(L_INFO, "pid-done %ld", (long)getpid());
amfree(driver_timestamp);
amfree(dumper_program);
amfree(taper_program);
+ if (result_argv)
+ g_strfreev(result_argv);
dbclose();
}
}
- if(taper_pid > 1)
+ if(taper_pid > 1) {
g_printf(_("driver: sending signal %d to %s pid %u\n"), signal,
"taper", (unsigned)taper_pid);
if (kill(taper_pid, signal) == -1 && errno == ESRCH)
taper_pid = 0;
+ }
}
static void
if(!nodump) {
for(dumper = dmptable; dumper < dmptable + inparallel; dumper++) {
if (dumper->pid > 1 && dumper->fd >= 0) {
- dumper_cmd(dumper, QUIT, NULL);
+ dumper_cmd(dumper, QUIT, NULL, NULL);
if (dumper->chunker && dumper->chunker->pid > 1 &&
dumper->chunker->fd >= 0)
- chunker_cmd(dumper->chunker, QUIT, NULL);
+ chunker_cmd(dumper->chunker, QUIT, NULL, NULL);
}
}
}
int extra_tapes = 0;
char *qname;
TapeAction result_tape_action;
+ char *why_no_new_tape;
- result_tape_action = tape_action();
+ result_tape_action = tape_action(&why_no_new_tape);
if (result_tape_action & TAPE_ACTION_NEW_TAPE) {
- taper_state &= !TAPER_STATE_WAIT_FOR_TAPE;
+ taper_state &= ~TAPER_STATE_WAIT_FOR_TAPE;
taper_cmd(NEW_TAPE, NULL, NULL, 0, NULL);
} else if (result_tape_action & TAPE_ACTION_NO_NEW_TAPE) {
- taper_state &= !TAPER_STATE_WAIT_FOR_TAPE;
- taper_cmd(NO_NEW_TAPE, NULL, NULL, 0, NULL);
+ taper_state &= ~TAPER_STATE_WAIT_FOR_TAPE;
+ taper_cmd(NO_NEW_TAPE, why_no_new_tape, NULL, 0, NULL);
+ start_degraded_mode(&runq);
}
if (!degraded_mode && !taper_busy && !empty(tapeq) &&
if (dp) {
taper_disk = dp;
taper_busy = 1;
- taper_input_error = NULL;
- taper_tape_error = NULL;
+ amfree(taper_input_error);
+ amfree(taper_tape_error);
taper_result = LAST_TOK;
taper_sendresult = 0;
taper_first_label = NULL;
taper_written = 0;
- taper_state &= !TAPER_STATE_DUMP_TO_TAPE;
+ taper_state &= ~TAPER_STATE_DUMP_TO_TAPE;
taper_dumper = NULL;
qname = quote_string(dp->name);
taper_cmd(FILE_WRITE, dp, sched(dp)->destname, sched(dp)->level,
error(_("FATAL: Taper marked busy and no work found."));
/*NOTREACHED*/
}
+ short_dump_state();
} else if(!taper_busy && taper_ev_read != NULL) {
event_release(taper_ev_read);
taper_ev_read = NULL;
{
int cur_idle;
disk_t *diskp, *delayed_diskp, *diskp_accept;
+ disk_t *dp;
assignedhd_t **holdp=NULL, **holdp_accept;
const time_t now = time(NULL);
cmd_t cmd;
int result_argc;
- char *result_argv[MAX_ARGS+1];
+ char **result_argv;
chunker_t *chunker;
dumper_t *dumper;
char dumptype;
holdp = holdp_accept;
idle_reason = max(idle_reason, cur_idle);
+ if (diskp == NULL && idle_reason == IDLE_NO_DISKSPACE) {
+ /* continue flush waiting for new tape */
+ startaflush();
+ }
/*
* If we have no disk at this point, and there are disks that
diskp->inprogress = 1;
sched(diskp)->dumper = dumper;
sched(diskp)->timestamp = now;
+ amfree(diskp->dataport_list);
dumper->busy = 1; /* dumper is now busy */
dumper->dp = diskp; /* link disk to dumper */
chunker->result = LAST_TOK;
dumper->result = LAST_TOK;
startup_chunk_process(chunker,chunker_program);
- chunker_cmd(chunker, START, (void *)driver_timestamp);
+ chunker_cmd(chunker, START, NULL, driver_timestamp);
chunker->dumper = dumper;
- chunker_cmd(chunker, PORT_WRITE, diskp);
- cmd = getresult(chunker->fd, 1, &result_argc, result_argv, MAX_ARGS+1);
+ chunker_cmd(chunker, PORT_WRITE, diskp, NULL);
+ cmd = getresult(chunker->fd, 1, &result_argc, &result_argv);
if(cmd != PORT) {
assignedhd_t **h=NULL;
int activehd;
+ char *qname = quote_string(diskp->name);
g_printf(_("driver: did not get PORT from %s for %s:%s\n"),
- chunker->name, diskp->host->hostname, diskp->name);
+ chunker->name, diskp->host->hostname, qname);
+ amfree(qname);
fflush(stdout);
deallocate_bandwidth(diskp->host->netif, sched(diskp)->est_kps);
handle_dumper_result, dumper);
chunker->ev_read = event_register((event_id_t)chunker->fd, EV_READFD,
handle_chunker_result, chunker);
- dumper->output_port = atoi(result_argv[2]);
-
- dumper_cmd(dumper, PORT_DUMP, diskp);
+ dumper->output_port = atoi(result_argv[1]);
+ amfree(diskp->dataport_list);
+ diskp->dataport_list = stralloc(result_argv[2]);
+
+ if (diskp->host->pre_script == 0) {
+ for (dp=diskp->host->disks; dp != NULL; dp = dp->hostnext) {
+ run_server_scripts(EXECUTE_ON_PRE_HOST_BACKUP,
+ get_config_name(), dp, -1);
+ }
+ diskp->host->pre_script = 1;
+ }
+ run_server_scripts(EXECUTE_ON_PRE_DLE_BACKUP,
+ get_config_name(), diskp,
+ sched(diskp)->level);
+ dumper_cmd(dumper, PORT_DUMP, diskp, NULL);
}
diskp->host->start_t = now + 15;
+
+ if (result_argv)
+ g_strfreev(result_argv);
+ short_dump_state();
}
}
}
enqueue_disk(&newq, dp);
}
else {
- log_add(L_FAIL,_("%s %s %s %d [can't switch to incremental dump]"),
+ log_add(L_FAIL, "%s %s %s %d [%s]",
dp->host->hostname, qname, sched(dp)->datestamp,
- sched(dp)->level);
+ sched(dp)->level, sched(dp)->degr_mesg);
}
}
amfree(qname);
}
assert( dumper < dmptable + inparallel );
sched(dp)->activehd = assign_holdingdisk( h, dp );
- chunker_cmd( dumper->chunker, CONTINUE, dp );
+ chunker_cmd( dumper->chunker, CONTINUE, dp, NULL );
amfree(h);
remove_disk( &roomq, dp );
}
* a) diskspace has been allocated for other dumps which are
* still running or already being written to tape
* b) all other dumps have been suspended due to lack of diskspace
- * c) this dump doesn't fit on all the holding disks
* Case a) is not a problem. We just wait for the diskspace to
* be freed by moving the current disk to a queue.
* If case b) occurs, we have a deadlock situation. We select
* a dump from the queue to be aborted and abort it. It will
- * be retried later dumping to disk.
- * If case c) is detected, the dump is aborted. Next time
- * it will be dumped directly to tape. Actually, case c is a special
- * manifestation of case b) where only one dumper is busy.
+ * be retried directly to tape.
*/
for(dp=NULL, dumper = dmptable; dumper < (dmptable+inparallel); dumper++) {
if( dumper->busy ) {
}
if((dp != NULL) && (active_dumpers == 0) && (busy_dumpers > 0) &&
((!taper_busy && empty(tapeq)) || degraded_mode) &&
- pending_aborts == 0 ) { /* not case a */
- if( busy_dumpers == 1 ) { /* case c */
- sched(dp)->no_space = 1;
- }
- /* case b */
+ pending_aborts == 0 ) { /* case b */
+ sched(dp)->no_space = 1;
/* At this time, dp points to the dump with the smallest est_size.
* We abort that dump, hopefully not wasting too much time retrying it.
*/
remove_disk( &roomq, dp );
- chunker_cmd( sched(dp)->dumper->chunker, ABORT, NULL);
- dumper_cmd( sched(dp)->dumper, ABORT, NULL );
+ chunker_cmd(sched(dp)->dumper->chunker, ABORT, NULL, _("Not enough holding disk space"));
+ dumper_cmd( sched(dp)->dumper, ABORT, NULL, _("Not enough holding disk space"));
pending_aborts++;
}
}
static void
handle_taper_result(
- void *cookie)
+ void *cookie G_GNUC_UNUSED)
{
disk_t *dp;
cmd_t cmd;
int result_argc;
- char *result_argv[MAX_ARGS+1];
- char *qname;
-
- (void)cookie; /* Quiet unused parameter warning */
+ char **result_argv;
+ char *qname, *q;
+ char *s;
assert(cookie == NULL);
+ amfree(taper_input_error);
+ amfree(taper_tape_error);
do {
short_dump_state();
- cmd = getresult(taper, 1, &result_argc, result_argv, MAX_ARGS+1);
+ cmd = getresult(taper, 1, &result_argc, &result_argv);
switch(cmd) {
/*NOTREACHED*/
}
- dp = serial2disk(result_argv[2]);
+ dp = serial2disk(result_argv[1]);
assert(dp == taper_disk);
if (!taper_dumper)
- free_serial(result_argv[2]);
+ free_serial(result_argv[1]);
qname = quote_string(dp->name);
g_printf(_("driver: finished-cmd time %s taper wrote %s:%s\n"),
walltime_str(curclock()), dp->host->hostname, qname);
fflush(stdout);
- amfree(qname);
- if (strcmp(result_argv[3], "INPUT-ERROR") == 0) {
- taper_input_error = stralloc(result_argv[5]);
+ if (strcmp(result_argv[2], "INPUT-ERROR") == 0) {
+ taper_input_error = newstralloc(taper_input_error, result_argv[4]);
+ } else if (strcmp(result_argv[2], "INPUT-GOOD") != 0) {
+ taper_tape_error = newstralloc(taper_tape_error,
+ _("Taper protocol error"));
+ taper_result = FAILED;
+ log_add(L_FAIL, _("%s %s %s %d [%s]"),
+ dp->host->hostname, qname, sched(dp)->datestamp,
+ sched(dp)->level, taper_tape_error);
+ amfree(qname);
+ break;
}
- if (strcmp(result_argv[4], "TAPE-ERROR") == 0) {
- taper_tape_error = stralloc(result_argv[6]);
+ if (strcmp(result_argv[3], "TAPE-ERROR") == 0) {
+ taper_tape_error = newstralloc(taper_tape_error, result_argv[5]);
+ } else if (strcmp(result_argv[3], "TAPE-GOOD") != 0) {
+ taper_tape_error = newstralloc(taper_tape_error,
+ _("Taper protocol error"));
+ taper_result = FAILED;
+ log_add(L_FAIL, _("%s %s %s %d [%s]"),
+ dp->host->hostname, qname, sched(dp)->datestamp,
+ sched(dp)->level, taper_tape_error);
+ amfree(qname);
+ break;
}
+ amfree(qname);
taper_result = cmd;
break;
/*NOTREACHED*/
}
- dp = serial2disk(result_argv[2]);
+ dp = serial2disk(result_argv[1]);
assert(dp == taper_disk);
if (!taper_dumper)
- free_serial(result_argv[2]);
+ free_serial(result_argv[1]);
+ qname = quote_string(dp->name);
g_printf(_("driver: finished-cmd time %s taper wrote %s:%s\n"),
- walltime_str(curclock()), dp->host->hostname, dp->name);
+ walltime_str(curclock()), dp->host->hostname, qname);
fflush(stdout);
- if (strcmp(result_argv[3], "INPUT-ERROR") == 0) {
- taper_input_error = stralloc(result_argv[5]);
+ if (strcmp(result_argv[2], "INPUT-ERROR") == 0) {
+ taper_input_error = newstralloc(taper_input_error, result_argv[5]);
+ } else if (strcmp(result_argv[2], "INPUT-GOOD") != 0) {
+ taper_tape_error = newstralloc(taper_tape_error,
+ _("Taper protocol error"));
+ taper_result = FAILED;
+ log_add(L_FAIL, _("%s %s %s %d [%s]"),
+ dp->host->hostname, qname, sched(dp)->datestamp,
+ sched(dp)->level, taper_tape_error);
+ amfree(qname);
+ break;
+ }
+ if (strcmp(result_argv[3], "TAPE-ERROR") == 0) {
+ taper_tape_error = newstralloc(taper_tape_error, result_argv[6]);
+ } else if (strcmp(result_argv[3], "TAPE-GOOD") != 0) {
+ taper_tape_error = newstralloc(taper_tape_error,
+ _("Taper protocol error"));
+ taper_result = FAILED;
+ log_add(L_FAIL, _("%s %s %s %d [%s]"),
+ dp->host->hostname, qname, sched(dp)->datestamp,
+ sched(dp)->level, taper_tape_error);
+ amfree(qname);
+ break;
}
- if (strcmp(result_argv[4], "TAPE-ERROR") == 0) {
- taper_tape_error = stralloc(result_argv[6]);
+
+ s = strstr(result_argv[4], " kb ");
+ if (s) {
+ s += 4;
+ sched(dp)->dumpsize = atol(s);
}
taper_result = cmd;
+ amfree(qname);
break;
- case PARTDONE: /* PARTDONE <handle> <label> <fileno> <stat> */
- dp = serial2disk(result_argv[2]);
+ case PARTDONE: /* PARTDONE <handle> <label> <fileno> <kbytes> <stat> */
+ dp = serial2disk(result_argv[1]);
assert(dp == taper_disk);
if (result_argc != 6) {
- error(_("error [taper PARTDONE result_argc != 5: %d]"),
+ error(_("error [taper PARTDONE result_argc != 6: %d]"),
result_argc);
/*NOTREACHED*/
}
if (!taper_first_label) {
- taper_first_label = stralloc(result_argv[3]);
- taper_first_fileno = OFF_T_ATOI(result_argv[4]);
+ taper_first_label = stralloc(result_argv[2]);
+ taper_first_fileno = OFF_T_ATOI(result_argv[3]);
}
- taper_written = OFF_T_ATOI(result_argv[5]);
+ taper_written = OFF_T_ATOI(result_argv[4]);
if (taper_written > sched(taper_disk)->act_size)
sched(taper_disk)->act_size = taper_written;
break;
- case REQUEST_NEW_TAPE: /* REQUEST-NEW-TAPE */
+ case REQUEST_NEW_TAPE: /* REQUEST-NEW-TAPE <handle> */
if (result_argc != 2) {
error(_("error [taper REQUEST_NEW_TAPE result_argc != 2: %d]"),
result_argc);
/*NOTREACHED*/
}
- taper_state &= !TAPER_STATE_TAPE_STARTED;
+ taper_state &= ~TAPER_STATE_TAPE_STARTED;
if (current_tape >= conf_runtapes) {
- taper_cmd(NO_NEW_TAPE, NULL, NULL, 0, NULL);
+ char *usermsg = g_strdup_printf(_("%d tapes filled; runtapes=%d "
+ "does not allow additional tapes"), current_tape, conf_runtapes);
+ taper_cmd(NO_NEW_TAPE, usermsg, NULL, 0, NULL);
+ g_free(usermsg);
log_add(L_WARNING,
_("Out of tapes; going into degraded mode."));
start_degraded_mode(&runq);
} else {
TapeAction result_tape_action;
+ char *why_no_new_tape;
taper_state |= TAPER_STATE_WAIT_FOR_TAPE;
- result_tape_action = tape_action();
+ result_tape_action = tape_action(&why_no_new_tape);
if (result_tape_action & TAPE_ACTION_NEW_TAPE) {
taper_cmd(NEW_TAPE, NULL, NULL, 0, NULL);
- taper_state &= !TAPER_STATE_WAIT_FOR_TAPE;
+ taper_state &= ~TAPER_STATE_WAIT_FOR_TAPE;
} else if (result_tape_action & TAPE_ACTION_NO_NEW_TAPE) {
- taper_cmd(NO_NEW_TAPE, NULL, NULL, 0, NULL);
- taper_state &= !TAPER_STATE_WAIT_FOR_TAPE;
+ taper_cmd(NO_NEW_TAPE, why_no_new_tape, NULL, 0, NULL);
+ taper_state &= ~TAPER_STATE_WAIT_FOR_TAPE;
+ start_degraded_mode(&runq);
}
}
break;
result_argc);
/*NOTREACHED*/
}
+ start_degraded_mode(&runq);
break;
case DUMPER_STATUS: /* DUMPER-STATUS <handle> */
if (result_argc != 2) {
- error(_("error [taper NO_NEW_TAPE result_argc != 2: %d]"),
+ error(_("error [taper DUMPER_STATUS result_argc != 2: %d]"),
result_argc);
/*NOTREACHED*/
}
+ dp = serial2disk(result_argv[1]);
if (taper_dumper->result == LAST_TOK) {
taper_sendresult = 1;
} else {
if( taper_dumper->result == DONE) {
- taper_cmd(DONE, NULL, NULL, 0, NULL);
+ taper_cmd(DONE, dp, NULL, 0, NULL);
} else {
- taper_cmd(FAILED, NULL, NULL, 0, NULL);
+ taper_cmd(FAILED, dp, NULL, 0, NULL);
}
}
break;
case TAPE_ERROR: /* TAPE-ERROR <handle> <err mess> */
- dp = serial2disk(result_argv[2]);
+ dp = serial2disk(result_argv[1]);
if (!taper_dumper)
- free_serial(result_argv[2]);
+ free_serial(result_argv[1]);
+ qname = quote_string(dp->name);
g_printf(_("driver: finished-cmd time %s taper wrote %s:%s\n"),
- walltime_str(curclock()), dp->host->hostname, dp->name);
+ walltime_str(curclock()), dp->host->hostname, qname);
+ amfree(qname);
fflush(stdout);
- log_add(L_WARNING, _("Taper error: %s"), result_argv[3]);
- taper_tape_error = stralloc(result_argv[3]);
+ q = quote_string(result_argv[2]);
+ log_add(L_WARNING, _("Taper error: %s"), q);
+ amfree(q);
+ taper_tape_error = newstralloc(taper_tape_error, result_argv[2]);
/*FALLTHROUGH*/
case BOGUS:
if (cmd == BOGUS) {
log_add(L_WARNING, _("Taper protocol error"));
- taper_tape_error = stralloc("BOGUS");
+ taper_tape_error = newstralloc(taper_tape_error, "BOGUS");
}
/*
* Since we received a taper error, we can't send anything more
if(!nodump) {
log_add(L_WARNING,
_("going into degraded mode because of taper component error."));
- start_degraded_mode(&runq);
- }
+ }
+ start_degraded_mode(&runq);
tapeq.head = tapeq.tail = NULL;
taper_busy = 0;
if(taper_ev_read != NULL) {
/*NOTREACHED*/
}
+ g_strfreev(result_argv);
+
if (taper_result != LAST_TOK) {
if(taper_dumper) {
if (taper_dumper->result != LAST_TOK) {
file_taper_result(
disk_t *dp)
{
+ char *qname = quote_string(dp->name);
+
if (taper_result == DONE) {
update_info_taper(dp, taper_first_label, taper_first_fileno,
sched(dp)->level);
if (taper_input_error) {
g_printf("driver: taper failed %s %s: %s\n",
- dp->host->hostname, dp->name, taper_input_error);
+ dp->host->hostname, qname, taper_input_error);
if (strcmp(sched(dp)->datestamp, driver_timestamp) == 0) {
if(sched(dp)->taper_attempted >= 2) {
log_add(L_FAIL, _("%s %s %s %d [too many taper retries after holding disk error: %s]"),
- dp->host->hostname, dp->name, sched(dp)->datestamp,
+ dp->host->hostname, qname, sched(dp)->datestamp,
sched(dp)->level, taper_input_error);
g_printf("driver: taper failed %s %s, too many taper retry after holding disk error\n",
- dp->host->hostname, dp->name);
+ dp->host->hostname, qname);
amfree(sched(dp)->destname);
amfree(sched(dp)->dumpdate);
amfree(sched(dp)->degr_dumpdate);
+ amfree(sched(dp)->degr_mesg);
amfree(sched(dp)->datestamp);
amfree(dp->up);
} else {
log_add(L_INFO, _("%s %s %s %d [Will retry dump because of holding disk error: %s]"),
- dp->host->hostname, dp->name, sched(dp)->datestamp,
+ dp->host->hostname, qname, sched(dp)->datestamp,
sched(dp)->level, taper_input_error);
g_printf("driver: taper will retry %s %s because of holding disk error\n",
- dp->host->hostname, dp->name);
+ dp->host->hostname, qname);
if (dp->to_holdingdisk != HOLD_REQUIRED) {
dp->to_holdingdisk = HOLD_NEVER;
sched(dp)->dump_attempted -= 1;
amfree(sched(dp)->destname);
amfree(sched(dp)->dumpdate);
amfree(sched(dp)->degr_dumpdate);
+ amfree(sched(dp)->degr_mesg);
amfree(sched(dp)->datestamp);
amfree(dp->up);
}
amfree(sched(dp)->destname);
amfree(sched(dp)->dumpdate);
amfree(sched(dp)->degr_dumpdate);
+ amfree(sched(dp)->degr_mesg);
amfree(sched(dp)->datestamp);
amfree(dp->up);
}
} else if (taper_tape_error) {
+ g_printf("driver: taper failed %s %s with tape error: %s\n",
+ dp->host->hostname, qname, taper_tape_error);
if(sched(dp)->taper_attempted >= 2) {
log_add(L_FAIL, _("%s %s %s %d [too many taper retries]"),
- dp->host->hostname, dp->name, sched(dp)->datestamp,
+ dp->host->hostname, qname, sched(dp)->datestamp,
sched(dp)->level);
g_printf("driver: taper failed %s %s, too many taper retry\n",
- dp->host->hostname, dp->name);
+ dp->host->hostname, qname);
amfree(sched(dp)->destname);
amfree(sched(dp)->dumpdate);
amfree(sched(dp)->degr_dumpdate);
+ amfree(sched(dp)->degr_mesg);
amfree(sched(dp)->datestamp);
amfree(dp->up);
} else {
g_printf("driver: taper will retry %s %s\n",
- dp->host->hostname, dp->name);
+ dp->host->hostname, qname);
/* Re-insert into taper queue. */
headqueue_disk(&tapeq, dp);
}
+ } else if (taper_result != DONE) {
+ g_printf("driver: taper failed %s %s without error\n",
+ dp->host->hostname, qname);
} else {
delete_diskspace(dp);
amfree(sched(dp)->destname);
amfree(sched(dp)->dumpdate);
amfree(sched(dp)->degr_dumpdate);
+ amfree(sched(dp)->degr_mesg);
amfree(sched(dp)->datestamp);
amfree(dp->up);
}
+ amfree(qname);
+
taper_busy = 0;
- taper_input_error = NULL;
- taper_tape_error = NULL;
+ amfree(taper_input_error);
+ amfree(taper_tape_error);
taper_disk = NULL;
/* continue with those dumps waiting for diskspace */
sched(dp)->est_kps);
amfree(qname);
} else {
- update_failed_dump_to_tape(dp);
+ update_failed_dump(dp);
}
is_partial = dumper->result != DONE || taper_result != DONE;
taper_ev_read = NULL;
}
taper_busy = 0;
- taper_input_error = NULL;
- taper_tape_error = NULL;
+ amfree(taper_input_error);
+ amfree(taper_tape_error);
dumper->busy = 0;
dp->host->inprogress -= 1;
dp->inprogress = 0;
(long long)sched(dp)->est_csize,
sched(dp)->est_kps);
amfree(qname);
+ } else {
+ update_failed_dump(dp);
}
deallocate_bandwidth(dp->host->netif, sched(dp)->est_kps);
is_partial = dumper->result != DONE || chunker->result != DONE;
rename_tmp_holding(sched(dp)->destname, !is_partial);
+ holding_set_origsize(sched(dp)->destname, sched(dp)->origsize);
dummy = (off_t)0;
for( i = 0, h = sched(dp)->holdp; i < activehd; i++ ) {
static void
handle_dumper_result(
- void * cookie)
+ void * cookie)
{
- /*static int pending_aborts = 0;*/
+ /* uses global pending_aborts */
dumper_t *dumper = cookie;
- disk_t *dp, *sdp;
+ disk_t *dp, *sdp, *dp1;
cmd_t cmd;
int result_argc;
char *qname;
- char *result_argv[MAX_ARGS+1];
+ char **result_argv;
assert(dumper != NULL);
dp = dumper->dp;
short_dump_state();
- cmd = getresult(dumper->fd, 1, &result_argc, result_argv, MAX_ARGS+1);
+ cmd = getresult(dumper->fd, 1, &result_argc, &result_argv);
if(cmd != BOGUS) {
- /* result_argv[2] always contains the serial number */
- sdp = serial2disk(result_argv[2]);
+ /* result_argv[1] always contains the serial number */
+ sdp = serial2disk(result_argv[1]);
if (sdp != dp) {
- error(_("Invalid serial number %s"), result_argv[2]);
+ error(_("Invalid serial number %s"), result_argv[1]);
g_assert_not_reached();
}
}
/*NOTREACHED*/
}
- sched(dp)->origsize = OFF_T_ATOI(result_argv[3]);
- sched(dp)->dumptime = TIME_T_ATOI(result_argv[5]);
+ sched(dp)->origsize = OFF_T_ATOI(result_argv[2]);
+ sched(dp)->dumptime = TIME_T_ATOI(result_argv[4]);
g_printf(_("driver: finished-cmd time %s %s dumped %s:%s\n"),
walltime_str(curclock()), dumper->name,
* case for cleanup.
*/
if(sched(dp)->dump_attempted) {
+ char *qname = quote_string(dp->name);
+ char *qerr = quote_string(result_argv[2]);
log_add(L_FAIL, _("%s %s %s %d [too many dumper retry: %s]"),
- dp->host->hostname, dp->name, sched(dp)->datestamp,
- sched(dp)->level, result_argv[3]);
+ dp->host->hostname, qname, sched(dp)->datestamp,
+ sched(dp)->level, qerr);
g_printf(_("driver: dump failed %s %s %s, too many dumper retry: %s\n"),
- result_argv[2], dp->host->hostname, dp->name,
- result_argv[3]);
+ result_argv[1], dp->host->hostname, qname, qerr);
+ amfree(qname);
+ amfree(qerr);
}
/* FALLTHROUGH */
case FAILED: /* FAILED <handle> <errstr> */
- /*free_serial(result_argv[2]);*/
+ /*free_serial(result_argv[1]);*/
dumper->result = cmd;
break;
* other dumps that are waiting on disk space.
*/
assert(pending_aborts);
- /*free_serial(result_argv[2]);*/
+ /*free_serial(result_argv[1]);*/
dumper->result = cmd;
break;
aclose(dumper->fd);
dumper->busy = 0;
dumper->down = 1; /* mark it down so it isn't used again */
- if(dp) {
- /* if it was dumping something, zap it and try again */
- if(sched(dp)->dump_attempted) {
+
+ /* if it was dumping something, zap it and try again */
+ if(sched(dp)->dump_attempted) {
log_add(L_FAIL, _("%s %s %s %d [%s died]"),
dp->host->hostname, qname, sched(dp)->datestamp,
sched(dp)->level, dumper->name);
- }
- else {
+ } else {
log_add(L_WARNING, _("%s died while dumping %s:%s lev %d."),
dumper->name, dp->host->hostname, qname,
sched(dp)->level);
- }
- }
+ }
dumper->result = cmd;
break;
assert(0);
}
amfree(qname);
+ g_strfreev(result_argv);
+
+ if (cmd != BOGUS) {
+ int last_dump = 1;
+ dumper_t *dumper;
+
+ run_server_scripts(EXECUTE_ON_POST_DLE_BACKUP,
+ get_config_name(), dp, sched(dp)->level);
+ /* check dump not yet started */
+ for (dp1=runq.head; dp1 != NULL; dp1 = dp1->next) {
+ if (dp1->host == dp->host)
+ last_dump = 0;
+ }
+ /* check direct to tape dump */
+ for (dp1=directq.head; dp1 != NULL; dp1 = dp1->next) {
+ if (dp1->host == dp->host)
+ last_dump = 0;
+ }
+ /* check dumping dle */
+ for (dumper = dmptable; dumper < dmptable + inparallel; dumper++) {
+ if (dumper->busy && dumper->dp != dp &&
+ dumper->dp->host == dp->host)
+ last_dump = 0;
+ }
+ if (last_dump && dp->host->post_script == 0) {
+ if (dp->host->post_script == 0) {
+ for (dp1=dp->host->disks; dp1 != NULL; dp1 = dp1->hostnext) {
+ run_server_scripts(EXECUTE_ON_POST_HOST_BACKUP,
+ get_config_name(), dp1, -1);
+ }
+ dp->host->post_script = 1;
+ }
+ }
+ }
/* send the dumper result to the chunker */
if (dumper->chunker) {
if (dumper->chunker->down == 0 && dumper->chunker->fd != -1 &&
dumper->chunker->result == LAST_TOK) {
if (cmd == DONE) {
- chunker_cmd(dumper->chunker, DONE, dp);
+ chunker_cmd(dumper->chunker, DONE, dp, NULL);
}
else {
- chunker_cmd(dumper->chunker, FAILED, dp);
+ chunker_cmd(dumper->chunker, FAILED, dp, NULL);
}
}
if( dumper->result != LAST_TOK &&
} else { /* send the dumper result to the taper */
if (taper_sendresult) {
if (cmd == DONE) {
- taper_cmd(DONE, driver_timestamp, NULL, 0, NULL);
+ taper_cmd(DONE, dp, NULL, 0, NULL);
} else {
- taper_cmd(FAILED, driver_timestamp, NULL, 0, NULL);
+ taper_cmd(FAILED, dp, NULL, 0, NULL);
}
taper_sendresult = 0;
}
handle_chunker_result(
void * cookie)
{
- /*static int pending_aborts = 0;*/
chunker_t *chunker = cookie;
assignedhd_t **h=NULL;
dumper_t *dumper;
disk_t *dp, *sdp;
cmd_t cmd;
int result_argc;
- char *result_argv[MAX_ARGS+1];
+ char **result_argv;
int dummy;
int activehd = -1;
char *qname;
assert(sched(dp)->destname != NULL);
assert(dp != NULL && sched(dp) != NULL && sched(dp)->destname);
- if(dp && sched(dp) && sched(dp)->holdp) {
+ if(sched(dp)->holdp) {
h = sched(dp)->holdp;
activehd = sched(dp)->activehd;
}
do {
-
short_dump_state();
- cmd = getresult(chunker->fd, 1, &result_argc, result_argv, MAX_ARGS+1);
+ cmd = getresult(chunker->fd, 1, &result_argc, &result_argv);
if(cmd != BOGUS) {
- /* result_argv[2] always contains the serial number */
- sdp = serial2disk(result_argv[2]);
+ /* result_argv[1] always contains the serial number */
+ sdp = serial2disk(result_argv[1]);
if (sdp != dp) {
- error(_("Invalid serial number %s"), result_argv[2]);
+ error(_("Invalid serial number %s"), result_argv[1]);
g_assert_not_reached();
}
}
result_argc);
/*NOTREACHED*/
}
- /*free_serial(result_argv[2]);*/
+ /*free_serial(result_argv[1]);*/
- sched(dp)->dumpsize = (off_t)atof(result_argv[3]);
+ sched(dp)->dumpsize = (off_t)atof(result_argv[2]);
qname = quote_string(dp->name);
g_printf(_("driver: finished-cmd time %s %s chunked %s:%s\n"),
break;
case FAILED: /* FAILED <handle> <errstr> */
- /*free_serial(result_argv[2]);*/
+ /*free_serial(result_argv[1]);*/
event_release(chunker->ev_read);
error(_("!h || activehd < 0"));
/*NOTREACHED*/
}
- h[activehd]->used -= OFF_T_ATOI(result_argv[3]);
- h[activehd]->reserved -= OFF_T_ATOI(result_argv[3]);
- h[activehd]->disk->allocated_space -= OFF_T_ATOI(result_argv[3]);
- h[activehd]->disk->disksize -= OFF_T_ATOI(result_argv[3]);
+ h[activehd]->used -= OFF_T_ATOI(result_argv[2]);
+ h[activehd]->reserved -= OFF_T_ATOI(result_argv[2]);
+ h[activehd]->disk->allocated_space -= OFF_T_ATOI(result_argv[2]);
+ h[activehd]->disk->disksize -= OFF_T_ATOI(result_argv[2]);
break;
case RQ_MORE_DISK: /* RQ-MORE-DISK <handle> */
if( h[++activehd] ) { /* There's still some allocated space left.
* Tell the dumper about it. */
sched(dp)->activehd++;
- chunker_cmd( chunker, CONTINUE, dp );
+ chunker_cmd( chunker, CONTINUE, dp, NULL );
} else { /* !h[++activehd] - must allocate more space */
sched(dp)->act_size = sched(dp)->est_size; /* not quite true */
sched(dp)->est_size = (sched(dp)->act_size/(off_t)20) * (off_t)21; /* +5% */
* determined in continue_port_dumps(). */
enqueue_disk( &roomq, dp );
continue_port_dumps();
+ /* continue flush waiting for new tape */
+ startaflush();
} else {
/* OK, allocate space for disk and have chunker continue */
sched(dp)->activehd = assign_holdingdisk( h, dp );
- chunker_cmd( chunker, CONTINUE, dp );
+ chunker_cmd( chunker, CONTINUE, dp, NULL );
amfree(h);
}
}
*/
/*assert(pending_aborts);*/
- /*free_serial(result_argv[2]);*/
+ /*free_serial(result_argv[1]);*/
event_release(chunker->ev_read);
log_add(L_WARNING, _("%s pid %ld is messed up, ignoring it.\n"),
chunker->name, (long)chunker->pid);
- if(dp) {
- /* if it was dumping something, zap it and try again */
- if (!h || activehd < 0) { /* should never happen */
- error(_("!h || activehd < 0"));
- /*NOTREACHED*/
- }
- qname = quote_string(dp->name);
- if(sched(dp)->dump_attempted) {
- log_add(L_FAIL, _("%s %s %s %d [%s died]"),
- dp->host->hostname, qname, sched(dp)->datestamp,
- sched(dp)->level, chunker->name);
- }
- else {
- log_add(L_WARNING, _("%s died while dumping %s:%s lev %d."),
- chunker->name, dp->host->hostname, qname,
- sched(dp)->level);
- }
- amfree(qname);
- dp = NULL;
- }
+ /* if it was dumping something, zap it and try again */
+ g_assert(h && activehd >= 0);
+ qname = quote_string(dp->name);
+ if(sched(dp)->dump_attempted) {
+ log_add(L_FAIL, _("%s %s %s %d [%s died]"),
+ dp->host->hostname, qname, sched(dp)->datestamp,
+ sched(dp)->level, chunker->name);
+ } else {
+ log_add(L_WARNING, _("%s died while dumping %s:%s lev %d."),
+ chunker->name, dp->host->hostname, qname,
+ sched(dp)->level);
+ }
+ amfree(qname);
+ dp = NULL;
event_release(chunker->ev_read);
default:
assert(0);
}
+ g_strfreev(result_argv);
if(chunker->result != LAST_TOK && chunker->dumper->result != LAST_TOK)
dumper_chunker_result(dp);
sched_t *sp;
disk_t *dp;
int line;
- dumpfile_t file;
char *hostname, *diskname, *datestamp;
int level;
char *destname;
disklist_t tq;
char *qname = NULL;
char *qdestname = NULL;
+ char *conf_infofile;
tq.head = tq.tail = NULL;
+ conf_infofile = config_dir_relative(getconf_str(CNF_INFOFILE));
+ if (open_infofile(conf_infofile)) {
+ error(_("could not open info db \"%s\""), conf_infofile);
+ /*NOTREACHED*/
+ }
+
for(line = 0; (inpline = agets(stdin)) != NULL; free(inpline)) {
+ dumpfile_t file;
+
line++;
if (inpline[0] == '\0')
continue;
log_add(L_INFO, _("%s: ignoring cruft file."), destname);
amfree(diskname);
amfree(destname);
+ dumpfile_free_data(&file);
continue;
}
hostname, diskname, destname);
amfree(diskname);
amfree(destname);
+ dumpfile_free_data(&file);
continue;
}
amfree(diskname);
log_add(L_INFO, _("%s: disk %s:%s not in database, skipping it."),
destname, file.name, file.disk);
amfree(destname);
+ dumpfile_free_data(&file);
continue;
}
log_add(L_INFO, _("%s: ignoring file with bogus dump level %d."),
destname, file.dumplevel);
amfree(destname);
+ dumpfile_free_data(&file);
continue;
}
log_add(L_INFO, "%s: removing file with no data.", destname);
holding_file_unlink(destname);
amfree(destname);
+ dumpfile_free_data(&file);
continue;
}
sp->level = file.dumplevel;
sp->dumpdate = NULL;
sp->degr_dumpdate = NULL;
+ sp->degr_mesg = NULL;
sp->datestamp = stralloc(file.datestamp);
sp->est_nsize = (off_t)0;
sp->est_csize = (off_t)0;
sp->est_time = 0;
sp->est_kps = 10;
+ sp->origsize = file.orig_size;
sp->priority = 0;
sp->degr_level = -1;
sp->dump_attempted = 0;
dp1->up = (char *)sp;
enqueue_disk(&tq, dp1);
+ dumpfile_free_data(&file);
}
amfree(inpline);
+ close_infofile();
/*@i@*/ return tq;
}
sched_t *sp;
disk_t *dp;
int level, line, priority;
- char *dumpdate, *degr_dumpdate;
+ char *dumpdate, *degr_dumpdate, *degr_mesg;
int degr_level;
time_t time, degr_time;
time_t *time_p = &time;
long long csize_;
long long degr_nsize_;
long long degr_csize_;
+ GPtrArray *errarray;
(void)cookie; /* Quiet unused parameter warning */
degr_dumpdate = NULL; /* flag if degr fields found */
skip_whitespace(s, ch); /* find the degr level number */
- if(ch != '\0') {
+ degr_mesg = NULL;
+ if (ch == '"') {
+ qname = s - 1;
+ skip_quoted_string(s, ch);
+ s[-1] = '\0'; /* terminate degr mesg */
+ degr_mesg = unquote_string(qname);
+ degr_level = -1;
+ degr_nsize = (off_t)0;
+ degr_csize = (off_t)0;
+ degr_time = (time_t)0;
+ degr_kps = 0;
+ } else if (ch != '\0') {
if(sscanf(s - 1, "%d", °r_level) != 1) {
error(_("schedule line %d: syntax error (bad degr level)"), line);
/*NOTREACHED*/
}
skip_integer(s, ch);
} else {
- degr_level = -1;
- degr_nsize = (off_t)0;
- degr_csize = (off_t)0;
- degr_time = (time_t)0;
- degr_kps = 0;
+ error(_("schedule line %d: no degraded estimate or message"), line);
}
dp = lookup_disk(hostname, diskname);
sp->degr_csize = am_round(sp->degr_csize, DISK_BLOCK_KB);
sp->degr_time = degr_time;
sp->degr_kps = degr_kps;
+ sp->degr_mesg = NULL;
} else {
sp->degr_level = -1;
sp->degr_dumpdate = NULL;
+ sp->degr_mesg = degr_mesg;
}
/*@end@*/
dp->up = (char *) sp;
if(dp->host->features == NULL) {
dp->host->features = am_string_to_feature(features);
+ if (!dp->host->features) {
+ log_add(L_WARNING,
+ _("Invalid feature string from client '%s'"),
+ features);
+ dp->host->features = am_set_default_feature_set();
+ }
}
remove_disk(&waitq, dp);
- if (dp->to_holdingdisk == HOLD_NEVER) {
- enqueue_disk(&directq, dp);
+
+ errarray = validate_optionstr(dp);
+ if (errarray->len > 0) {
+ guint i;
+ for (i=0; i < errarray->len; i++) {
+ log_add(L_FAIL, _("%s %s %s 0 [%s]"),
+ dp->host->hostname, qname,
+ sp->datestamp,
+ (char *)g_ptr_array_index(errarray, i));
+ }
+ amfree(qname);
} else {
- enqueue_disk(&runq, dp);
+
+ if (dp->data_path == DATA_PATH_DIRECTTCP &&
+ dp->to_holdingdisk == HOLD_AUTO) {
+ /* planner already logged a warning. */
+ dp->to_holdingdisk = HOLD_NEVER;
+ }
+
+ if (dp->to_holdingdisk == HOLD_NEVER) {
+ enqueue_disk(&directq, dp);
+ } else {
+ enqueue_disk(&runq, dp);
+ }
+ flush_size += sp->act_size;
}
- flush_size += sp->act_size;
amfree(diskname);
}
g_printf(_("driver: flush size %lld\n"), (long long)flush_size);
if(need_degraded==1) start_degraded_mode(&runq);
schedule_done = 1;
start_some_dumps(&runq);
+ startaflush();
}
static unsigned long
{
int i, j;
int fd;
- ssize_t buflen;
+ size_t buflen;
char buffer[DISK_BLOCK_BYTES];
dumpfile_t file;
assignedhd_t **result;
strncpy(dirname, filename, 999);
dirname[999]='\0';
ch = strrchr(dirname,'/');
- *ch = '\0';
- ch = strrchr(dirname,'/');
- *ch = '\0';
+ if (ch) {
+ *ch = '\0';
+ ch = strrchr(dirname,'/');
+ if (ch) {
+ *ch = '\0';
+ }
+ }
+
+ if (!ch) {
+ g_fprintf(stderr,_("build_diskspace: bogus filename '%s'\n"), filename);
+ amfree(used);
+ amfree(result);
+ return NULL;
+ }
for(j = 0, ha = holdalloc; ha != NULL; ha = ha->next, j++ ) {
if(strcmp(dirname, holdingdisk_get_diskdir(ha->hdisk))==0) {
if((fd = open(filename,O_RDONLY)) == -1) {
g_fprintf(stderr,_("build_diskspace: open of %s failed: %s\n"),
filename, strerror(errno));
+ amfree(used);
+ amfree(result);
return NULL;
}
- if ((buflen = fullread(fd, buffer, SIZEOF(buffer))) > 0) {;
- parse_file_header(buffer, &file, (size_t)buflen);
+ if ((buflen = full_read(fd, buffer, SIZEOF(buffer))) > 0) {;
+ parse_file_header(buffer, &file, buflen);
}
close(fd);
filename = file.cont_filename;
}
static void
-update_failed_dump_to_tape(
+update_failed_dump(
disk_t * dp)
{
-/* JLM
- * should simply set no_bump
- */
-
time_t save_timestamp = sched(dp)->timestamp;
/* setting timestamp to 0 removes the current level from the
* database, so that we ensure that it will not be bumped to the
dumper_t *dumper;
cmd_t cmd;
int result_argc;
- char *result_argv[MAX_ARGS+1];
+ char **result_argv;
char *qname;
+ disk_t *dp1;
qname = quote_string(dp->name);
g_printf(_("driver: dumping %s:%s directly to tape\n"),
/* tell the taper to read from a port number of its choice */
taper_cmd(PORT_WRITE, dp, NULL, sched(dp)->level, sched(dp)->datestamp);
- cmd = getresult(taper, 1, &result_argc, result_argv, MAX_ARGS+1);
- if(cmd != PORT) {
+ cmd = getresult(taper, 1, &result_argc, &result_argv);
+ if (cmd != PORT) {
g_printf(_("driver: did not get PORT from taper for %s:%s\n"),
dp->host->hostname, qname);
fflush(stdout);
amfree(qname);
/* copy port number */
- dumper->output_port = atoi(result_argv[2]);
+ dumper->output_port = atoi(result_argv[1]);
+ amfree(dp->dataport_list);
+ dp->dataport_list = stralloc(result_argv[2]);
dumper->dp = dp;
dumper->chunker = NULL;
taper_result = LAST_TOK;
sched(dp)->dumper = dumper;
+ if (dp->host->pre_script == 0) {
+ for (dp1=dp->host->disks; dp1 != NULL; dp1 = dp1->hostnext) {
+ run_server_scripts(EXECUTE_ON_PRE_HOST_BACKUP,
+ get_config_name(), dp1, -1);
+ }
+ dp->host->pre_script = 1;
+ }
+ run_server_scripts(EXECUTE_ON_PRE_DLE_BACKUP, get_config_name(), dp,
+ sched(dp)->level);
+
/* tell the dumper to dump to a port */
- dumper_cmd(dumper, PORT_DUMP, dp);
+ dumper_cmd(dumper, PORT_DUMP, dp, NULL);
dp->host->start_t = time(NULL) + 15;
+ amfree(dp->dataport_list);
/* update statistics & print state */
taper_tape_error = NULL;
taper_dumper = dumper;
taper_disk = dp;
- taper_input_error = NULL;
- taper_tape_error = NULL;
taper_first_label = NULL;
taper_written = 0;
taper_state |= TAPER_STATE_DUMP_TO_TAPE;
handle_dumper_result, dumper);
taper_ev_read = event_register(taper, EV_READFD,
handle_taper_result, NULL);
+
+ g_strfreev(result_argv);
}
static int
fflush(stdout);
}
-static TapeAction tape_action(void)
+static TapeAction tape_action(char **why_no_new_tape)
{
TapeAction result = TAPE_ACTION_NO_ACTION;
dumper_t *dumper;
dump_to_disk_terminated)) // or all dump to disk terminated
) {
result |= TAPE_ACTION_NO_NEW_TAPE;
+ *why_no_new_tape = _("taperflush criteria not met");
}
// when to start a flush
projects / debian / amanda / blobdiff