-
Notifications
You must be signed in to change notification settings - Fork 306
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.
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
Refactor error state checking #1983
Conversation
Hi @sawsa307. Thanks for your PR. I'm waiting for a kubernetes member to verify that this patch is reasonable to test. If it is, they should reply with Once the patch is verified, the new status will be reflected by the I understand the commands that are listed here. Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes/test-infra repository. |
bc44e2b
to
58fdf6f
Compare
/assign @swetharepakula |
/cc @mmamczur |
@sawsa307: GitHub didn't allow me to request PR reviews from the following users: mmamczur. Note that only kubernetes members and repo collaborators can review this PR, and authors cannot review their own PRs. In response to this:
Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes/test-infra repository. |
/assign @mmamczur |
@sawsa307: GitHub didn't allow me to assign the following users: mmamczur. Note that only kubernetes members with read permissions, repo collaborators and people who have commented on this issue/PR can be assigned. Additionally, issues/PRs can only have 10 assignees at the same time. In response to this:
Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes/test-infra repository. |
7ba9c00
to
8aa3a49
Compare
cc @mmamczur |
@@ -259,16 +261,15 @@ func (s *transactionSyncer) syncInternalImpl() error { | |||
} | |||
endpointsData := negtypes.EndpointsDataFromEndpointSlices(endpointSlices) | |||
targetMap, endpointPodMap, dupCount, err = s.endpointsCalculator.CalculateEndpoints(endpointsData, currentMap) | |||
if valid, reason := s.isValidEPField(err); !valid { |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
thanks for getting rid of this part as well, it looked super confusing with this isValidEPField potentially ignoring errors
LGTM, probably best choice that you move this validation to the calculator |
pkg/neg/syncers/transaction.go
Outdated
// isValidEPField returns false and the corresponding reason if there is endpoint with missing zone or nodeName | ||
func (s *transactionSyncer) isValidEPField(err error) (bool, string) { | ||
// getErrorStateReason returns the reason of the error state based returned error | ||
func (s *transactionSyncer) getErrorStateReason(err error) string { | ||
if errors.Is(err, negtypes.ErrEPMissingNodeName) { |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Create a map in the sync_result.go that match errors to reasons.
96a715b
to
4193ef8
Compare
pkg/neg/types/sync_results.go
Outdated
@@ -50,6 +50,17 @@ var ( | |||
ResultOtherError = "OtherError" | |||
ResultInProgress = "InProgress" | |||
ResultSuccess = "Success" | |||
|
|||
ErrorStateReason = map[error]string{ |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
add a comment as to why we need this.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Added. Thanks!
pkg/neg/types/sync_results.go
Outdated
@@ -50,6 +50,17 @@ var ( | |||
ResultOtherError = "OtherError" |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
all the results should be constants.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Updated. Thanks!
Create function ValidateEndpoints, so it would correctly validate endpoints for L4 and L7 endpoint calculators. Validation for L4 endpoints is currently a noop.
4193ef8
to
915788c
Compare
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
/lgtm
/approve
[APPROVALNOTIFIER] This PR is APPROVED This pull-request has been approved by: sawsa307, swetharepakula 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 |
/ok-to-test |
Create function ValidateEndpoints and move endpoint validation logics into EndpointCalculator. Now it would correctly validate endpoints for L4 and L7 endpoint calculators. Validation for L4 endpoints is currently a no-op.