X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ian/git?a=blobdiff_plain;f=backends%2Finnduct.c;h=0d4d05b0ad5dea68d39c8b7460e9d03f98c47b43;hb=76eef73f36c7ab8c3cbc7f41ca58310994f7cb96;hp=ba4c6bd1330fea3b3797ed3d741862acde3005e2;hpb=82461c8e9ade04d1bcb3786a98e57011b9324f0e;p=inn-innduct.git diff --git a/backends/innduct.c b/backends/innduct.c index ba4c6bd..0d4d05b 100644 --- a/backends/innduct.c +++ b/backends/innduct.c @@ -43,6 +43,26 @@ * unlinked by xmit + + + BLATHER ABOUT NOT USING INNXMIT + + scan for backlog files + take "old enough" backlog files one at a time and reprocess them + so need another input file - the current backlog file + inhibit scanning for backlog files only when + - last file not "old enough" + - no backlog files found and we haven't made one + + also we have to start a new backlog file every (some interval) + + TODO for backlog file inputs + - all code to search for and open these files + - write proper algorithm comment + + + + OVERALL STATES: START @@ -134,18 +154,38 @@ * */ + +/*----- general definitions, probably best not changed -----*/ + #define PERIOD_SECONDS 60 -static char *feedfile; -static int max_connections, max_queue_per_conn; -static int connection_setup_timeout, port, try_stream; +#define CONNCHILD_ESTATUS_STREAM 4 +#define CONNCHILD_ESTATUS_NOSTREAM 5 + +#define INNDCOMMCHILD_ESTATUS_FAIL 6 +#define INNDCOMMCHILD_ESTATUS_NONESUCH 7 + + +/*----- configuration options -----*/ + +static char *sitename, *feedfile; +static int max_connections=10, max_queue_per_conn=200; +static int connection_setup_timeout=200, port=119, try_stream=1; +static int inndcomm_flush_timeout=100, quiet_if_locked=0; static const char *remote_host; +static int reconnect_delay_periods, flushfail_retry_periods, open_wait_periods; +static const char *inndconffile; static double accept_proportion; -static double nocheck_thresh= 0.95; -static double nocheck_decay= 1-1/100; +static double nocheck_thresh_pct= 95.0; +static double nocheck_thresh; /* computed in main from _pct */ +static double nocheck_decay_articles= 100; /* converted to _decay */ +static double nocheck_decay; /* computed in main from _articles */ static int nocheck, nocheck_reported; + +/*----- doubly linked lists -----*/ + #define ISNODE(T) T *next, *back; #define LIST(T) struct { T *head, *tail, *tailpred; int count; } @@ -166,6 +206,8 @@ static int nocheck, nocheck_reported; (list_insert((struct list*)&(l), NODE((n)), NODE((pred))), (void)(l).count++) +/*----- statistics -----*/ + #define RESULT_COUNTS \ RC(offered) \ RC(sent) \ @@ -184,21 +226,10 @@ typedef struct { int articles[2 /* checked */][RCI_max]; } Counts; -struct Article { - int midlen; - int checked, sentbody; - InputFile *ipf; - TOKEN token; - off_t offset; - int blanklen; - char messageid[1]; -}; -#define CONNIOVS 128 - -#define CN "<%d> " +/*----- transmission buffers -----*/ -typedef struct Conn Conn; +#define CONNIOVS 128 typedef enum { xk_Malloc, xk_Const, xk_Artdata; @@ -212,6 +243,45 @@ typedef struct { } info; } XmitDetails; + +/*----- core operational data structure types -----*/ + +struct Article { + int midlen; + int checked, sentbody; + InputFile *ipf; + TOKEN token; + off_t offset; + int blanklen; + char messageid[1]; +}; + +typedef struct InputFile { + /* This is an instance of struct oop_readable */ + struct oop_readable readable; /* first */ + oop_readable_call *readable_callback; + void *readable_callback_user; + + int fd; + const char *path; /* ptr copy of path_ or feedfile */ + struct Filemon_Perfile *filemon; + + oop_read *rd; + long inprogress; /* no. of articles read but not processed */ + off_t offset; + + Counts counts; +} InputFile; + +typedef enum { + sm_WAITING, + sm_NORMAL, + sm_FLUSHING, + sm_FLUSHFAIL, + sm_SEPARATED, + sm_DROPPING, +} StateMachineState; + struct Conn { ISNODE(Conn); int fd, max_queue, stream; @@ -222,28 +292,57 @@ struct Conn { int xmitu; }; + +/*----- operational variables -----*/ + +static int since_connect_attempt; +static int nconns; +static LIST(Conn) idle, working, full; +static LIST(Article) *queue; + +static char *path_ductlock, *path_duct, *path_ductdefer; + +#define SMS(newstate, periods, why) \ + (statemc_setstate(sm_##newstate,(periods),#newstate,(why))) + +static StateMachineState sms; static FILE *defer; +static InputFile *main_input_file, *old_input_file, *backlog_input_file; +static int sm_period_counter; + + +/*----- function predeclarations -----*/ + +static void conn_check_work(Conn *conn); static int filemon_init(void); static void filemon_setfile(int mainfeed_fd, const char *mainfeed_path); static void filemon_callback(void); +static void statemc_setstate(StateMachineState newsms, int periods, + const char *forlog, const char *why); -#define CHILD_ESTATUS_STREAM 4 -#define CHILD_ESTATUS_NOSTREAM 5 - -static int since_connect_attempt; -static int nconns; -static LIST(Conn) idle, working, full; - -static LIST(Article) *queue; +/*========== utility functions etc. ==========*/ static void perhaps_close(int *fd) { if (*fd) { close(*fd); fd=0; } } -/*========== making new connections ==========*/ +static pid_t xfork(const char *what) { + pid_t child; -static int connecting_sockets[2]= {-1,-1}; -static pid_t connecting_child; + child= fork(); + if (child==-1) sysdie("cannot fork for %s",what); + if (!child) postfork(what); + return child; +} + +static void on_fd_read_except(int fd, oop_call_fd callback) { + loop->on_fd(loop, fd, OOP_READ, callback, 0); + loop->on_fd(loop, fd, OOP_EXCEPTION, callback, 0); +} +static void cancel_fd_read_except(int fd) { + loop->cancel_fd(loop, fd, OOP_READ); + loop->cancel_fd(loop, fd, OOP_EXCEPTION); +} static void report_child_status(const char *what, int status) { if (WIFEXITED(status)) { @@ -264,27 +363,93 @@ static void report_child_status(const char *what, int status) { } } -static void connect_attempt_discard(void) { - if (connecting_sockets[0]) { - cancel_fd(loop, connecting_sockets[0], OOP_READ); - cancel_fd(loop, connecting_sockets[0], OOP_EXCEPTION); +static int xwaitpid(pid_t *pid, const char *what) { + int status; + + r= kill(*pid, SIGKILL); + if (r) sysdie("cannot kill %s child", what); + + pid_t got= waitpid(*pid, &status, WNOHANG); + if (got==-1) sysdie("cannot reap %s child", what); + + *pid= 0; + + return status; +} + +/*========== logging ==========*/ + +static void logcore(int sysloglevel, const char *fmt, ...) + __attribute__((printf,2,3)) +static void logcore(int sysloglevel, const char *fmt, ...) { + va_list al; + va_start(al,fmt); + if (become_daemon) { + vsyslog(sysloglevel,fmt,al); + } else { + vfprintf(stderr,fmt,al); + putc('\n',stderr); } +} + +static void logv(int sysloglevel, const char *pfx, int errnoval, + int exitstatus, const char *fmt, va_list al) + __attribute__((printf,4,0)) +static void logv(int sysloglevel, const char *pfx, int errnoval, + int exitstatus, const char *fmt, va_list al) { + char msgbuf[256]; + vsnprintf(msgbuf,sizeof(msgbuf), fmt,al); + msgbuf[sizeof(msgbuf)-1]= 0; + + if (sysloglevel >= LOG_ERR && (errnoval==EACCES || errnoval==EPERM)) + sysloglevel= LOG_ERR; /* run by wrong user, probably */ + + logcore(sysloglevel, "<%s>%s: %s%s%s", + sitename, pfx, msgbuf, + errnoval>=0 ? ": " : "", + errnoval>=0 ? strerror(errnoval) : ""); +} + +#define logwrap(fn, pfx, sysloglevel, errno, estatus) \ + static void fn(const char *fmt, ...) \ + __attribute__((printf,1,2)); \ + static void fn(const char *fmt, ...) { \ + va_list al; \ + va_start(al,fmt); \ + logv(sysloglevel, pfx, errno, estatus, fmt, al); \ + } + +logwrap(sysdie, " critical", LOG_CRIT, errno, 16); +logwrap(die, " critical", LOG_CRIT, -1, 16); + +logwrap(sysfatal, " fatal", LOG_ERR, errno, 12); +logwrap(fatal, " fatal", LOG_ERR, -1, 12); + +logwrap(syswarn, " warning", LOG_WARN, errno, 0); +logwrap(warn, " warning", LOG_WARN, -1, 0); + +logwrap(notice, "", LOG_NOTICE, -1, 0); +logwrap(info, " info", LOG_INFO, -1, 0); + + +/*========== making new connections ==========*/ + +static int connecting_sockets[2]= {-1,-1}; +static pid_t connecting_child; + +static void connect_attempt_discard(void) { + if (connecting_sockets[0]) + cancel_fd(connecting_sockets[0]); + perhaps_close(&connecting_sockets[0]); perhaps_close(&connecting_sockets[1]); if (connecting_child) { - int status; - r= kill(connecting_child, SIGKILL); - if (r) sysdie("cannot kill connect child"); - - pid_t got= waitpid(connecting_child, &status, WNOHANG); - if (got==-1) sysdie("cannot reap connect child"); + int status= xwaitpid(&connecting_child, "connect"); if (!(WIFEXITED(status) || - (WIFSIGNALED(status) && WTERMSIG(status) == SIGKILL))) { - report_child_status("connect" - } - connecting_child= 0; + (WIFSIGNALED(status) && WTERMSIG(status) == SIGKILL))) + report_child_status("connect", status); } } @@ -298,7 +463,8 @@ static void connect_attempt_discard(void) { static void *connchild_event(oop_source *lp, int fd, oop_event e, void *u) { Conn *conn= 0; - conn= xcalloc(sizeof(*conn)); + conn= xmalloc(sizeof(*conn)); + memset(conn,0,sizeof(*conn)); DECL_MSG_CMSG(msg); struct cmsghdr *h= 0; @@ -312,8 +478,8 @@ static void *connchild_event(oop_source *lp, int fd, oop_event e, void *u) { connecting_child= 0; if (WIFEXITED(status) && (WEXITSTATUS(status) != 0 - WEXITSTATUS(status) != CHILD_ESTATUS_STREAM && - WEXITSTATUS(status) != CHILD_ESTATUS_NOSTREAM)) { + WEXITSTATUS(status) != CONNCHILD_ESTATUS_STREAM && + WEXITSTATUS(status) != CONNCHILD_ESTATUS_NOSTREAM)) { /* child already reported the problem */ } else if (WIFSIGNALED(status) && WTERMSIG(status) == SIGALARM) { warn("connect: connection attempt timed out"); @@ -355,10 +521,10 @@ static void *connchild_event(oop_source *lp, int fd, oop_event e, void *u) { if (!WIFEXITED(status)) { report_child_status("connect",status); goto x; } int es= WEXITSTATUS(status); switch (es) { - case CHILD_ESTATUS_STREAM: conn->stream= 1; break; - case CHILD_ESTATUS_NOSTREAM: conn->stream= 0; break; + case CONNCHILD_ESTATUS_STREAM: conn->stream= 1; break; + case CONNCHILD_ESTATUS_NOSTREAM: conn->stream= 0; break; default: - die("connect: child gave unexpected exit status %d", es); + fatal("connect: child gave unexpected exit status %d", es); } set nonblocking; @@ -388,16 +554,12 @@ static void connect_start() { r= socketpair(AF_UNIX, SOCK_STREAM, 0, connecting_sockets); if (r) { syswarn("connect: cannot create socketpair for child"); goto x; } - connecting_child= fork(); - if (connecting_child==-1) { syswarn("connect: cannot fork"); goto x; } + connecting_child= xfork("connection"); if (!connecting_child) { FILE *cn_from, *cn_to; char buf[NNTP_STRLEN+100]; - int exitstatus= CHILD_ESTATUS_NOSTREAM; - - put sigpipe back; - close unwanted fds; + int exitstatus= CONNCHILD_ESTATUS_NOSTREAM; r= close(connecting_sockets[0]); if (r) sysdie("connect: close parent socket in child"); @@ -406,29 +568,29 @@ static void connect_start() { if (NNTPconnect(remote_host, port, &cn_from, &cn_to, buf) < 0) { if (buf[0]) { sanitise_inplace(buf); - die("connect: rejected: %s", buf); + fatal("connect: rejected: %s", buf); } else { - sysdie("connect: connection attempt failed"); + sysfatal("connect: connection attempt failed"); } } if (NNTPsendpassword(remote_host, cn_from, cn_to) < 0) - sysdie("connect: authentication failed"); + sysfatal("connect: authentication failed"); if (try_stream) { if (fputs("MODE STREAM\r\n", cn_to) || fflush(cn_to)) - sysdie("connect: could not send MODE STREAM"); + sysfatal("connect: could not send MODE STREAM"); buf[sizeof(buf)-1]= 0; if (!fgets(buf, sizeof(buf)-1, cn_from)) { if (ferror(cn_from)) - sysdie("connect: could not read response to MODE STREAM"); + sysfatal("connect: could not read response to MODE STREAM"); else - die("connect: connection close in response to MODE STREAM"); + fatal("connect: connection close in response to MODE STREAM"); } int l= strlen(buf); assert(l>=1); if (buf[-1]!='\n') { sanitise_inplace(buf); - die("connect: response to MODE STREAM is too long: %.100s...", + fatal("connect: response to MODE STREAM is too long: %.100s...", remote_host, buf); } l--; if (l>0 && buf[1-]=='\r') l--; @@ -437,11 +599,11 @@ static void connect_start() { int rcode= strtoul(buf,&ep,10); if (ep != buf[3]) { sanitise_inplace(buf); - die("connect: bad response to MODE STREAM: %.50s", buf); + fatal("connect: bad response to MODE STREAM: %.50s", buf); } switch (rcode) { case 203: - exitstatus= CHILD_ESTATUS_STREAM; + exitstatus= CONNCHILD_ESTATUS_STREAM; break; case 480: case 500: @@ -472,17 +634,15 @@ static void connect_start() { r= close(connecting_sockets[1]); connecting_sockets[1]= 0; if (r) sysdie("connect: close child socket in parent"); - loop->on_fd(loop, connecting_sockets[0], OOP_READ, connchild_event, 0); - loop->on_fd(loop, connecting_sockets[0], OOP_EXCEPTION, connchild_event, 0); + on_fd_read_except(connecting_sockets[0], connchild_event); return OOP_CONTINUE; x: connect_attempt_discard(); } -/*========== overall control of article flow ==========*/ -static void conn_check_work(Conn *conn); +/*========== overall control of article flow ==========*/ static void check_master_queue(void) { try reading current feed file; @@ -564,8 +724,8 @@ static void conn_check_work(Conn *conn) { } } -/*========== article transmission ==========*/ +/*========== article transmission ==========*/ static XmitDetails *xmit_core(Conn *conn, const char *data, int len, XmitKind kind) { /* caller must then fill in details */ @@ -610,8 +770,7 @@ static void *conn_write_some_xmits(Conn *conn) { ssize_t rs= writev(conn->fd, conn->xmit, count); if (rs < 0) { if (errno == EAGAIN) return OOP_CONTINUE; - syswarn(CN "write failed", conn->fd); - conn_failed(conn); + connfail(conn, "write failed: %s", strerror(errno)); return OOP_HALT; } assert(rs > 0); @@ -666,7 +825,7 @@ static void conn_make_some_xmits(Conn *conn) { art->sent= 1; LIST_ADDTAIL(conn->sent, art); - counts[art->checked].sent++; + art->ipf->counts[art->checked].sent++; } else { /* check it */ @@ -679,12 +838,13 @@ static void conn_make_some_xmits(Conn *conn) { XMIT_LITERAL("\r\n"); LIST_ADDTAIL(conn->sent, art); - counts[art->checked].offered++; + art->ipf->counts[art->checked].offered++; } } } -/*========== responses from peer ==========*/ + +/*========== handling responses from peer ==========*/ static const oop_rd_style peer_rd_style= { OOP_RD_DELIM_STRIP, '\n', @@ -698,45 +858,43 @@ static Article *article_reply_check(Connection *conn, const char *response, Article *art= LIST_REMHEAD(conn->sent); if (!art) { - warn("peer gave unexpected response when no commands outstanding: %s", - sanitised_response); - goto failed; + connfail(conn, + "peer gave unexpected response when no commands outstanding: %s", + sanitised_response); + return 0; } if (code_indicates_streaming) { assert(!memchr(response, 0, 4)); /* ensured by peer_rd_ok */ if (!conn->stream) { - warn("peer gave streaming response code " - " to IHAVE or subsequent body: %s", sanitised_response); - goto failed; + connfail("peer gave streaming response code " + " to IHAVE or subsequent body: %s", sanitised_response); + return 0; } const char *got_mid= response+4; int got_midlen= strcspn(got_mid, " \n\r"); if (got_midlen<3 || got_mid[0]!='<' || got_mid[got_midlen-1]!='>') { - warn("peer gave streaming response with syntactically invalid" - " messageid: %s", sanitised_response); - goto failed; + connfail("peer gave streaming response with syntactically invalid" + " messageid: %s", sanitised_response); + return 0; } if (got_midlen != art->midlen || memcmp(got_mid, art->messageid, got_midlen)) { - peer("peer gave streaming response code to wrong article -" - " probable synchronisation problem; we offered: %s; peer said: %s", - art->messageid, sanitised_response); - goto failed; + connfail("peer gave streaming response code to wrong article -" + " probable synchronisation problem; we offered: %s;" + " peer said: %s", + art->messageid, sanitised_response); + return 0; } } else { if (conn->stream) { - warn("peer gave non-streaming response code to CHECK/TAKETHIS: %s", - sanitised_response); - goto failed; + connfail("peer gave non-streaming response code to CHECK/TAKETHIS: %s", + sanitised_response); + return 0; } } return art; - - failed: - conn_failed(conn); - return 0; } static void update_nocheck(int accepted) { @@ -751,7 +909,7 @@ static void update_nocheck(int accepted) { static void article_done(Connection *conn, Article *art, int whichcount) { *count++; - counts.articles[art->checked][whichcount]++; + art->ipf->counts.articles[art->checked][whichcount]++; if (whichcount == RC_accepted) update_nocheck(1); else if (whichcount == RC_unwanted) update_nocheck(0); @@ -777,18 +935,28 @@ static void article_done(Connection *conn, Article *art, int whichcount) { ipf->inprogress--; assert(ipf->inprogress >= 0); + if (!ipf->inprogress) + loop->on_time(loop, OOP_TIME_NOW, statemc_check_input_done, ipf); + free(art); } +static void *peer_rd_err(oop_source *lp, oop_read *oread, oop_event ev, + const char *errmsg, int errnoval, + const char *data, size_t recsz, void *conn_v) { + Conn *conn= conn_v; + connfail(conn, "error receiving from peer: %s", errmsg); + return OOP_CONTINUE; +} + static void *peer_rd_ok(oop_source *lp, oop_read *oread, oop_event ev, const char *errmsg, int errnoval, const char *data, size_t recsz, void *conn_v) { Conn *conn= conn_v; if (ev == OOP_RD_EOF) { - warn("unexpected EOF from peer"); - conn_failed(conn); - return; + connfail(conn, "unexpected EOF from peer"); + return OOP_CONTINUE; } assert(ev == OOP_RD_OK); @@ -807,16 +975,14 @@ static void *peer_rd_ok(oop_source *lp, oop_read *oread, oop_event ev, sprintf(q,"\\x%02x",c); q += 4; } - warn("badly formatted response from peer: %s", sanibuf); - conn_failed(conn); - return; + connfail(conn, "badly formatted response from peer: %s", sanibuf); + return OOP_CONTINUE; } if (conn->quitting) { if (code!=205) { - warn("peer gave failure response to QUIT: %s", sani); - conn_failed(conn); - return; + connfail(conn, "peer gave failure response to QUIT: %s", sani); + return OOP_CONTINUE; } conn close ok; return; @@ -833,10 +999,16 @@ static void *peer_rd_ok(oop_source *lp, oop_read *oread, oop_event ev, GET_ARTICLE; \ article_done(conn, art, RC_##how); break; +#define PEERBADMSG(m) connfail(conn, m ": %s", sani); return OOP_CONTINUE + int code_streaming= 0; switch (code) { + case 400: PEERBADMSG("peer stopped accepting articles"); + case 503: PEERBADMSG("peer timed us out"); + default: PEERBADMSG("peer sent unexpected message"); + case 435: ARTICLE_DEALTWITH(0,unwanted); /* IHAVE says they have it */ case 438: ARTICLE_DEALTWITH(1,unwanted); /* CHECK/TAKETHIS: they have it */ @@ -853,8 +1025,8 @@ static void *peer_rd_ok(oop_source *lp, oop_read *oread, oop_event ev, count_checkedwanted++; LIST_ADDTAIL(conn->queue); if (art->checked) { - warn("peer gave %d response to article body",code); - goto failed; + connfail("peer gave %d response to article body: %s",code, sani); + return OOP_CONTINUE; } art->checked= 1; break; @@ -865,86 +1037,61 @@ static void *peer_rd_ok(oop_source *lp, oop_read *oread, oop_event ev, GET_ARTICLE; if (fprintf(defer, "%s %s\n", TokenToText(art->token), art->messageid) <0 || fflush(defer)) - sysdie("write to defer file %s",path_ductdefer); + sysfatal("write to defer file %s",path_ductdefer); article_done(conn, art, RC_deferred); break; - case 400: warn("peer has stopped accepting articles: %s", sani); goto failed; - case 503: warn("peer timed us out: %s", sani); goto failed; - default: warn("peer sent unexpected message: %s", sani); goto failed; - - failed: - conn_failed(conn); - return OOP_CONTINUE;; } check_check_work(conn); return OOP_CONTINUE; } -/*========== monitoring of input file ==========*/ + +/*========== monitoring of input files ==========*/ static void feedfile_eof(InputFile *ipf) { assert(ipf != main_input_file); /* promised by tailing_try_read */ - assert(ipf == old_input_file); - assert(sms == sm_SEPARATED); - sms= sm_FINISHING; - inputfile_tailing_stop(ipf); - inputfile_tailing_start(main_input_file); -} - -static void statmc_finishdone(void) { - time_t now; - struct stat stab; - - assert(sms == sm_FINISHING); - - r= fstat(fileno(defer), &stab); - if (r) sysdie("check defer file %s", path_defer); - - if (fclose(defer)) sysdie("could not close defer file %s", path_defer); - defer= 0; - now= time(0); - if (now==-1) sysdie("could not get current time for backlog filename"); + inputfile_tailing_stop(ipf); - char *backlog= xasprintf("%s_backlog_%lu.%lu", feedfile, - (unsigned long)now, - (unsigned long)stab.st_ino); - if (link(path_defer, path_backlog)) - sysdie("could not install defer file %s as backlog file %s", - path_defer, backlog); - if (unlink(path_defer)) - sysdie("could not unlink old defer link %s to backlog file %s", - path_defer, backlog); - open_defer(); + if (ipf == backlog_input_file) { + assert(ipf->fd >= 0); + if (close(ipf->fd)) sysdie("could not close backlog file %s", ipf->path); + ipf->fd= -1; + return; + } - close_input_file(old_input_file); - old_input_file= 0; + assert(ipf == old_input_file); - if (unlink(path_duct)) - sysdie("could not unlink old duct file %s", path_duct); + inputfile_tailing_stop(ipf); + assert(ipf->fd >= 0); + if (close(ipf->fd)) sysdie("could not close input file %s", ipf->path); + ipf->fd= -1; - sms= sm_NORMAL; + assert(sms==sm_SEPARATED || sms==sm_DROPPING); + + if (main_input_file) + inputfile_tailing_start(main_input_file); } static InputFile *open_input_file(const char *path) { int fd= open(path, O_RDONLY); if (fd<0) { if (errno==ENOENT) return 0; - sysdie("unable to open input file %s", path); + sysfatal("unable to open input file %s", path); } InputFile *ipf= xmalloc(sizeof(InputFile)); memset(ipf,0,sizeof(*ipf)); - + ipf->readable.on_readable= tailing_on_readable; ipf->readable.on_cancel= tailing_on_cancel; ipf->readable.try_read= tailing_try_read; ipf->fd= fd; ipf->path= path; - + return ipf; } @@ -954,10 +1101,15 @@ static void close_input_file(InputFile *ipf) { assert(!ipf->rd); /* must have had inputfile_tailing_stop */ assert(!ipf->inprogress); /* no dangling pointers pointing here */ - if (close(ipf->fd)) sysdie("could not close input file %s", ipf->path); + if (ipf->fd >= 0) + if (close(ipf->fd)) sysdie("could not close input file %s", ipf->path); + + fixme maybe free ipf->path; + free(ipf); } + /*---------- dealing with articles read in the input file ----------*/ typedef void *feedfile_got_article(oop_source *lp, oop_read *rd, @@ -995,6 +1147,9 @@ typedef void *feedfile_got_article(oop_source *lp, oop_read *rd, ipf->offset += recsz + 1; if (sms==sm_NORMAL && ipf->offset >= flush_threshold) { + notice("starting flush (%lu >= %lu)", + (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); /* => Hardlinked */ @@ -1009,7 +1164,8 @@ typedef void *feedfile_got_article(oop_source *lp, oop_read *rd, check_master_queue(); } -/*---------- tailing input file ----------*/ + +/*========== tailing input file ==========*/ static void filemon_start(InputFile *ipf) { assert(!ipf->filemon); @@ -1062,8 +1218,23 @@ static ssize_t tailing_try_read(struct oop_readable *rable, void *buffer, InputFile *ipf= (void*)rable; for (;;) { ssize_t r= read(ipf->fd, buffer, length); - if (!r && ipf==main_input_file) { errno=EAGAIN; return -1; } - if (r==-1 && errno==EINTR) continue; + if (r==-1) { + if (errno==EINTR) continue; + return r; + } + if (!r) { + if (ipf==main_input_file) { + errno=EAGAIN; + return -1; + } else if (ipf==old_input_file) { + assert(ipf->fd>=0); + assert(sms==sm_SEPARATED || sms==sm_DROPPING); + } else if (ipf==backlog_input_file) { + assert(ipf->fd>=0); + } else { + abort(); + } + } return r; } } @@ -1188,11 +1359,12 @@ static void inputfile_tailing_stop(InputFile *ipf) { assert(!ipf->filemon); /* we shouldn't be monitoring it now */ } + /*========== interaction with innd ==========*/ /* See official state diagram at top of file. We implement * this as follows: - * + ================ WAITING [Nothing/Noduct] @@ -1208,7 +1380,7 @@ static void inputfile_tailing_stop(InputFile *ipf) { | ======== (ESRCH) | NORMAL [Dropped] | [Normal] ========= - | read F + | main F tail | ======== | | | | F IS SO BIG WE SHOULD FLUSH @@ -1225,89 +1397,60 @@ static void inputfile_tailing_stop(InputFile *ipf) { | ========== | | FLUSHING | | [Flushing] | - | read D | + | main D tail | | ========== | | | | | | INNDCOMM FLUSH FAILS ^ - | |`----------------------->--------. | - | | | | - | | NO SUCH SITE V | - ^ |`----------------. ========= | - | | | FLUSHFAIL | - | | V [Moved] | - | | ========== read D | - | | DROPPING ========= | - | | [Dropping] | | - | | read D | TIME TO RETRY | - | | ========== `------------------' - | | FLUSH OK | - | | open F | AT EOF OF D AND ALL PROCESSED - | V | install defer as backlog - | =========== | unlink D - | SEPARATED | exit - | [Separated] V - | read D ========== - | =========== (ESRCH) - | | [Droppped] - | | ========== - | V - | | AT EOF OF D - ^ | - | =========== - | FINISHING - | [Finishing] - | read F - | write D - | =========== - | | - | | ALL D PROCESSED - | | install defer as backlog - | | start new defer - ^ V unlink D - | | close D - | | - `----------' - - * + | |`----------------------->----------. | + | | | | + | | NO SUCH SITE V | + ^ |`--------------->----. =========== | + | | \ FLUSHFAIL | + | | \ [Moved] | + | | \ main D tail | + | | \ =========== | + | | \ | | + | | \ | TIME TO RETRY | + | | \ `----------------' + | | FLUSH OK \ + | | open F \ + | V V + | ============= ============ + | SEPARATED/ DROPPING/ + | old->fd>=0 old->fd>=0 + | [Separated] [Dropping] + | main F idle main none + | old D tail old D tail + | ============= ============ + | | | + ^ | EOF ON D | EOF ON D + | V V + | =============== =============== + | SEPARATED/ DROPPING/ + | old->fd==-1 old->fd==-1 + | [Finishing] [Dropping] + | main F tail main none + | old D closed old D closed + | =============== =============== + | | | + | | ALL D PROCESSED | ALL D PROCESSED + | V install defer as backlog V install defer as backlog + ^ | close D | close D + | | unlink D | unlink D + | | start new defer | exit + | | V + `----------' ========== + (ESRCH) + [Droppped] + ========== */ -static char *path_ductlock, *path_duct, *path_ductdefer; - -typedef struct { - /* This is an instance of struct oop_readable */ - struct oop_readable readable; /* first */ - oop_readable_call *readable_callback; - void *readable_callback_user; - - int fd; - const char *path; /* ptr copy of path_ or feedfile */ - struct Filemon_Perfile *filemon; - - oop_read *rd; - long inprogress; /* no. of articles read but not processed */ - off_t offset; -} InputFile; - -typedef enum { - sm_WAITING, - sm_NORMAL, - sm_FLUSHING, - sm_FLUSHFAIL, - sm_DROPPING, - sm_SEPARATED, - sm_FINISHING; -} StateMachineState; - -static InputFile *main_input_file, *old_input_file; -static StateMachineState sms; -static int waiting_periods_sofar; - static void open_defer(void) { struct stat stab; assert(!defer); defer= fopen(path_ductdefer, "a+"); - if (!defer) sysdie("could not open defer file %s", path_ductdefer); + if (!defer) sysfatal("could not open defer file %s", path_ductdefer); /* truncate away any half-written records */ @@ -1343,7 +1486,8 @@ static void open_defer(void) { " shrinking by %ld bytes from %ld to %ld", path_ductdefer, orgsize - truncto, orgsize, truncto); - if (fflush(defer)) sysdie("could not flush defer file %s", path_ductdefer); + if (fflush(defer)) + sysfatal("could not flush defer file %s", path_ductdefer); if (ftruncate(fileno(defer), truncto)) sysdie("could not truncate defer file %s", path_ductdefer); @@ -1383,7 +1527,7 @@ static void statemc_init(void) { open_defer(); int lockfd= open(path_ductlock, O_CREAT|O_RDWR, 0600); - if (lockfd<0) sysdie("open lockfile %s", path_ductlock); + if (lockfd<0) sysfatal("open lockfile %s", path_ductlock); struct flock fl; memset(&fl,0,sizeof(fl)); @@ -1391,8 +1535,10 @@ static void statemc_init(void) { fl.l_whence= SEEK_SET; r= fcntl(lockfd, F_SETLK, &fl); if (r==-1) { - if (errno==EACCES || errno==EAGAIN) - die("another duct holds the lockfile"); + if (errno==EACCES || errno==EAGAIN) { + if (quiet_if_locked) exit(0); + fatal("another duct holds the lockfile"); + } sysdie("fcntl F_SETLK lockfile %s", path_ductlock); } @@ -1424,29 +1570,38 @@ static void statemc_init(void) { spawn_inndcomm_flush(); /* => Flushing, sets sms to sm_FLUSHING */ } else { /* F!=D => Separated */ - sms= sm_SEPARATED; + SMS(SEPARATED, 0, "found both old and current feed files"); startup_set_input_file(file_d); } } else { /*!file_d*/ - sms= sm_WAITING; - statemc_waiting_poll(); + SMS(WAITING, open_wait_periods, "no feed file currently exists"); } } static void statemc_poll(void) { - if (sms == sm_WAITING) statemc_waiting_poll(); - if (sms == sm_FINISHING && !old_input_file->inprogress) statemc_finishdone(); + if (sms==sm_WAITING) { statemc_waiting_poll(); return; } + + if (!sm_period_counter) return; + sm_period_counter--; + assert(sm_period_counter>=0); + + if (sm_period_counter) return; + switch (sms) { + case sm_WAITING: + fatal("timed out waiting for innd to create feed file %s", feedfile); + case sm_FLUSHFAIL: + spawn_inndcomm_flush(void); + break; + default: + abort(); + } } static void statemc_waiting_poll(void) { InputFile *file_f= open_input_file(feedfile); - if (!file_f) { - if (waiting_periods_sofar++ > waiting_timeout_periods) - die("timed out waiting for innd to create feed file %s", feedfile); - return; - } + if (!file_f) return; startup_set_input_file(file_d); - sms= sm_NORMAL; + SMS(NORMAL, 0, "found and opened feed file"); } static void startup_set_input_file(InputFile *f) { @@ -1455,12 +1610,193 @@ static void startup_set_input_file(InputFile *f) { inputfile_tailing_start(f); } +static void *statemc_check_input_done(oop_source *lp, + struct timeval now, void *ipf_v) { + InputFile *ipf= ipf_v; + struct stat stab; + + if (ipf->inprogress) return; /* new article in the meantime */ + if (ipf->fd >= 0); return; /* not had EOF */ + + if (ipf == backlog_input_file) { + notice_processed(ipf,"backlog file",ipf->path); + if (unlink(ipf->path)) + sysdie("could not unlink done backlog file %s", ipf->path); + close_input_file(ipf); + fixme trigger search for new backlog file; + } + + assert(ipf == old_input_file); + assert(sms==sm_SEPARATED || sms==sm_DROPPING); + + notice_processed(ipf,"feed file",0); + + r= fstat(fileno(defer), &stab); + if (r) sysdie("check defer file %s", path_defer); + + if (fclose(defer)) sysfatal("could not close defer file %s", path_defer); + defer= 0; + + char *backlog= xasprintf("%s_backlog_%lu.%lu", feedfile, + (unsigned long)now.tv_sec, + (unsigned long)stab.st_ino); + if (link(path_defer, path_backlog)) + sysfatal("could not install defer file %s as backlog file %s", + path_defer, backlog); + if (unlink(path_defer)) + sysdie("could not unlink old defer link %s to backlog file %s", + path_defer, backlog); + + if (unlink(path_duct)) + sysdie("could not unlink old duct file %s", path_duct); + + if (sms==sm_DROPPING) { + notice("feed dropped and our work is complete" + " (but check for backlog files)"); + exit(0); + } + + open_defer(); + + close_input_file(old_input_file); + old_input_file= 0; + + notice("flush complete"); + SMS(NORMAL, 0, "flush complete"); +} + +static void statemc_setstate(StateMachineState newsms, int periods, + const char *forlog, const char *why) { + sms= newsms; + sm_period_counter= periods; + if (periods) { + info("%s[%d] %s",periods,forlog,why); + } else { + info("%s %s",forlog,why); + } +} + /*========== flushing the feed ==========*/ - +static pid_t inndcomm_child; + +static void *inndcomm_event(oop_source *lp, int fd, oop_event e, void *u) { + assert(inndcomm_child); + int status= xwaitpid(&inndcomm_child, "inndcomm"); + loop->cancel_fd(fd); + close(fd); + + assert(!old_input_file); + + if (WIFEXITED(status)) { + switch (WEXITSTATUS(status)) { + + case INNDCOMMCHILD_ESTATUS_FAIL: + goto failed; + + case INNDCOMMCHILD_ESTATUS_NONESUCH: + warn("feed has been dropped by innd, finishing up"); + old_input_file= main_input_file; + main_input_file= 0; + SMS(DROPPING, 0, "dropped by innd"); + return OOP_CONTINUE; + + case 0: + old_input_file= main_input_file; + main_input_file= open_input_file(feedfile); + if (!main_input_file) + die("flush succeeded but feedfile %s does not exist!", feedfile); + SMS(SEPARATED, 0, "feed file missing"); + return OOP_CONTINUE; + + default: + goto unexpected_exitstatus; + + } + } else if (WIFSIGNALED(status) && WTERMSIG(status) == SIGALRM) { + warn("flush timed out trying to talk to innd"); + goto failed; + } else { + unexpected_exitstatus: + report_child_status("inndcomm child", status); + } + + failed: + SMS(FLUSHFAIL, flushfail_retry_periods, "flush failed, will retry"); +} + +static void inndcommfail(const char *what) { + syswarn("error communicating with innd: %s failed: %s", what, ICCfailure); + exit(INNDCOMMCHILD_ESTATUS_FAIL); +} + +void spawn_inndcomm_flush(void) { + int pipefds[2]; + + assert(sms==sm_NORMAL || sms==sm_FLUSHFAIL); + assert(!inndcomm_child); + + if (pipe(pipefds)) sysdie("create pipe for inndcomm child sentinel"); + + inndcomm_child= xfork(); + + if (!inndcomm_child) { + static char flushargv[2]= { sitename, 0 }; + char *reply; + + close(pipefds[0]); + + alarm(inndcomm_flush_timeout); + r= ICCopen(); if (r) inndcommfail("connect"); + r= ICCcommand('f',flushargv,&reply); if (r<0) inndcommfail("transmit"); + if (!r) exit(0); /* yay! */ + + if (!strcmp(reply, "1 No such site")) exit(INNDCOMMCHILD_ESTATUS_NONESUCH); + syswarn("innd ctlinnd flush failed: innd said %s", reply); + exit(INNDCOMMCHILD_ESTATUS_FAIL); + } + + close(pipefds[1]); + int sentinel_fd= pipefds[0]; + on_fd_read_except(sentinel_fd, inndcomm_event); + + SMS(FLUSHING, 0, "flush is in progress"); +} /*========== main program ==========*/ +static void postfork_inputfile(InputFile *ipf) { + if (!ipf) return; + assert(ipf->fd >= 0); + close(ipf->fd); + ipf->fd= -1; +} + +static void postfork_conns(Connection *conn) { + while (conn) { + close(conn->fd); + conn= conn->next; + } +} + +static void postfork_stdio(FILE *f) { + /* we have no stdio streams that are buffered long-term */ + if (f) fclose(f); +} + +static void postfork(const char *what) { + if (signal(SIGPIPE, SIG_DFL) == SIG_ERR) + sysdie("%s child: failed to reset SIGPIPE"); + + postfork_inputfile(main_input_file); + postfork_inputfile(old_input_file); + postfork_conns(idle.head); + postfork_conns(working.head); + postfork_conns(full.head); + postfork_stdio(defer); +} + + #define EVERY(what, interval, body) \ static const struct timeval what##_timeout = { 5, 0 }; \ static void what##_schedule(void); \ @@ -1480,9 +1816,216 @@ EVERY(period, {PERIOD_SECONDS,0}, { check_master_queue(); }); -main { - ignore sigpipe; - if (!filemon_init()) + +/*========== option parsing ==========*/ + +enum OptFlags { + of_seconds= 001000u; + of_boolean= 002000u; +}; + +typedef struct Option Option; +typedef void OptionParser(const Option*, const char *val); + +struct Option { + int short; + const char *long; + void *store; + OptionParser *fn; + int noarg; +}; + +void op_integer(const Option *o, const char *val) { + char *ep; + errno= 0; + unsigned long ul= strtoul(val,&ep,10); + if (*ep || ep==val || errno || ul>INT_MAX) + badusage("bad integer value for %s",o->long); + int *store= o->store; + *store= ul; +} + +void op_double(const Option *o, const char *val) { + int *store= o->store; + char *ep; + errno= 0; + *store= strtod(val, &ep); + if (*ep || ep==val || errno) + badusage("bad floating point value for %s",o->long); +} + +void op_string(const Option *o, const char *val) { + char **store= o->store; + free(*store); + *store= val; +} + +void op_seconds(const Option *o, const char *val) { + int *store= o->store; + char *ep; + + double v= strtod(val,&ep); + if (ep==val) badusage("bad time/duration value for %s",o->long); + + if (!*ep || !strcmp(ep,"s")) unit= 1; + else if (!strcmp(ep,"m")) unit= 60; + else if (!strcmp(ep,"h")) unit= 3600; + else if (!strcmp(ep,"d")) unit= 86400; + else badusage("bad units %s for time/duration value for %s",ep,o->long); + + v *= unit; + v= ceil(v); + if (v > INT_MAX) badusage("time/duration value for %s out of range",o->long); + *store= v; +} + +void op_periods_rndup(const Option *o, const char *val) { + int *store= o->store; + op_seconds(o,val); + *store += PERIOD_SECONDS-1; + *store /= PERIOD_SECONDS; +} + +void op_periods_booltrue(const Option *o, const char *val) { + int *store= o->store; + *store= 1; +} +void op_periods_boolfalse(const Option *o, const char *val) { + int *store= o->store; + *store= 0; +} + +static const Option options[]= { +{ 0, "max-connections", &max_connections op_integer }, +{ 0, "streaming", &try_stream, op_booltrue, 1 }, +{ 0, "no-streaming", &try_stream, op_boolfalse, 1 }, +{'h',"host", &remote_host, op_string }, +{'P',"port", &port op_integer }, +{ 0, "inndconf", &inndconffile, op_string }, +{'f',"feedfile", &feedfile, op_string }, +{'q',"quiet-multiple", &quiet_if_locked, op_booltrue, 1 }, +{ 0, "no-quiet-multiple", &quiet_if_locked, op_boolfalse, 1 }, +{'d',"daemon", &become_daemon, op_booltrue, 1 }, +{ 0, "no-daemon", &become_daemon, op_boolfalse, 1 }, + +{ 0, "no-check-proportion", &nocheck_thresh_pct, op_double }, +{ 0, "no-check-filter", &nocheck_decay_articles, op_double }, + +{ 0, "max-queue-size", &max_queue_per_conn op_integer }, +{ 0, "reconnect-interval", &reconnect_delay_periods, op_periods_rndup }, +{ 0, "flush-retry-interval", &flushfail_retry_periods, op_periods_rndup }, +{ 0, "feedfile-open-timeout", &open_wait_periods, op_periods_rndup }, +{ 0, "connection-timeout", &connection_timeout, op_seconds }, +{ 0, "inndcomm-timeout", &inndcomm_flush_timeout, op_seconds }, +}; + +int main(int argc, char **argv) { + const char *arg; + + for (;;) { + arg= *++argv; + if (!arg) break; + if (*arg != '-') break; + if (!strcmp(arg,"--")) { arg= *++argv; break; } + int a; + while ((a= *++arg)) { + const Option *o; + if (a=='-') { + arg++; + char *equals= strchr(arg,'='); + int len= equals ? (equals - arg) : strlen(arg); + for (o=options; o->long; o++) + if (strlen(o->long) == len && !memcmp(o->long,arg,len)) + goto found_long; + badusage("unknown long option --%s",arg); + found_long: + if (o->noarg) { + if (equals) badusage("option --%s does not take a value",o->long); + arg= 0; + } else if (equals) { + arg= equals+1; + } else { + arg= *++argv; + if (!arg) badusage("option --%s needs a value",o->long); + } + o->fn(o, arg); + break; /* eaten the whole argument now */ + } + for (o=options; o->long; o++) + if (a == o->short) + goto found_short; + badusage("unknown short option -%c",a); + found_short: + if (o->noarg) { + o->fn(o,0); + } else { + if (!*++arg) { + arg= *++argv; + if (!arg) badusage("option -%c needs a value",o->short); + } + o->fn(o,arg); + break; /* eaten the whole argument now */ + } + } + } + + if (!arg) badusage("need site name argument"); + if (*++argv) badusage("too many non-option arguments"); + sitename= arg; + + if (nocheck_thresh_pct < 0 || nocheck_thresh_pct > 100) + badusage("nocheck threshold percentage must be between 0..100"); + nocheck_thresh= nocheck_thresh_pct * 0.01; + + if (nocheck_decay_articles < 0.1) + badusage("nocheck decay articles must be at least 0.1"); + nocheck_decay= 1 - 1/nocheck_decay_articles; + + innconf_read(inndconffile); + + if (!feedfile) + feedfile= xasprintf("%s/%s",pathoutgoing,sitename); + else if (!feedfile[0]) + badusage("feed filename must be nonempty"); + else if (feedfile[strlen(feedfile)-1]=='/') + feedfile= xasprintf("%s%s",feedfile,sitename); + + if (signal(SIGPIPE, SIG_IGN) == SIG_ERR) + sysdie("could not ignore SIGPIPE"); + + if (become_daemon) { + for (i=3; i<255; i++) + /* do this now before we open syslog, etc. */ + close(i); + openlog("innduct",LOG_NDELAY|LOG_PID,LOG_NEWS); + + int null= open("/dev/null",O_RDWR); + if (null<0) sysdie("failed to open /dev/null"); + dup2(null,0); + dup2(null,1); + dup2(null,2); + close(null); + + pid_t child1= xfork("daemonise first fork"); + if (child1) _exit(0); + + pid_t sid= setsid(); + if (sid != child1) sysdie("setsid failed"); + + pid_t child2= xfork("daemonise second fork"); + if (child2) _exit(0); + } + + notice("starting"); + + if (!filemon_init()) { + warn("no file monitoring available, polling"); filepoll_schedule(); + } + period_schedule(); -}; + + statemc_init(); + + loop->execute. +}