fix buggy pager func #4306
Merged
fix buggy pager func #4306
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
alaypatel07
force-pushed
the
fix-paging
branch
from
fdad931
to
a225d1b
Compare
|
fixes #4244 |
alaypatel07
force-pushed
the
fix-paging
branch
7 times, most recently
from
692a043
to
1131aca
Compare
ywk253100
reviewed
Nov 5, 2021
| err = meta.EachListItem(list, func(object runtime.Object) error { | ||
| u, ok := object.(*unstructured.Unstructured) | ||
| if !ok { | ||
| log.WithError(errors.WithStack(fmt.Errorf("expected *unstructured.Unstructured but got %T", u))).Error("unable to understand entry in the list") |
There was a problem hiding this comment.
Should we return from here directly if the object isn't Unstructured rather than putting it into the item list?
There was a problem hiding this comment.
+1 yes. Missed returning the error here, good catch
There was a problem hiding this comment.
@alaypatel07 Could you make an update for this? This is the only comment from my side
fix paging items in to use list options passed by the paging function The client-go pager sets the Limit options for the list call to paginate the request[1]. This PR fixes the paging function to use the options passed by the pager instead of shadowed options This is required for the pagination to work correctly. - simplify the pager list implementation by using pager.List() The List() function already implements a lot of the logic that was needed for paging here, using it simplifies the code. 1. https://github.com/kubernetes/kubernetes/blob/3f40906dd8a54fb91650553a6457496181f591bc/staging/src/k8s.io/client-go/tools/pager/pager.go#L219 Signed-off-by: Alay Patel <alay1431@gmail.com>
Signed-off-by: Alay Patel <alay1431@gmail.com>
alaypatel07
force-pushed
the
fix-paging
branch
from
1131aca
to
569fc1d
Compare
sseago
approved these changes
Nov 9, 2021
ywk253100
approved these changes
Nov 9, 2021
|
@alaypatel07 Could you open another PR to cherry-pick the fix into branch release-1.7? |
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.
fix paging items in to use list options passed by the paging function
The client-go pager sets the Limit options for the list call
to paginate the request[1]. This PR fixes the paging function
to use the options passed by the pager instead of shadowed options
This is required for the pagination to work correctly.
The List() function already implements a lot of the logic that was
needed for paging here, using it simplifies the code.
Signed-off-by: Alay Patel alay1431@gmail.com
Thank you for contributing to Velero!
Please add a summary of your change
Does your change fix a particular issue?
Fixes #(issue)
Please indicate you've done the following:
/kind changelog-not-required.site/content/docs/main.