squashme: Review items

varnishcache · Feb 26, 2024 · 07b07aa · 07b07aa
1 parent 7a44ba5
commit 07b07aa
Showing 1 changed file with 7 additions and 8 deletions.
diff --git a/bin/varnishd/cache/cache_backend.c b/bin/varnishd/cache/cache_backend.c
@@ -134,7 +134,7 @@ VBE_Connect_Error(struct VSC_vbe *vsc, int err)
 /*--------------------------------------------------------------------*/
 
 static void
-vbe_connwait_signal_locked(struct backend *bp)
+vbe_connwait_signal_locked(const struct backend *bp)
 {
 	struct connwait *cw;
 
@@ -205,10 +205,10 @@ vbe_dir_getfd(VRT_CTX, struct worker *wrk, VCL_BACKEND dir, struct backend *bp,
 	INIT_OBJ(cw, CONNWAIT_MAGIC);
 	PTOK(pthread_cond_init(&cw->cw_cond, NULL));
 	Lck_Lock(bp->director->mtx);
+	FIND_BE_PARAM(backend_wait_limit, wait_limit, bp);
+	FIND_BE_PARAM(backend_wait_timeout, wait_tmod, bp);
 	cw->cw_state = CW_DO_CONNECT;
 	if (!VTAILQ_EMPTY(&bp->cw_head) || BE_BUSY(bp)) {
-		FIND_BE_PARAM(backend_wait_limit, wait_limit, bp);
-		FIND_BE_PARAM(backend_wait_timeout, wait_tmod, bp);
 		cw->cw_state = CW_BE_BUSY;
 	}
 
@@ -219,12 +219,10 @@ vbe_dir_getfd(VRT_CTX, struct worker *wrk, VCL_BACKEND dir, struct backend *bp,
 		VSC_C_main->backend_wait++;
 		cw->cw_state = CW_QUEUED;
 		wait_end = VTIM_real() + wait_tmod;
-		do {
-			err = Lck_CondWaitUntil(&cw->cw_cond, bp->director->mtx,
-			    wait_end);
-		} while (err == EINTR);
+		err = Lck_CondWaitUntil(&cw->cw_cond, bp->director->mtx,
+		    wait_end);
 		bp->cw_count--;
-		if (err != 0) {
+		if (err != 0 && BE_BUSY(bp)) {
 			VTAILQ_REMOVE(&bp->cw_head, cw, cw_list);
 			VSC_C_main->backend_wait_fail++;
 			cw->cw_state = CW_BE_BUSY;
@@ -310,6 +308,7 @@ vbe_dir_getfd(VRT_CTX, struct worker *wrk, VCL_BACKEND dir, struct backend *bp,
 		bp->n_conn--;
 		bp->vsc->conn--;
 		bp->vsc->req--;
+		vbe_connwait_signal_locked(bp);
 		Lck_Unlock(bp->director->mtx);
 		vbe_connwait_fini(cw);
 		return (NULL);