Merge pull request #746 from jcmoraisjr/jm-fix-dns-ep

Fix incorrect reload if endpoint list grows
jcmoraisjr · Mar 8, 2021 · 7241e17 · 7241e17
2 parents 1fa4c33 + 0d1878a
commit 7241e17
Show file tree

Hide file tree

Showing 2 changed files with 27 additions and 0 deletions.
diff --git a/pkg/haproxy/dynupdate.go b/pkg/haproxy/dynupdate.go
@@ -151,6 +151,13 @@ func (d *dynUpdater) checkBackendPair(pair *backendPair) bool {
 
 	// Resolver == update via DNS discovery
 	if curBack.Resolver != "" {
+		if updated {
+			// DNS based updates finishes prematurelly. Ensure the ep
+			// list size of the new one is at least as big as the old one.
+			for i := len(curBack.Endpoints); i < len(oldBack.Endpoints); i++ {
+				curBack.AddEmptyEndpoint()
+			}
+		}
 		return updated
 	}
 

diff --git a/pkg/haproxy/dynupdate_test.go b/pkg/haproxy/dynupdate_test.go
@@ -749,6 +749,26 @@ set server default_app_8080/srv001 state ready
 set server default_app_8080/srv001 weight 1`,
 			logging: `INFO-V(2) updated endpoint '172.17.0.3:8080' weight '1' state 'ready' on backend/server 'default_app_8080/srv001'`,
 		},
+		// 27
+		{
+			doconfig1: func(c *testConfig) {
+				b := c.config.Backends().AcquireBackend("default", "app", "8080")
+				b.Resolver = "k8s"
+				b.AcquireEndpoint("172.17.0.2", 8080, "")
+				b.AddEmptyEndpoint()
+			},
+			doconfig2: func(c *testConfig) {
+				b := c.config.Backends().AcquireBackend("default", "app", "8080")
+				b.Resolver = "k8s"
+				b.Dynamic.DynUpdate = true
+				b.AcquireEndpoint("172.17.0.3", 8080, "")
+			},
+			expected: []string{
+				"srv001:172.17.0.3:8080:1",
+				"srv002:127.0.0.1:1023:1",
+			},
+			dynamic: true,
+		},
 	}
 	for i, test := range testCases {
 		c := setup(t)