From: oetiker Date: Mon, 5 Mar 2012 16:49:01 +0000 (+0000) Subject: fix flush race in rrdcached -- Christian Hitz X-Git-Url: https://git.verplant.org/?a=commitdiff_plain;h=b63a6268ac7c3668f6731c0a0972e4575c3f6dcf;p=rrdtool.git fix flush race in rrdcached -- Christian Hitz git-svn-id: svn://svn.oetiker.ch/rrdtool/trunk/program@2282 a5681a0c-68f1-0310-ab6d-d61299d08faa --- diff --git a/src/rrd_daemon.c b/src/rrd_daemon.c index 340ea15..2c81424 100644 --- a/src/rrd_daemon.c +++ b/src/rrd_daemon.c @@ -295,7 +295,9 @@ static int handle_request_help (HANDLER_PROTO); static void sig_common (const char *sig) /* {{{ */ { RRDD_LOG(LOG_NOTICE, "caught SIG%s", sig); - state = FLUSHING; + if (state == RUNNING) { + state = FLUSHING; + } pthread_cond_broadcast(&flush_cond); pthread_cond_broadcast(&queue_cond); } /* }}} void sig_common */