* tape. Probably not effective though, should do this in planner.
*/
-#define HOLD_DEBUG
-
#include "amanda.h"
#include "clock.h"
#include "conffile.h"
#include "driverio.h"
#include "server_util.h"
+#define driver_debug(i,x) do { \
+ if ((i) <= debug_driver) { \
+ dbprintf(x); \
+ } \
+} while (0)
+
+#define hold_debug(i,x) do { \
+ if ((i) <= debug_holding) { \
+ dbprintf(x); \
+ } \
+} while (0)
+
static disklist_t waitq, runq, tapeq, roomq;
static int pending_aborts;
static disk_t *taper_disk;
char *line;
int new_argc, my_argc;
char **new_argv, **my_argv;
+ char hostname[1025];
safe_fd(-1, 0);
startclock();
- parse_server_conf(main_argc, main_argv, &new_argc, &new_argv);
+ parse_conf(main_argc, main_argv, &new_argc, &new_argv);
my_argc = new_argc;
my_argv = new_argv;
amfree(line);
log_add(L_START,"date %s", driver_timestamp);
+ gethostname(hostname, SIZEOF(hostname));
+ log_add(L_STATS,"hostname %s", hostname);
+
/* check that we don't do many dump in a day and usetimestamps is off */
if(strlen(driver_timestamp) == 8) {
- char *conf_logdir = getconf_str(CNF_LOGDIR);
- char *logfile = vstralloc(conf_logdir, "/log.",
- driver_timestamp, ".0", NULL);
- char *oldlogfile = vstralloc(conf_logdir, "/oldlog/log.",
- driver_timestamp, ".0", NULL);
- if(access(logfile, F_OK) == 0 || access(oldlogfile, F_OK) == 0) {
- log_add(L_WARNING, "WARNING: This is not the first amdump run today. Enable the usetimestamps option in the configuration file if you want to run amdump more than once per calendar day.");
- }
- amfree(oldlogfile);
- amfree(logfile);
+ if (!nodump) {
+ char *conf_logdir = getconf_str(CNF_LOGDIR);
+ char *logfile = vstralloc(conf_logdir, "/log.",
+ driver_timestamp, ".0", NULL);
+ char *oldlogfile = vstralloc(conf_logdir, "/oldlog/log.",
+ driver_timestamp, ".0", NULL);
+ if(access(logfile, F_OK) == 0 || access(oldlogfile, F_OK) == 0) {
+ log_add(L_WARNING, "WARNING: This is not the first amdump run today. Enable the usetimestamps option in the configuration file if you want to run amdump more than once per calendar day.");
+ }
+ amfree(oldlogfile);
+ amfree(logfile);
+ }
hd_driver_timestamp = construct_timestamp(NULL);
}
else {
dumper->pid = -1;
break;
}
- if (pid == dumper->chunker->pid) {
+ if (dumper->chunker && pid == dumper->chunker->pid) {
who = stralloc(dumper->chunker->name);
dumper->chunker->pid = -1;
break;
for (dumper = dmptable; dumper < dmptable+inparallel; dumper++) {
- if( dumper->busy ) {
+ if( dumper->busy || dumper->down) {
continue;
}
update_info_dumper(dp, sched(dp)->origsize,
sched(dp)->dumpsize, sched(dp)->dumptime);
log_add(L_STATS, "estimate %s %s %s %d [sec %ld nkb " OFF_T_FMT
- " ckb " OFF_T_FMT " kps %d]",
+ " ckb " OFF_T_FMT " kps %lu]",
dp->host->hostname, dp->name, sched(dp)->datestamp,
sched(dp)->level,
sched(dp)->est_time, (OFF_T_FMT_TYPE)sched(dp)->est_nsize,
dummy += h[i]->used;
}
- size = size_holding_files(sched(dp)->destname, 0);
+ size = holding_file_size(sched(dp)->destname, 0);
h[activehd]->used = size - dummy;
holdalloc(h[activehd]->disk)->allocated_dumpers--;
adjust_diskspace(dp, DONE);
/* result_argv[2] always contains the serial number */
sdp = serial2disk(result_argv[2]);
if (sdp != dp) {
- error("%s: Invalid serial number", get_pname(), result_argv[2]);
+ error("%s: Invalid serial number: %s", get_pname(), result_argv[2]);
/*NOTREACHED*/
}
}
/* result_argv[2] always contains the serial number */
sdp = serial2disk(result_argv[2]);
if (sdp != dp) {
- error("%s: Invalid serial number", get_pname(), result_argv[2]);
+ error("%s: Invalid serial number: %s", get_pname(), result_argv[2]);
/*NOTREACHED*/
}
}
int ch;
disklist_t tq;
char *qname = NULL;
+ char *qdestname = NULL;
tq.head = tq.tail = NULL;
error("flush line %d: syntax error (no filename)", line);
/*NOTREACHED*/
}
- destname = s - 1;
- skip_non_whitespace(s, ch);
+ qdestname = s - 1;
+ skip_quoted_string(s, ch);
s[-1] = '\0';
+ destname = unquote_string(qdestname);
- get_dumpfile(destname, &file);
+ holding_file_get_dumpfile(destname, &file);
if( file.type != F_DUMPFILE) {
if( file.type != F_CONT_DUMPFILE )
log_add(L_INFO, "%s: ignoring cruft file.", destname);
continue;
}
+ if (holding_file_size(destname,1) <= 0) {
+ log_add(L_INFO, "%s: removing file with no data.", destname);
+ holding_file_unlink(destname);
+ continue;
+ }
+
dp1 = (disk_t *)alloc(SIZEOF(disk_t));
*dp1 = *dp;
dp1->next = dp1->prev = NULL;
sp->priority = 0;
sp->degr_level = -1;
sp->attempted = 0;
- sp->act_size = size_holding_files(destname, 0);
+ sp->act_size = holding_file_size(destname, 0);
sp->holdp = build_diskspace(destname);
if(sp->holdp == NULL) continue;
sp->dumper = NULL;
int ch;
off_t flush_size = (off_t)0;
char *qname = NULL;
+ OFF_T_FMT_TYPE nsize_;
+ OFF_T_FMT_TYPE csize_;
+ OFF_T_FMT_TYPE degr_nsize_;
+ OFF_T_FMT_TYPE degr_csize_;
(void)cookie; /* Quiet unused parameter warning */
s[-1] = '\0';
skip_whitespace(s, ch); /* find the native size */
- if(ch == '\0' || sscanf(s - 1, OFF_T_FMT,
- (OFF_T_FMT_TYPE *)&nsize) != 1) {
+ nsize_ = (OFF_T_FMT_TYPE)0;
+ if(ch == '\0' || sscanf(s - 1, OFF_T_FMT, &nsize_) != 1) {
error("schedule line %d: syntax error (bad nsize)", line);
/*NOTREACHED*/
}
+ nsize = (off_t)nsize_;
skip_integer(s, ch);
skip_whitespace(s, ch); /* find the compressed size */
- if(ch == '\0' || sscanf(s - 1, OFF_T_FMT,
- (OFF_T_FMT_TYPE *)&csize) != 1) {
+ csize_ = (OFF_T_FMT_TYPE)0;
+ if(ch == '\0' || sscanf(s - 1, OFF_T_FMT, &csize_) != 1) {
error("schedule line %d: syntax error (bad csize)", line);
/*NOTREACHED*/
}
+ csize = (off_t)csize_;
skip_integer(s, ch);
skip_whitespace(s, ch); /* find the time number */
s[-1] = '\0';
skip_whitespace(s, ch); /* find the degr native size */
- if(ch == '\0' || sscanf(s - 1, OFF_T_FMT,
- (OFF_T_FMT_TYPE *)°r_nsize) != 1) {
+ degr_nsize_ = (OFF_T_FMT_TYPE)0;
+ if(ch == '\0' || sscanf(s - 1, OFF_T_FMT, °r_nsize_) != 1) {
error("schedule line %d: syntax error (bad degr nsize)", line);
/*NOTREACHED*/
}
+ degr_nsize = (off_t)degr_nsize_;
skip_integer(s, ch);
skip_whitespace(s, ch); /* find the degr compressed size */
- if(ch == '\0' || sscanf(s - 1, OFF_T_FMT,
- (OFF_T_FMT_TYPE *)°r_csize) != 1) {
+ degr_csize_ = (OFF_T_FMT_TYPE)0;
+ if(ch == '\0' || sscanf(s - 1, OFF_T_FMT, °r_csize_) != 1) {
error("schedule line %d: syntax error (bad degr csize)", line);
/*NOTREACHED*/
}
+ degr_csize = (off_t)degr_csize_;
skip_integer(s, ch);
skip_whitespace(s, ch); /* find the degr time number */
/*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;
}
dp = lookup_disk(hostname, diskname);
maxusage += interface_get_maxusage(p);
curusage += p->curusage;
}
- res = maxusage - curusage;
+ if (maxusage >= curusage)
+ res = maxusage - curusage;
+ else
+ res = 0;
#ifndef __lint
} else {
- res = interface_get_maxusage(ip) - ip->curusage;
+ if ((unsigned long)interface_get_maxusage(ip) >= ip->curusage)
+ res = interface_get_maxusage(ip) - ip->curusage;
+ else
+ res = 0;
#endif
}
size = 2*DISK_BLOCK_KB;
size = am_round(size, (off_t)DISK_BLOCK_KB);
-#ifdef HOLD_DEBUG
- printf("%s: want " OFF_T_FMT " K\n", debug_prefix_time(": find_diskspace"),
- (OFF_T_FMT_TYPE)size);
- fflush(stdout);
-#endif
+ hold_debug(1, ("%s: want " OFF_T_FMT " K\n",
+ debug_prefix_time(": find_diskspace"),
+ (OFF_T_FMT_TYPE)size));
for(hdp = getconf_holdingdisks(); hdp != NULL; hdp = hdp->next) {
num_holdingdisks++;
/* halloc = space to allocate, including 1 header for each chunksize */
halloc = dalloc + (((dalloc-(off_t)1)/holdingdisk_get_chunksize(minp))+(off_t)1) * (off_t)DISK_BLOCK_KB;
-#ifdef HOLD_DEBUG
- printf("%s: find diskspace: size " OFF_T_FMT " hf " OFF_T_FMT
- " df " OFF_T_FMT " da " OFF_T_FMT " ha " OFF_T_FMT "\n",
- debug_prefix_time(": find_diskspace"),
- (OFF_T_FMT_TYPE)size,
- (OFF_T_FMT_TYPE)hfree,
- (OFF_T_FMT_TYPE)dfree,
- (OFF_T_FMT_TYPE)dalloc,
- (OFF_T_FMT_TYPE)halloc);
- fflush(stdout);
-#endif
+ hold_debug(1, ("%s: find diskspace: size " OFF_T_FMT " hf " OFF_T_FMT
+ " df " OFF_T_FMT " da " OFF_T_FMT " ha " OFF_T_FMT"\n",
+ debug_prefix_time(": find_diskspace"),
+ (OFF_T_FMT_TYPE)size,
+ (OFF_T_FMT_TYPE)hfree,
+ (OFF_T_FMT_TYPE)dfree,
+ (OFF_T_FMT_TYPE)dalloc,
+ (OFF_T_FMT_TYPE)halloc));
size -= dalloc;
result[i] = alloc(SIZEOF(assignedhd_t));
result[i]->disk = minp;
result = NULL;
}
-#ifdef HOLD_DEBUG
- for( i = 0; result && result[i]; i++ ) {
- printf("%s: find diskspace: selected %s free " OFF_T_FMT " reserved " OFF_T_FMT " dumpers %d\n",
- debug_prefix_time(": find_diskspace"),
- holdingdisk_get_diskdir(result[i]->disk),
- (OFF_T_FMT_TYPE)(result[i]->disk->disksize -
- holdalloc(result[i]->disk)->allocated_space),
- (OFF_T_FMT_TYPE)result[i]->reserved,
- holdalloc(result[i]->disk)->allocated_dumpers);
+ if (debug_holding > 1) {
+ for( i = 0; result && result[i]; i++ ) {
+ hold_debug(1, ("%s: find diskspace: selected %s free " OFF_T_FMT
+ " reserved " OFF_T_FMT " dumpers %d\n",
+ debug_prefix_time(": find_diskspace"),
+ holdingdisk_get_diskdir(result[i]->disk),
+ (OFF_T_FMT_TYPE)(result[i]->disk->disksize -
+ holdalloc(result[i]->disk)->allocated_space),
+ (OFF_T_FMT_TYPE)result[i]->reserved,
+ holdalloc(result[i]->disk)->allocated_dumpers));
+ }
}
- fflush(stdout);
-#endif
return result;
}
holdalloc(holdp[0]->disk)->allocated_space += holdp[0]->reserved;
size = (holdp[0]->reserved>size) ? (off_t)0 : size-holdp[0]->reserved;
qname = quote_string(diskp->name);
-#ifdef HOLD_DEBUG
- printf("%s: merging holding disk %s to disk %s:%s, add " OFF_T_FMT " for reserved " OFF_T_FMT ", left " OFF_T_FMT "\n",
- debug_prefix_time(": assign_holdingdisk"),
- holdingdisk_get_diskdir(sched(diskp)->holdp[j-1]->disk),
- diskp->host->hostname, qname,
- (OFF_T_FMT_TYPE)holdp[0]->reserved,
- (OFF_T_FMT_TYPE)sched(diskp)->holdp[j-1]->reserved,
- (OFF_T_FMT_TYPE)size);
- fflush(stdout);
-#endif
+ hold_debug(1, ("%s: merging holding disk %s to disk %s:%s, add "
+ OFF_T_FMT " for reserved " OFF_T_FMT ", left "
+ OFF_T_FMT "\n",
+ debug_prefix_time(": assign_holdingdisk"),
+ holdingdisk_get_diskdir(
+ sched(diskp)->holdp[j-1]->disk),
+ diskp->host->hostname, qname,
+ (OFF_T_FMT_TYPE)holdp[0]->reserved,
+ (OFF_T_FMT_TYPE)sched(diskp)->holdp[j-1]->reserved,
+ (OFF_T_FMT_TYPE)size));
i++;
amfree(qname);
amfree(holdp[0]);
size = (holdp[i]->reserved > size) ? (off_t)0 :
(size - holdp[i]->reserved);
qname = quote_string(diskp->name);
-#ifdef HOLD_DEBUG
- printf("%s: %d assigning holding disk %s to disk %s:%s, reserved " OFF_T_FMT ", left " OFF_T_FMT "\n",
- debug_prefix_time(": assign_holdingdisk"),
- i, holdingdisk_get_diskdir(holdp[i]->disk), diskp->host->hostname, qname,
- (OFF_T_FMT_TYPE)holdp[i]->reserved,
- (OFF_T_FMT_TYPE)size);
- fflush(stdout);
-#endif
+ hold_debug(1,
+ ("%s: %d assigning holding disk %s to disk %s:%s, reserved "
+ OFF_T_FMT ", left " OFF_T_FMT "\n",
+ debug_prefix_time(": assign_holdingdisk"),
+ i, holdingdisk_get_diskdir(holdp[i]->disk),
+ diskp->host->hostname, qname,
+ (OFF_T_FMT_TYPE)holdp[i]->reserved,
+ (OFF_T_FMT_TYPE)size));
amfree(qname);
holdp[i] = NULL; /* so it doesn't get free()d... */
}
qname = quote_string(diskp->name);
qdest = quote_string(sched(diskp)->destname);
-#ifdef HOLD_DEBUG
- printf("%s: %s:%s %s\n",
- debug_prefix_time(": adjust_diskspace"),
- diskp->host->hostname, qname, qdest);
- fflush(stdout);
-#endif
+ hold_debug(1, ("%s: %s:%s %s\n",
+ debug_prefix_time(": adjust_diskspace"),
+ diskp->host->hostname, qname, qdest));
holdp = sched(diskp)->holdp;
total += holdp[i]->used;
holdalloc(holdp[i]->disk)->allocated_space += diff;
hqname = quote_string(holdp[i]->disk->name);
-#ifdef HOLD_DEBUG
- printf("%s: hdisk %s done, reserved " OFF_T_FMT " used " OFF_T_FMT " diff " OFF_T_FMT " alloc " OFF_T_FMT " dumpers %d\n",
- debug_prefix_time(": adjust_diskspace"),
- holdp[i]->disk->name,
- (OFF_T_FMT_TYPE)holdp[i]->reserved,
- (OFF_T_FMT_TYPE)holdp[i]->used,
- (OFF_T_FMT_TYPE)diff,
- (OFF_T_FMT_TYPE)holdalloc(holdp[i]->disk)->allocated_space,
- holdalloc(holdp[i]->disk)->allocated_dumpers );
- fflush(stdout);
-#endif
+ hold_debug(1, ("%s: hdisk %s done, reserved " OFF_T_FMT " used "
+ OFF_T_FMT " diff " OFF_T_FMT " alloc " OFF_T_FMT
+ " dumpers %d\n",
+ debug_prefix_time(": adjust_diskspace"),
+ holdp[i]->disk->name,
+ (OFF_T_FMT_TYPE)holdp[i]->reserved,
+ (OFF_T_FMT_TYPE)holdp[i]->used,
+ (OFF_T_FMT_TYPE)diff,
+ (OFF_T_FMT_TYPE)holdalloc(holdp[i]->disk)
+ ->allocated_space,
+ holdalloc(holdp[i]->disk)->allocated_dumpers ));
holdp[i]->reserved += diff;
amfree(hqname);
}
sched(diskp)->act_size = total;
-#ifdef HOLD_DEBUG
- printf("%s: after: disk %s:%s used " OFF_T_FMT "\n",
- debug_prefix_time(": adjust_diskspace"),
- diskp->host->hostname, qname,
- (OFF_T_FMT_TYPE)sched(diskp)->act_size);
- fflush(stdout);
-#endif
+ hold_debug(1, ("%s: after: disk %s:%s used " OFF_T_FMT "\n",
+ debug_prefix_time(": adjust_diskspace"),
+ diskp->host->hostname, qname,
+ (OFF_T_FMT_TYPE)sched(diskp)->act_size));
amfree(qdest);
amfree(qname);
}
holdalloc(holdp[i]->disk)->allocated_space -= holdp[i]->used;
}
- unlink_holding_files(holdp[0]->destname); /* no need for the entire list,
- * because unlink_holding_files
+ holding_file_unlink(holdp[0]->destname); /* no need for the entire list,
+ * because holding_file_unlink
* will walk through all files
* using cont_filename */
free_assignedhd(sched(diskp)->holdp);
free_serial(result_argv[2]);
+ dumpsize = (off_t)0;
if (*result_argv[5] == '"') {
/* String was quoted */
+ OFF_T_FMT_TYPE dumpsize_ = (OFF_T_FMT_TYPE)0;
rc = sscanf(result_argv[5],"\"[sec %lf kb " OFF_T_FMT " ",
- &tapetime, (OFF_T_FMT_TYPE *)&dumpsize);
+ &tapetime, &dumpsize_);
+ dumpsize = (off_t)dumpsize_;
} else {
/* String was not quoted */
+ OFF_T_FMT_TYPE dumpsize_ = (OFF_T_FMT_TYPE)0;
rc = sscanf(result_argv[5],"[sec %lf kb " OFF_T_FMT " ",
- &tapetime, (OFF_T_FMT_TYPE *)&dumpsize);
+ &tapetime, &dumpsize_);
+ dumpsize = (off_t)dumpsize_;
}
if (rc < 2) {
error("error [malformed result: %d items matched in '%s']",
projects / debian / amanda / blobdiff