]> git.ipfire.org Git - thirdparty/haproxy.git/commitdiff
BUG/MINOR: spoe: Don't systematically wakeup SPOE stream in the applet handler
authorChristopher Faulet <cfaulet@haproxy.com>
Tue, 23 Apr 2019 13:39:32 +0000 (15:39 +0200)
committerChristopher Faulet <cfaulet@haproxy.com>
Tue, 23 Apr 2019 19:20:47 +0000 (21:20 +0200)
This can lead to wakeups in loop between the SPOE stream and the SPOE applets
waiting to receive agent messages (mainly AGENT-HELLO and AGENT-DISCONNECT).

This patch must be backported to 1.9 and 1.8.

src/flt_spoe.c

index 0f72de8cdedb80afc61ee4f31e17f38d1cfbf8db..63d40a6fd7cdeba4111345b3f2b9de30b3581782 100644 (file)
@@ -1943,8 +1943,6 @@ spoe_handle_appctx(struct appctx *appctx)
 
        if (SPOE_APPCTX(appctx)->task->expire != TICK_ETERNITY)
                task_queue(SPOE_APPCTX(appctx)->task);
-       si_oc(si)->flags |= CF_READ_DONTWAIT;
-       task_wakeup(si_strm(si)->task, TASK_WOKEN_IO);
 }
 
 struct applet spoe_applet = {