upstream: put timed out busy connection on destroy queue

edsiper · edsiper · commit 1938ec845255 · 2021-03-23T11:04:56.000-06:00
Signed-off-by: Eduardo Silva &lt;edsiper@gmail.com&gt;
diff --git a/src/flb_upstream.c b/src/flb_upstream.c
@@ -649,7 +649,7 @@ int flb_upstream_conn_timeouts(struct mk_list *list)
         }
 
         /* Iterate every busy connection */
-        mk_list_foreach(u_head, &uq->busy_queue) {
+        mk_list_foreach_safe(u_head, tmp, &uq->busy_queue) {
             u_conn = mk_list_entry(u_head, struct flb_upstream_conn, _head);
 
             drop = FLB_FALSE;
@@ -674,6 +674,7 @@ int flb_upstream_conn_timeouts(struct mk_list *list)
                  */
                 shutdown(u_conn->fd, SHUT_RDWR);
                 u_conn->net_error = ETIMEDOUT;
+                prepare_destroy_conn(u_conn);
             }
         }
 

Original file line number	Diff line number	Diff line change
`@@ -649,7 +649,7 @@ int flb_upstream_conn_timeouts(struct mk_list *list)`
`649`	`649`	`}`
`650`	`650`
`651`	`651`	`/* Iterate every busy connection */`
`652`		`- mk_list_foreach(u_head, &uq->busy_queue) {`
	`652`	`+ mk_list_foreach_safe(u_head, tmp, &uq->busy_queue) {`
`653`	`653`	`u_conn = mk_list_entry(u_head, struct flb_upstream_conn, _head);`
`654`	`654`
`655`	`655`	`drop = FLB_FALSE;`
`@@ -674,6 +674,7 @@ int flb_upstream_conn_timeouts(struct mk_list *list)`
`674`	`674`	`*/`
`675`	`675`	`shutdown(u_conn->fd, SHUT_RDWR);`
`676`	`676`	`u_conn->net_error = ETIMEDOUT;`
	`677`	`+ prepare_destroy_conn(u_conn);`
`677`	`678`	`}`
`678`	`679`	`}`
`679`	`680`