* with GPLv3. If not then please let me know. -Ian Jackson.)
*/
+/*
+ * todo
+ *
+ * don't mind reconnecting if we just disconnected due to idle
+ * some weird disconnection event still investigating
+ */
+
/*
* Newsfeeds file entries should look like this:
* host.name.of.site[/exclude,exclude,...]\
static int spontaneous_flush_periods=100000;
static int max_separated_periods=2000;
static int need_activity_periods=1000;
+static int recentact_thresh=3;
+static int recentact_periods=1000;
static double max_bad_data_ratio= 1; /* conv'd from percentage by main */
static int max_bad_data_initial= 30;
static char *path_lock, *path_flushing, *path_defer, *path_dump;
static char *globpat_backlog;
static pid_t self_pid;
+static int *recentact_perperiod;
+static int recentact_circptr;
+static int recentact_total;
/* statemc_init initialises */
static StateMachineState sms;
/*========== management of connections ==========*/
+static void reconnect_blocking_event(void) {
+ until_connect= reconnect_delay_periods;
+}
+
static void conn_closefd(Conn *conn, const char *msgprefix) {
int r= close_perhaps(&conn->fd);
if (r) info("C%d %serror closing socket: %s",
conn->fd, msgprefix, strerror(errno));
}
+static int conn_busy(Conn *conn) {
+ return
+ conn->waiting.count ||
+ conn->priority.count ||
+ conn->sent.count ||
+ conn->xmitu;
+}
+
static void conn_dispose(Conn *conn) {
if (!conn) return;
if (conn->rd) {
}
conn_closefd(conn,"");
free(conn);
- until_connect= reconnect_delay_periods;
}
static void *conn_exception(oop_source *lp, int fd,
for (i=0, d=conn->xmitd; i<conn->xmitu; i++, d++)
xmit_free(d);
+ LIST_REMOVE(conns,conn);
+
char *m= xvasprintf(fmt,al);
- warn("C%d connection failed requeueing " RCI_TRIPLE_FMT_BASE ": %s",
- conn->fd, RCI_TRIPLE_VALS_BASE(requeue, /*nothing*/), m);
+ warn("C%d (now %d) connection failed requeueing " RCI_TRIPLE_FMT_BASE ": %s",
+ conn->fd, conns.count, RCI_TRIPLE_VALS_BASE(requeue, /*nothing*/), m);
free(m);
- LIST_REMOVE(conns,conn);
+ reconnect_blocking_event();
conn_dispose(conn);
check_assign_articles();
}
va_end(al);
}
+static void conn_idle_close(Conn *conn, const char *why) {
+ static const char quitcmd[]= "QUIT\r\n";
+ int todo= sizeof(quitcmd)-1;
+ const char *p= quitcmd;
+ for (;;) {
+ int r= write(conn->fd, p, todo);
+ if (r<0) {
+ if (isewouldblock(errno))
+ connfail(conn, "blocked writing QUIT to idle connection");
+ else
+ connfail(conn, "failed to write QUIT to idle connection: %s",
+ strerror(errno));
+ break;
+ }
+ assert(r<=todo);
+ todo -= r;
+ if (!todo) {
+ conn->quitting= 1;
+ conn->since_activity= 0;
+ debug("C%d is idle (%s), quitting", conn->fd, why);
+ break;
+ }
+ }
+}
+
+/*
+ * For our last connection, we also shut it down if we have had
+ * less than K in the last L
+ */
static void check_idle_conns(void) {
Conn *conn;
+
+ int veryrecentact= recentact_perperiod[recentact_circptr];
+ recentact_circptr++;
+ recentact_circptr %= recentact_periods;
+ recentact_total -= recentact_perperiod[recentact_circptr];
+ recentact_perperiod[recentact_circptr]= 0;
+
FOR_CONN(conn)
conn->since_activity++;
+
search_again:
FOR_CONN(conn) {
if (conn->since_activity <= need_activity_periods) continue;
else if (conn->xmitu)
connfail(conn,"peer has been sending responses"
" before receiving our commands!");
- else {
- static const char quitcmd[]= "QUIT\r\n";
- int todo= sizeof(quitcmd)-1;
- const char *p= quitcmd;
- for (;;) {
- int r= write(conn->fd, p, todo);
- if (r<0) {
- if (isewouldblock(errno))
- connfail(conn, "blocked writing QUIT to idle connection");
- else
- connfail(conn, "failed to write QUIT to idle connection: %s",
- strerror(errno));
- break;
- }
- assert(r<=todo);
- todo -= r;
- if (!todo) {
- conn->quitting= 1;
- conn->since_activity= 0;
- debug("C%d is idle, quitting", conn->fd);
- break;
- }
- }
- }
+ else
+ conn_idle_close(conn, "no activity");
+
goto search_again;
}
+
+ conn= LIST_HEAD(conns);
+ if (!veryrecentact &&
+ conns.count==1 &&
+ recentact_total+veryrecentact < recentact_thresh &&
+ !conn_busy(conn))
+ conn_idle_close(conn, "low volume");
}
/*---------- making new connections ----------*/
static int connecting_fdpass_sock;
static void connect_attempt_discard(void) {
+ reconnect_blocking_event();
if (connecting_child) {
int status= xwaitpid(&connecting_child, "connect");
if (!(WIFEXITED(status) ||
&peer_rd_err, conn);
if (r) sysdie("oop_rd_read for peer (fd=%d)",conn->fd);
- notice("C%d connected %s", conn->fd, conn->stream ? "streaming" : "plain");
LIST_ADDHEAD(conns, conn);
+ notice("C%d (now %d) connected %s",
+ conn->fd, conns.count, conn->stream ? "streaming" : "plain");
connect_attempt_discard();
check_assign_articles();
assert(!connecting_fdpass_sock);
info("starting connection attempt");
+ reconnect_blocking_event();
int socks[2];
int r= socketpair(AF_UNIX, SOCK_STREAM, 0, socks);
Article *art= dequeue(0);
if (!art) break;
LIST_ADDTAIL(use->waiting, art);
+ recentact_perperiod[recentact_circptr]++;
spare--;
}
conn_maybe_write(use);
} else if (allow_connect_start()) {
- until_connect= reconnect_delay_periods;
connect_start();
break;
} else {
assert(rs > 0);
int done;
- for (done=0; rs && done<conn->xmitu; done++) {
+ for (done=0; rs; ) {
+ assert(done<conn->xmitu);
struct iovec *vp= &conn->xmit[done];
XmitDetails *dp= &conn->xmitd[done];
- if (rs > vp->iov_len) {
+ if (rs >= vp->iov_len) {
rs -= vp->iov_len;
- xmit_free(dp);
+ xmit_free(dp); /* vp->iov_len -= vp->iov_len, etc. */
+ done++;
} else {
vp->iov_base= (char*)vp->iov_base + rs;
vp->iov_len -= rs;
+ break; /* rs -= rs */
}
}
int newu= conn->xmitu - done;
return OOP_CONTINUE;
}
- int conn_busy=
- conn->waiting.count ||
- conn->priority.count ||
- conn->sent.count ||
- conn->xmitu;
+ int busy= conn_busy(conn);
if (conn->quitting) {
- if (code!=205 && code!=503) {
+ if (code!=205 && code!=400) {
connfail(conn, "peer gave unexpected response to QUIT: %s", sani);
} else {
- notice("C%d idle connection closed by us", conn->fd);
- assert(!conn_busy);
LIST_REMOVE(conns,conn);
+ notice("C%d (now %d) idle connection closed by us",
+ conn->fd, conns.count);
+ assert(!busy);
conn_dispose(conn);
}
return OOP_CONTINUE;
default: PEERBADMSG("peer sent unexpected message");
case 400:
- if (conn_busy)
+ if (busy)
PEERBADMSG("peer timed us out or stopped accepting articles");
- notice("C%d idle connection closed by peer", conn->fd);
LIST_REMOVE(conns,conn);
+ notice("C%d (now %d) idle connection closed by peer",
+ conns.count, conn->fd);
conn_dispose(conn);
return OOP_CONTINUE;
" to site %s in newsfeeds)", feedfile, sitename);
if (flushing_input_file) {
- SMS(SEPARATED, max_separated_periods, "recovery flush complete");
+ SMS(SEPARATED, max_separated_periods, "flush complete");
} else {
close_defer();
- SMS(NORMAL, spontaneous_flush_periods, "flush complete");
+ SMS(NORMAL, spontaneous_flush_periods, "recovery flush complete");
}
return OOP_CONTINUE;
{0,"max-flush-interval", "PERIOD", &spontaneous_flush_periods,op_seconds },
{0,"flush-finish-timeout", "PERIOD", &max_separated_periods, op_seconds },
{0,"idle-timeout", "PERIOD", &need_activity_periods, op_seconds },
+{0,"low-volume-thresh", "PERIOD", &recentact_thresh, op_integer },
+{0,"low-volume-window", "PERIOD", &recentact_periods, op_seconds },
{0,"max-bad-input-data-ratio","PERCENT", &max_bad_data_ratio, op_double },
{0,"max-bad-input-data-init", "PERCENT", &max_bad_data_initial, op_integer },
convert_to_periods_rndup(&spontaneous_flush_periods);
convert_to_periods_rndup(&max_separated_periods);
convert_to_periods_rndup(&need_activity_periods);
+ convert_to_periods_rndup(&recentact_periods);
if (max_bad_data_ratio < 0 || max_bad_data_ratio > 100)
badusage("bad input data ratio must be between 0..100");
if (strchr(feedfile, c))
badusage("feed filename may not contain metacharacter %c",c);
+ int i;
+ recentact_perperiod= xcalloc(sizeof(*recentact_perperiod),recentact_periods);
+ for (i=0; i<recentact_periods; i++) {
+ recentact_perperiod[i]= recentact_thresh;
+ recentact_total += recentact_thresh;
+ }
+
/* set things up */
path_lock= xasprintf("%s_lock", feedfile);
~ian / inn-innduct.git / blobdiff