Skip to content

fix(NSC): add mutex to protect nodeport healthcheck maps from data race #2021

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
Aprazor wants to merge 1 commit into from
+5 −0
Closed

fix(NSC): add mutex to protect nodeport healthcheck maps from data race #2021

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 5 additions & 0 deletions pkg/controllers/proxy/nodeport_healthcheck.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,7 @@ type serviceHealthCheck struct {
}

type nphcServicesInfo struct {
mu sync.RWMutex
serviceInfoMap serviceInfoMap
endpointsInfoMap endpointSliceInfoMap
}
Expand All @@ -36,8 +37,10 @@ type nphcHandler struct {
func (nphc *nodePortHealthCheckController) UpdateServicesInfo(serviceInfoMap serviceInfoMap,
endpointsInfoMap endpointSliceInfoMap) error {
klog.V(1).Info("Running UpdateServicesInfo for NodePort health check")
nphc.mu.Lock()
nphc.serviceInfoMap = serviceInfoMap
nphc.endpointsInfoMap = endpointsInfoMap
nphc.mu.Unlock()

newActiveServices := make(map[int]bool)

Expand Down Expand Up @@ -141,7 +144,9 @@ func (nphc *nodePortHealthCheckController) stopHealthCheck(nodePort int) error {
}

func (npHandler *nphcHandler) Handler(w http.ResponseWriter, r *http.Request) {
npHandler.nphc.mu.RLock()
eps := npHandler.nphc.endpointsInfoMap[npHandler.svcHC.serviceID]
npHandler.nphc.mu.RUnlock()
endpointsOnNode := hasActiveEndpoints(eps)

var numActiveEndpoints int8
Expand Down