From 99b8f44486b766f220a33906d84ac05af942f260 Mon Sep 17 00:00:00 2001
From: Dimitri Masson <30894448+d-masson@users.noreply.github.com>
Date: Mon, 16 Nov 2020 20:47:15 +0100
Subject: reverse_proxy: Fix random_choose selection policy (#3811)

---
 modules/caddyhttp/reverseproxy/selectionpolicies.go | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

(limited to 'modules/caddyhttp/reverseproxy/selectionpolicies.go')

diff --git a/modules/caddyhttp/reverseproxy/selectionpolicies.go b/modules/caddyhttp/reverseproxy/selectionpolicies.go
index 343140f..2aef63d 100644
--- a/modules/caddyhttp/reverseproxy/selectionpolicies.go
+++ b/modules/caddyhttp/reverseproxy/selectionpolicies.go
@@ -397,13 +397,18 @@ func leastRequests(upstreams []*Upstream) *Upstream {
 		return nil
 	}
 	var best []*Upstream
-	var bestReqs int
+	var bestReqs int = -1
 	for _, upstream := range upstreams {
+		if upstream == nil {
+			continue
+		}
 		reqs := upstream.NumRequests()
 		if reqs == 0 {
 			return upstream
 		}
-		if reqs <= bestReqs {
+		// If bestReqs was just initialized to -1
+		// we need to append upstream also
+		if reqs <= bestReqs || bestReqs == -1 {
 			bestReqs = reqs
 			best = append(best, upstream)
 		}
-- 
cgit v1.2.3