Silly logic bug in idle/no_rr mode checking

gnosek · gnosek · commit dc897c042014 · 2008-10-12T17:51:16.000+02:00
Yay for De Morgan's laws.
diff --git a/ngx_http_upstream_fair_module.c b/ngx_http_upstream_fair_module.c
@@ -762,7 +762,7 @@ ngx_http_upstream_choose_fair_peer_idle(ngx_peer_connection_t *pc,
         }
 
         /* not in WM_IDLE+no_rr mode: the first completely idle backend gets chosen */
-        if (weight_mode != WM_IDLE && !fp->peers->no_rr) {
+        if (weight_mode != WM_IDLE || !fp->peers->no_rr) {
             best_idx = n;
             break;
         }

Original file line number	Diff line number	Diff line change
`@@ -762,7 +762,7 @@ ngx_http_upstream_choose_fair_peer_idle(ngx_peer_connection_t *pc,`
`762`	`762`	`}`
`763`	`763`
`764`	`764`	`/* not in WM_IDLE+no_rr mode: the first completely idle backend gets chosen */`
`765`		`- if (weight_mode != WM_IDLE && !fp->peers->no_rr) {`
	`765`	`+ if (weight_mode != WM_IDLE \|\| !fp->peers->no_rr) {`
`766`	`766`	`best_idx = n;`
`767`	`767`	`break;`
`768`	`768`	`}`