You can not select more than 25 topics Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.

29 lines
1.1 KiB

  1. commit 1526ce4e6f5fb241ca236bd2ac870cdb30e054fd
  2. Author: Christopher Faulet <cfaulet@haproxy.com>
  3. Date: Tue Apr 23 15:39:32 2019 +0200
  4. BUG/MINOR: spoe: Don't systematically wakeup SPOE stream in the applet handler
  5. This can lead to wakeups in loop between the SPOE stream and the SPOE applets
  6. waiting to receive agent messages (mainly AGENT-HELLO and AGENT-DISCONNECT).
  7. This patch must be backported to 1.9 and 1.8.
  8. (cherry picked from commit 371723b0c2a2e38ae14e1e6f6a7581ef3e2491cf)
  9. Signed-off-by: Christopher Faulet <cfaulet@haproxy.com>
  10. (cherry picked from commit fe0ccea6bb93406ca0a7339cdf17357b1a283e59)
  11. Signed-off-by: Christopher Faulet <cfaulet@haproxy.com>
  12. diff --git a/src/flt_spoe.c b/src/flt_spoe.c
  13. index 95f30898..f6109778 100644
  14. --- a/src/flt_spoe.c
  15. +++ b/src/flt_spoe.c
  16. @@ -1929,8 +1929,6 @@ spoe_handle_appctx(struct appctx *appctx)
  17. if (SPOE_APPCTX(appctx)->task->expire != TICK_ETERNITY)
  18. task_queue(SPOE_APPCTX(appctx)->task);
  19. - si_oc(si)->flags |= CF_READ_DONTWAIT;
  20. - task_wakeup(si_strm(si)->task, TASK_WOKEN_IO);
  21. }
  22. struct applet spoe_applet = {