* or might be blanked out
* <spc><spc><spc><spc>....
*
- * site.name_duct.lock lock preventing multiple ducts
- * holder of this lock is "duct"
* F site.name main feed file
* opened/created, then written, by innd
* read by duct
* unlinked by duct
* tokens blanked out by duct when processed
- * D site.name_duct temporary feed file during flush (or crash)
+ * site.name_lock lock preventing multiple ducts
+ * to hold lock must open,F_SETLK[W]
+ * and then stat to check that locked file
+ * still has name site.name_lock
+ * holder of this lock is "duct"
+ * (only) lockholder may remove the lockfile
+ * D site.name_flushing temporary feed file during flush (or crash)
* hardlink created by duct
* unlinked by duct
- * site.name_duct.defer 431'd articles, still being written,
+ * site.name_defer 431'd articles, still being written,
* created, written, used by duct
- * site.name_backlog.lock lock taken out by innxmit wrapper
- * holder and its child are "xmit"
- * site.name_backlog_<date>.<inum>
+ *
+ * site.name_backlog.<date>.<inum>
* 431'd articles, ready for innxmit or duct
* created (link/mv) by duct
- * site.name_backlog_<anything-else> eg
- * site.name_backlog_manual
+ * site.name_backlog<anything-else> (where <anything-else> does not
+ * contain '#' or '~') eg
+ * site.name_backlog.manual
* anything the sysadmin likes (eg, feed files
* from old feeds to be merged into this one)
* created (link/mv) by admin
+ * may be symlinks (in which case links
+ * may be written through, but only links
+ * will be removed.
+ *
+ * It is safe to remove backlog files manually,
+ * if it's desired to throw away the backlog.
*
* Backlog files are also processed by innduct. We find the oldest
* backlog file which is at least a certain amount old, and feed it
static LIST(Conn) idle, working, full;
static LIST(Article) *queue;
-static char *path_ductlock, *path_duct, *path_ductdefer;
+static char *path_lock, *path_flushing, *path_defer;
#define SMS(newstate, periods, why) \
(statemc_setstate(sm_##newstate,(periods),#newstate,(why)))
open_defer();
if (fprintf(defer, "%s %s\n", TokenToText(art->token), art->messageid) <0
|| fflush(defer))
- sysfatal("write to defer file %s",path_ductdefer);
+ sysfatal("write to defer file %s",path_defer);
article_done(conn, art, RC_deferred);
break;
(unsigned long)ipf->offset, (unsigned long)flush_threshold);
int r= link(feedfile, duct_path);
- if (r) sysdie("link feedfile %s to ductfile %s", feedfile, dut_path);
+ if (r) sysdie("link feedfile %s to flushing file %s", feedfile, dut_path);
/* => Hardlinked */
r= unlink(feedfile);
poll for F
================
|
- | TIMEOUT
+ | TIMEOUT and no defer, no backlog
|`--------------------------.
- | | install defer as backlog
+ | |
| OPEN F SUCCEEDS | exit
,--------->| V
| V =========
struct stat stab, stabf;
int noent;
- path_ductlock= xasprintf("%s_duct.lock", feedfile);
- path_duct= xasprintf("%s_duct", feedfile);
- path_ductdefer= xasprintf("%s_duct.defer", feedfile);
- globpat_backlog= xasprintf("%s_backlog_*", feedfile);
+ path_lock= xasprintf("%s_lock", feedfile);
+ path_flushing= xasprintf("%s_flushing", feedfile);
+ path_defer= xasprintf("%s_defer", feedfile);
+ globpat_backlog= xasprintf("%s_backlog*", feedfile);
for (;;) {
- int lockfd= open(path_ductlock, O_CREAT|O_RDWR, 0600);
- if (lockfd<0) sysfatal("open lockfile %s", path_ductlock);
+ int lockfd= open(path_lock, O_CREAT|O_RDWR, 0600);
+ if (lockfd<0) sysfatal("open lockfile %s", path_lock);
struct flock fl;
memset(&fl,0,sizeof(fl));
if (quiet_if_locked) exit(0);
fatal("another duct holds the lockfile");
}
- sysdie("fcntl F_SETLK lockfile %s", path_ductlock);
+ sysdie("fcntl F_SETLK lockfile %s", path_lock);
}
xfstat_isreg(lockfd, &stabf, "lockfile");
- xlstat_isreg(path_ductlock, &stab, &noent, "lockfile");
+ xlstat_isreg(path_lock, &stab, &noent, "lockfile");
if (!noent && samefile(&stab, &stabf))
break;
if (close(lockfd))
- sysdie("could not close stale lockfile %s", path_ductlock);
+ sysdie("could not close stale lockfile %s", path_lock);
}
debug("startup: locked");
- xlstat_isreg(path_ductdefer, &stab, &noent, "defer file");
+ search_backlog_file();
+
+ xlstat_isreg(path_defer, &stab, &noent, "defer file");
if (noent) {
debug("startup: ductdefer ENOENT");
} else {
debug("startup: ductdefer nlink=%ld", (long)stab.st_nlink);
switch (stab.st_nlink==1) {
- case 1: /* ok */ break;
+ case 1:
+ open_defer(); /* so that we will later close it and rename it */
+ break;
case 2:
if (unlink(path_defer))
sysdie("could not unlink stale defer file link %s (presumably"
}
}
- InputFile *file_d= open_input_file(path_duct);
+ InputFile *file_d= open_input_file(path_flushing);
if (file_d) {
struct stat stab_f, stab_d;
debug("startup: F and D both exist");
- xfstat_isreg(file_d->fd, &stab_d, "ductfile");
+ xfstat_isreg(file_d->fd, &stab_d, "flushing file");
if (samefile(&stab_d, &stab_f)) {
debug("startup: F==D => Hardlinked");
- r= unlink(path_duct);
+ r= unlink(path_flushing);
if (r) sysdie("unlink feed file %s during startup", feedfile);
found_moved:
debug(" => Moved");
}
} else {
debug("startup: D ENOENT => Nothing");
+ fixme need to try flushing innd here - needs state diagram changes;
SMS(WAITING, open_wait_periods, "no feed file currently exists");
}
}
if (ipf == backlog_input_file) {
notice_processed(ipf,"backlog file",ipf->path);
close_input_file(ipf);
- if (unlink(ipf->path))
- sysdie("could not unlink done backlog file %s", ipf->path);
+ if (unlink(ipf->path)) {
+ if (errno != ENOENT)
+ sysdie("could not unlink processed backlog file %s", ipf->path);
+ warn("backlog file %s vanished while we were reading it"
+ " so we couldn't remove it (but it's done now, anyway)",
+ ipf->path);
+ }
backlog_input_file= 0;
search_backlog_file();
return;
close_defer();
- if (unlink(path_duct))
- sysdie("could not unlink old duct file %s", path_duct);
+ if (unlink(path_flushing))
+ sysdie("could not unlink old flushing file %s", path_flushing);
if (sms==sm_DROPPING) {
- notice("feed dropped and our work is complete"
- " (but check for backlog files)");
- r= unlink(path_ductlock);
- if (r) sysdie("unlink lock file for old feed %s", path_ductlock);
+ if (search_backlog_file()) {
+ debug("feed dropped but still backlogs to process");
+ return;
+ }
+ notice("feed dropped and our work is complete");
+ r= unlink(path_lock);
+ if (r) sysdie("unlink lockfile for old feed %s", path_lock);
exit(0);
}
if (defer) return;
- defer= fopen(path_ductdefer, "a+");
- if (!defer) sysfatal("could not open defer file %s", path_ductdefer);
+ defer= fopen(path_defer, "a+");
+ if (!defer) sysfatal("could not open defer file %s", path_defer);
/* truncate away any half-written records */
xfstat_isreg(fileno(defer), &stab, "newly opened defer file");
if (stab.st_size > LONG_MAX)
- die("defer file %s size is far too large", path_ductdefer);
+ die("defer file %s size is far too large", path_defer);
if (!stab.st_size)
return;
for (;;) {
if (!truncto) break; /* was only (if anything) one half-truncated record */
if (fseek(defer, truncto-1, SEEK_SET) < 0)
- sysdie("seek in defer file %s while truncating partial", path_ductdefer);
+ sysdie("seek in defer file %s while truncating partial", path_defer);
r= getc(defer);
if (r==EOF) {
if (ferror(defer))
- sysdie("failed read from defer file %s", path_ductdefer);
+ sysdie("failed read from defer file %s", path_defer);
else
- die("defer file %s shrank while we were checking it!", path_ductdefer);
+ die("defer file %s shrank while we were checking it!", path_defer);
}
if (r=='\n') break;
truncto--;
if (stab.st_size != truncto) {
warn("truncating half-record at end of defer file %s -"
" shrinking by %ld bytes from %ld to %ld",
- path_ductdefer, orgsize - truncto, orgsize, truncto);
+ path_defer, orgsize - truncto, orgsize, truncto);
if (fflush(defer))
- sysfatal("could not flush defer file %s", path_ductdefer);
+ sysfatal("could not flush defer file %s", path_defer);
if (ftruncate(fileno(defer), truncto))
- sysdie("could not truncate defer file %s", path_ductdefer);
+ sysdie("could not truncate defer file %s", path_defer);
} else {
info("continuing existing defer file %s (%ld bytes)",
- path_ductdefer, orgsize);
+ path_defer, orgsize);
}
if (fseek(defer, truncto, SEEK_SET))
- sysdie("could not seek to new end of defer file %s", path_ductdefer);
+ sysdie("could not seek to new end of defer file %s", path_defer);
}
static void close_defer(void) {
search_backlog_file();
}
-static void search_backlog_file(void) {
+static int search_backlog_file(void) {
+ /* returns non-0 iff there are any backlog files */
+
glob_t gl;
int r;
struct stat stab;
const char *oldest_path=0;
time_t oldest_mtime, now;
- assert(!backlog_input_file);
+ if (backlog_input_file) return 3;
+
+ try_again:
r= glob(globpat_backlog, GLOB_ERR|GLOB_MARK|GLOB_NOSORT, 0, &gl);
case 0:
for (i=0; i<gl.gl_pathc; i++) {
const char *path= gl.gl_pathv[i];
+
+ if (strchr(path,'#') || strchr(path,'~')) {
+ debug("backlog file search skipping %s", path);
+ continue;
+ }
r= stat(path, &stab);
if (r) {
syswarn("failed to stat backlog file %s", path);
if (!oldest_path) {
debug("backlog scan: none");
backlog_nextscan_periods= backlog_spontaneous_rescan_periods;
- return;
+ return 0;
}
now= time(); if (now==-1) sysdie("time(2) failed");
age, age_deficiency, oldest_path);
backlog_input_file= open_input_file();
+ if (!backlog_input_file) {
+ warn("backlog file %s vanished as we opened it", backlog_input_file);
+ goto try_again;
+ }
inputfile_tailing_start(backlog_input_file);
backlog_nextscan_periods= -1;
- return;
+ return 1;
}
backlog_nextscan_periods= age_deficiency / PERIOD_SECONDS;
debug("backlog scan: young age=%f deficiency=%ld nextscan=%d oldest=%s",
age, age_deficiency, backlog_nextscan_periods, oldest_path);
+ return 2;
}
/*========== flushing the feed ==========*/