Skip to content

Commit f8c1a95

Browse files
k8s-ci-robotk8s-ci-robot
authored
Merge pull request #603 from jkh52/simplify-default-route
Trim duplicate code (related to default route backend storage).
2 parents cdb0b59 + 7442126 commit f8c1a95

File tree

2 files changed

+1
-57
lines changed

2 files changed

+1
-57
lines changed

‎pkg/server/backend_manager.go

Lines changed: 1 addition & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -248,9 +248,7 @@ type DefaultBackendStorage struct {
248248
// randomly pick a key from a map (in this case, the backends) in
249249
// Golang.
250250
agentIDs []string
251-
// defaultRouteAgentIDs tracks the agents that have claimed the default route.
252-
defaultRouteAgentIDs []string
253-
random *rand.Rand
251+
random *rand.Rand
254252
// idTypes contains the valid identifier types for this
255253
// DefaultBackendStorage. The DefaultBackendStorage may only tolerate certain
256254
// types of identifiers when associating to a specific BackendManager,
@@ -305,9 +303,6 @@ func (s *DefaultBackendStorage) addBackend(identifier string, idType header.Iden
305303
s.backends[identifier] = []Backend{backend}
306304
metrics.Metrics.SetBackendCount(len(s.backends))
307305
s.agentIDs = append(s.agentIDs, identifier)
308-
if idType == header.DefaultRoute {
309-
s.defaultRouteAgentIDs = append(s.defaultRouteAgentIDs, identifier)
310-
}
311306
}
312307

313308
// removeBackend removes a backend.
@@ -343,14 +338,6 @@ func (s *DefaultBackendStorage) removeBackend(identifier string, idType header.I
343338
break
344339
}
345340
}
346-
if idType == header.DefaultRoute {
347-
for i := range s.defaultRouteAgentIDs {
348-
if s.defaultRouteAgentIDs[i] == identifier {
349-
s.defaultRouteAgentIDs = append(s.defaultRouteAgentIDs[:i], s.defaultRouteAgentIDs[i+1:]...)
350-
break
351-
}
352-
}
353-
}
354341
}
355342
if !found {
356343
klog.V(1).InfoS("Could not find connection matching identifier to remove", "agentID", identifier, "idType", idType)

‎pkg/server/backend_manager_test.go

Lines changed: 0 additions & 43 deletions
Original file line numberDiff line numberDiff line change
@@ -121,16 +121,12 @@ func TestDefaultBackendManager_AddRemoveBackends(t *testing.T) {
121121
p.RemoveBackend(backend1)
122122
expectedBackends := make(map[string][]Backend)
123123
expectedAgentIDs := []string{}
124-
expectedDefaultRouteAgentIDs := []string(nil)
125124
if e, a := expectedBackends, p.backends; !reflect.DeepEqual(e, a) {
126125
t.Errorf("expected %v, got %v", e, a)
127126
}
128127
if e, a := expectedAgentIDs, p.agentIDs; !reflect.DeepEqual(e, a) {
129128
t.Errorf("expected %v, got %v", e, a)
130129
}
131-
if e, a := expectedDefaultRouteAgentIDs, p.defaultRouteAgentIDs; !reflect.DeepEqual(e, a) {
132-
t.Errorf("expected %v, got %v", e, a)
133-
}
134130

135131
p = NewDefaultBackendManager()
136132
p.AddBackend(backend1)
@@ -148,16 +144,12 @@ func TestDefaultBackendManager_AddRemoveBackends(t *testing.T) {
148144
"agent3": {backend3},
149145
}
150146
expectedAgentIDs = []string{"agent1", "agent3"}
151-
expectedDefaultRouteAgentIDs = []string(nil)
152147
if e, a := expectedBackends, p.backends; !reflect.DeepEqual(e, a) {
153148
t.Errorf("expected %v, got %v", e, a)
154149
}
155150
if e, a := expectedAgentIDs, p.agentIDs; !reflect.DeepEqual(e, a) {
156151
t.Errorf("expected %v, got %v", e, a)
157152
}
158-
if e, a := expectedDefaultRouteAgentIDs, p.defaultRouteAgentIDs; !reflect.DeepEqual(e, a) {
159-
t.Errorf("expected %v, got %v", e, a)
160-
}
161153
}
162154

163155
func TestDefaultRouteBackendManager_AddRemoveBackends(t *testing.T) {
@@ -176,16 +168,12 @@ func TestDefaultRouteBackendManager_AddRemoveBackends(t *testing.T) {
176168
p.RemoveBackend(backend1)
177169
expectedBackends := make(map[string][]Backend)
178170
expectedAgentIDs := []string{}
179-
expectedDefaultRouteAgentIDs := []string{}
180171
if e, a := expectedBackends, p.backends; !reflect.DeepEqual(e, a) {
181172
t.Errorf("expected %v, got %v", e, a)
182173
}
183174
if e, a := expectedAgentIDs, p.agentIDs; !reflect.DeepEqual(e, a) {
184175
t.Errorf("expected %v, got %v", e, a)
185176
}
186-
if e, a := expectedDefaultRouteAgentIDs, p.defaultRouteAgentIDs; !reflect.DeepEqual(e, a) {
187-
t.Errorf("expected %v, got %v", e, a)
188-
}
189177

190178
p = NewDefaultRouteBackendManager()
191179
p.AddBackend(backend1)
@@ -204,17 +192,13 @@ func TestDefaultRouteBackendManager_AddRemoveBackends(t *testing.T) {
204192
"agent3": {backend3},
205193
}
206194
expectedAgentIDs = []string{"agent1", "agent3"}
207-
expectedDefaultRouteAgentIDs = []string{"agent1", "agent3"}
208195

209196
if e, a := expectedBackends, p.backends; !reflect.DeepEqual(e, a) {
210197
t.Errorf("expected %v, got %v", e, a)
211198
}
212199
if e, a := expectedAgentIDs, p.agentIDs; !reflect.DeepEqual(e, a) {
213200
t.Errorf("expected %v, got %v", e, a)
214201
}
215-
if e, a := expectedDefaultRouteAgentIDs, p.defaultRouteAgentIDs; !reflect.DeepEqual(e, a) {
216-
t.Errorf("expected %v, got %v", e, a)
217-
}
218202
}
219203

220204
func TestDestHostBackendManager_AddRemoveBackends(t *testing.T) {
@@ -233,16 +217,12 @@ func TestDestHostBackendManager_AddRemoveBackends(t *testing.T) {
233217
p.RemoveBackend(backend1)
234218
expectedBackends := make(map[string][]Backend)
235219
expectedAgentIDs := []string{}
236-
expectedDefaultRouteAgentIDs := []string(nil)
237220
if e, a := expectedBackends, p.backends; !reflect.DeepEqual(e, a) {
238221
t.Errorf("expected %v, got %v", e, a)
239222
}
240223
if e, a := expectedAgentIDs, p.agentIDs; !reflect.DeepEqual(e, a) {
241224
t.Errorf("expected %v, got %v", e, a)
242225
}
243-
if e, a := expectedDefaultRouteAgentIDs, p.defaultRouteAgentIDs; !reflect.DeepEqual(e, a) {
244-
t.Errorf("expected %v, got %v", e, a)
245-
}
246226

247227
p = NewDestHostBackendManager()
248228
p.AddBackend(backend1)
@@ -266,9 +246,6 @@ func TestDestHostBackendManager_AddRemoveBackends(t *testing.T) {
266246
if e, a := expectedAgentIDs, p.agentIDs; !reflect.DeepEqual(e, a) {
267247
t.Errorf("expected %v, got %v", e, a)
268248
}
269-
if e, a := expectedDefaultRouteAgentIDs, p.defaultRouteAgentIDs; !reflect.DeepEqual(e, a) {
270-
t.Errorf("expected %v, got %v", e, a)
271-
}
272249

273250
p.AddBackend(backend2)
274251
p.AddBackend(backend3)
@@ -291,17 +268,13 @@ func TestDestHostBackendManager_AddRemoveBackends(t *testing.T) {
291268
"::",
292269
"node2.mydomain.com",
293270
}
294-
expectedDefaultRouteAgentIDs = []string(nil)
295271

296272
if e, a := expectedBackends, p.backends; !reflect.DeepEqual(e, a) {
297273
t.Errorf("expected %v, got %v", e, a)
298274
}
299275
if e, a := expectedAgentIDs, p.agentIDs; !reflect.DeepEqual(e, a) {
300276
t.Errorf("expected %v, got %v", e, a)
301277
}
302-
if e, a := expectedDefaultRouteAgentIDs, p.defaultRouteAgentIDs; !reflect.DeepEqual(e, a) {
303-
t.Errorf("expected %v, got %v", e, a)
304-
}
305278

306279
p.RemoveBackend(backend2)
307280
p.RemoveBackend(backend1)
@@ -323,9 +296,6 @@ func TestDestHostBackendManager_AddRemoveBackends(t *testing.T) {
323296
if e, a := expectedAgentIDs, p.agentIDs; !reflect.DeepEqual(e, a) {
324297
t.Errorf("expected %v, got %v", e, a)
325298
}
326-
if e, a := expectedDefaultRouteAgentIDs, p.defaultRouteAgentIDs; !reflect.DeepEqual(e, a) {
327-
t.Errorf("expected %v, got %v", e, a)
328-
}
329299

330300
p.RemoveBackend(backend3)
331301
expectedBackends = map[string][]Backend{}
@@ -337,9 +307,6 @@ func TestDestHostBackendManager_AddRemoveBackends(t *testing.T) {
337307
if e, a := expectedAgentIDs, p.agentIDs; !reflect.DeepEqual(e, a) {
338308
t.Errorf("expected %v, got %v", e, a)
339309
}
340-
if e, a := expectedDefaultRouteAgentIDs, p.defaultRouteAgentIDs; !reflect.DeepEqual(e, a) {
341-
t.Errorf("expected %v, got %v", e, a)
342-
}
343310
}
344311

345312
func TestDestHostBackendManager_WithDuplicateIdents(t *testing.T) {
@@ -374,17 +341,13 @@ func TestDestHostBackendManager_WithDuplicateIdents(t *testing.T) {
374341
"::",
375342
"node2.mydomain.com",
376343
}
377-
expectedDefaultRouteAgentIDs := []string(nil)
378344

379345
if e, a := expectedBackends, p.backends; !reflect.DeepEqual(e, a) {
380346
t.Errorf("expected %v, got %v", e, a)
381347
}
382348
if e, a := expectedAgentIDs, p.agentIDs; !reflect.DeepEqual(e, a) {
383349
t.Errorf("expected %v, got %v", e, a)
384350
}
385-
if e, a := expectedDefaultRouteAgentIDs, p.defaultRouteAgentIDs; !reflect.DeepEqual(e, a) {
386-
t.Errorf("expected %v, got %v", e, a)
387-
}
388351

389352
p.RemoveBackend(backend1)
390353
p.RemoveBackend(backend3)
@@ -408,9 +371,6 @@ func TestDestHostBackendManager_WithDuplicateIdents(t *testing.T) {
408371
if e, a := expectedAgentIDs, p.agentIDs; !reflect.DeepEqual(e, a) {
409372
t.Errorf("expected %v, got %v", e, a)
410373
}
411-
if e, a := expectedDefaultRouteAgentIDs, p.defaultRouteAgentIDs; !reflect.DeepEqual(e, a) {
412-
t.Errorf("expected %v, got %v", e, a)
413-
}
414374

415375
p.RemoveBackend(backend2)
416376
expectedBackends = map[string][]Backend{}
@@ -422,7 +382,4 @@ func TestDestHostBackendManager_WithDuplicateIdents(t *testing.T) {
422382
if e, a := expectedAgentIDs, p.agentIDs; !reflect.DeepEqual(e, a) {
423383
t.Errorf("expected %v, got %v", e, a)
424384
}
425-
if e, a := expectedDefaultRouteAgentIDs, p.defaultRouteAgentIDs; !reflect.DeepEqual(e, a) {
426-
t.Errorf("expected %v, got %v", e, a)
427-
}
428385
}

0 commit comments

Comments
 (0)