fix death lock when use directive "zone" in upstream block

zjd87 · zhangjinde · commit 2b4776ac3f9c · 2021-10-14T18:16:44.000+08:00
diff --git a/src/http/modules/ngx_http_upstream_hash_module.c b/src/http/modules/ngx_http_upstream_hash_module.c
@@ -246,6 +246,7 @@ ngx_http_upstream_get_hash_peer(ngx_peer_connection_t *pc, void *data)
             "get hash peer, check_index: %ui",
              peer->check_index);
         if (ngx_http_upstream_check_peer_down(peer->check_index)) {
+            ngx_http_upstream_rr_peer_unlock(hp->rrp.peers, peer);
             goto next;
         }
 #endif
diff --git a/src/http/modules/ngx_http_upstream_ip_hash_module.c b/src/http/modules/ngx_http_upstream_ip_hash_module.c
@@ -217,6 +217,7 @@ ngx_http_upstream_get_ip_hash_peer(ngx_peer_connection_t *pc, void *data)
                        peer->check_index);
 
         if (ngx_http_upstream_check_peer_down(peer->check_index)) {
+            ngx_http_upstream_rr_peer_unlock(iphp->rrp.peers, peer);
             goto next;
         }
 #endif

Original file line number	Diff line number	Diff line change
`@@ -246,6 +246,7 @@ ngx_http_upstream_get_hash_peer(ngx_peer_connection_t pc, void data)`
`246`	`246`	`"get hash peer, check_index: %ui",`
`247`	`247`	`peer->check_index);`
`248`	`248`	`if (ngx_http_upstream_check_peer_down(peer->check_index)) {`
	`249`	`+ ngx_http_upstream_rr_peer_unlock(hp->rrp.peers, peer);`
`249`	`250`	`goto next;`
`250`	`251`	`}`
`251`	`252`	`#endif`
Original file line number	Diff line number	Diff line change
`@@ -217,6 +217,7 @@ ngx_http_upstream_get_ip_hash_peer(ngx_peer_connection_t pc, void data)`
`217`	`217`	`peer->check_index);`
`218`	`218`
`219`	`219`	`if (ngx_http_upstream_check_peer_down(peer->check_index)) {`
	`220`	`+ ngx_http_upstream_rr_peer_unlock(iphp->rrp.peers, peer);`
`220`	`221`	`goto next;`
`221`	`222`	`}`
`222`	`223`	`#endif`