enable readiness reflector for Standalone NEG #927
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
k8s-ci-robot
added
cncf-cla: yes
freehan
force-pushed
the
standalone-neg-ga
branch
from
7e9871a to
5ae14c2
Compare
bowei
reviewed
Nov 12, 2019
pkg/neg/controller.go
Outdated
| @@ -416,7 +416,7 @@ func (c *Controller) mergeStandaloneNEGsPortInfo(service *apiv1.Service, name ty | |||
| return err | |||
| } | |||
|
|
|||
| if err := portInfoMap.Merge(negtypes.NewPortInfoMap(name.Namespace, name.Name, exposedNegSvcPort, c.namer, false)); err != nil { | |||
| if err := portInfoMap.Merge(negtypes.NewPortInfoMap(name.Namespace, name.Name, exposedNegSvcPort, c.namer, true)); err != nil { | |||
pkg/neg/readiness/poller.go
Outdated
| syncPod(key, negName string) error | ||
| // neg is the key of the NEG resource | ||
| // backendService is the key of the BackendService resource. | ||
| syncPod(key string, neg, backendService *meta.Key) error |
There was a problem hiding this comment.
// syncPod syncs the NEG readiness gate of the given pod.
key => podKey
pkg/neg/readiness/poller.go
Outdated
| } | ||
|
|
||
| // processHealthStatus processes the health status response from NEG API. | ||
| // It processed health status for each endpoint and signal patcher correspondingly in the following conditions: |
There was a problem hiding this comment.
// processHealthStatus updates Pod readiness gates in response to a health status update.
//
// We update the pod (using the patcher) when:
// 1. ...
pkg/neg/readiness/poller.go
Outdated
| // It returns true if retry is needed. | ||
| func (p *poller) processHealthStatus(key negMeta, healthStatuses []*composite.NetworkEndpointWithHealthStatus) (bool, error) { | ||
| var retry bool | ||
| errList := []error{} |
pkg/neg/readiness/poller.go
Outdated
| // 2. if the NEG is not associated with any health checks | ||
| // It returns true if retry is needed. | ||
| func (p *poller) processHealthStatus(key negMeta, healthStatuses []*composite.NetworkEndpointWithHealthStatus) (bool, error) { | ||
| var retry bool |
There was a problem hiding this comment.
these var decls are kind of random, prefer putting locking at the top and grouping everything
p.lock.Lock()
defer p.lock.Unlock()
var (
retry bool
errList []error
patchCount int
unhealthyPods []types.NamespacedName
// healthChecked indicates ...
healthChecked bool
)
pkg/neg/readiness/poller.go
Outdated
| for _, hs := range healthStatus.Healths { | ||
| if hs == nil { | ||
| continue | ||
| } | ||
| if hs.BackendService == nil { | ||
| klog.Warningf("Backend service is nil in health status of network endpoint %v: %v", ne, hs) | ||
| klog.Warningf("Backend service is nil in health status of network endpoint %v", healthStatus) |
|
|
||
| // getHealthyBackendService returns one of the backend service key where the endpoint is considered healthy. | ||
| func getHealthyBackendService(healthStatus *composite.NetworkEndpointWithHealthStatus) *meta.Key { | ||
| for _, hs := range healthStatus.Healths { | ||
| if hs == nil { |
There was a problem hiding this comment.
this should be an Error log.
Also, kind of strange to have to check for nils everywhere
| if hs.HealthState == healthyState { | ||
| id, err := cloud.ParseResourceURL(hs.BackendService.BackendService) | ||
| if err != nil { | ||
| klog.Errorf("Failed to parse backend service reference from a Network Endpoint health status %v: %v", healthStatus, err) |
pkg/neg/readiness/poller.go
Outdated
|
|
||
| // getHealthyBackendService returns one of the backend service key where the endpoint is considered healthy. |
There was a problem hiding this comment.
// ... returns the first healthy backend service key
pkg/neg/readiness/poller.go
Outdated
|
|
||
| // hasHealthStatus returns true if there is at least 1 health status associated with the endpoint. | ||
| func hasHealthStatus(healthStatus *composite.NetworkEndpointWithHealthStatus) bool { | ||
| if healthStatus != nil && len(healthStatus.Healths) > 0 { |
There was a problem hiding this comment.
return healthStatus != nil && len(...)
freehan
force-pushed
the
standalone-neg-ga
branch
3 times, most recently
from
8fb6d48 to
cd2dce2
Compare
|
Fixed the comments |
freehan
force-pushed
the
standalone-neg-ga
branch
from
cd2dce2 to
5603304
Compare
|
/lgtm |
k8s-ci-robot
added
the
lgtm
bowei
reviewed
Nov 14, 2019
| @@ -416,7 +416,7 @@ func (c *Controller) mergeStandaloneNEGsPortInfo(service *apiv1.Service, name ty | |||
| return err | |||
| } | |||
|
|
|||
| if err := portInfoMap.Merge(negtypes.NewPortInfoMap(name.Namespace, name.Name, exposedNegSvcPort, c.namer, false)); err != nil { | |||
| if err := portInfoMap.Merge(negtypes.NewPortInfoMap(name.Namespace, name.Name, exposedNegSvcPort, c.namer /*readinessGate*/, true)); err != nil { | |||
There was a problem hiding this comment.
you have this on the wrong parameter.
|
[APPROVALNOTIFIER] This PR is APPROVED This pull-request has been approved by: bowei, freehan The full list of commands accepted by this bot can be found here. The pull request process is described here
Needs approval from an approver in each of these files:
Approvers can indicate their approval by writing |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Enable Pod Readiness Gate for Standalone NEG