Skip to content

Commit b494736

Browse files
authored
Add RefreshPerNSWorkerManager and RemoveOverride for tests (#3837)
1 parent 5338f96 commit b494736

File tree

3 files changed

+20
-5
lines changed

3 files changed

+20
-5
lines changed

service/worker/pernamespaceworker.go

+9-5
Original file line numberDiff line numberDiff line change
@@ -207,13 +207,17 @@ func (wm *perNamespaceWorkerManager) namespaceCallback(ns *namespace.Namespace,
207207
go wm.getWorkerByNamespace(ns).refreshWithNewNamespace(ns, deleted)
208208
}
209209

210+
func (wm *perNamespaceWorkerManager) refreshAll() {
211+
wm.lock.Lock()
212+
defer wm.lock.Unlock()
213+
for _, worker := range wm.workers {
214+
go worker.refreshWithExistingNamespace()
215+
}
216+
}
217+
210218
func (wm *perNamespaceWorkerManager) membershipChangedListener() {
211219
for range wm.membershipChangedCh {
212-
wm.lock.Lock()
213-
for _, worker := range wm.workers {
214-
go worker.refreshWithExistingNamespace()
215-
}
216-
wm.lock.Unlock()
220+
wm.refreshAll()
217221
}
218222
}
219223

service/worker/service.go

+5
Original file line numberDiff line numberDiff line change
@@ -565,3 +565,8 @@ func (s *Service) ensureSystemNamespaceExists(
565565
)
566566
}
567567
}
568+
569+
// This is intended for use by integration tests only.
570+
func (s *Service) RefreshPerNSWorkerManager() {
571+
s.perNamespaceWorkerManager.refreshAll()
572+
}

tests/dynamicconfig.go

+6
Original file line numberDiff line numberDiff line change
@@ -81,6 +81,12 @@ func (d *dcClient) OverrideValue(name dynamicconfig.Key, value any) {
8181
d.overrides[name] = value
8282
}
8383

84+
func (d *dcClient) RemoveOverride(name dynamicconfig.Key) {
85+
d.Lock()
86+
defer d.Unlock()
87+
delete(d.overrides, name)
88+
}
89+
8490
// newTestDCClient - returns a dynamic config client for integration testing
8591
func newTestDCClient(fallback dynamicconfig.Client) *dcClient {
8692
return &dcClient{

0 commit comments

Comments
 (0)