Skip to content

Commit

Permalink
Add RefreshPerNSWorkerManager and RemoveOverride for tests (#3837)
Browse files Browse the repository at this point in the history
  • Loading branch information
dnr authored Jan 26, 2023
1 parent 5338f96 commit b494736
Show file tree
Hide file tree
Showing 3 changed files with 20 additions and 5 deletions.
14 changes: 9 additions & 5 deletions service/worker/pernamespaceworker.go
Original file line number Diff line number Diff line change
Expand Up @@ -207,13 +207,17 @@ func (wm *perNamespaceWorkerManager) namespaceCallback(ns *namespace.Namespace,
go wm.getWorkerByNamespace(ns).refreshWithNewNamespace(ns, deleted)
}

func (wm *perNamespaceWorkerManager) refreshAll() {
wm.lock.Lock()
defer wm.lock.Unlock()
for _, worker := range wm.workers {
go worker.refreshWithExistingNamespace()
}
}

func (wm *perNamespaceWorkerManager) membershipChangedListener() {
for range wm.membershipChangedCh {
wm.lock.Lock()
for _, worker := range wm.workers {
go worker.refreshWithExistingNamespace()
}
wm.lock.Unlock()
wm.refreshAll()
}
}

Expand Down
5 changes: 5 additions & 0 deletions service/worker/service.go
Original file line number Diff line number Diff line change
Expand Up @@ -565,3 +565,8 @@ func (s *Service) ensureSystemNamespaceExists(
)
}
}

// This is intended for use by integration tests only.
func (s *Service) RefreshPerNSWorkerManager() {
s.perNamespaceWorkerManager.refreshAll()
}
6 changes: 6 additions & 0 deletions tests/dynamicconfig.go
Original file line number Diff line number Diff line change
Expand Up @@ -81,6 +81,12 @@ func (d *dcClient) OverrideValue(name dynamicconfig.Key, value any) {
d.overrides[name] = value
}

func (d *dcClient) RemoveOverride(name dynamicconfig.Key) {
d.Lock()
defer d.Unlock()
delete(d.overrides, name)
}

// newTestDCClient - returns a dynamic config client for integration testing
func newTestDCClient(fallback dynamicconfig.Client) *dcClient {
return &dcClient{
Expand Down

0 comments on commit b494736

Please sign in to comment.