improve discoveryHelper.Refresh() in restore #7069
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
Signed-off-by: lou <alex1988@outlook.com>
github-actions
bot
requested review from
qiuming-best and
shubham-pampattiwar
Codecov ReportAttention:
Additional details and impacted files@@ Coverage Diff @@
## main #7069 +/- ##
==========================================
+ Coverage 61.02% 61.67% +0.65%
==========================================
Files 255 258 +3
Lines 27040 27659 +619
==========================================
+ Hits 16500 17058 +558
- Misses 9361 9405 +44
- Partials 1179 1196 +17 ☔ View full report in Codecov by Sentry. |
Signed-off-by: lou <alex1988@outlook.com>
ywk253100
reviewed
Nov 13, 2023
pkg/restore/restore.go
Outdated
| // discovery because the restored CRDs may have created new APIs that | ||
| // didn't previously exist in the cluster, and we want to be able to | ||
| // resolve & restore instances of them in subsequent loop iterations. | ||
| if createdItems > 0 { |
There was a problem hiding this comment.
How about refreshing the discovery helper no matter whether new items are created or not? This is much easier.
There was a problem hiding this comment.
yes, it is easier, but if no crds are created, refresh is meaningless, and it takes time (~9s in my env)
ywk253100
reviewed
Nov 23, 2023
pkg/restore/restore.go
Outdated
| @@ -502,7 +502,7 @@ func (ctx *restoreContext) execute() (results.Result, results.Result) { | |||
| }() | |||
|
|
|||
| // totalItems: previously discovered items, i: iteration counter. | |||
| totalItems, processedItems, existingNamespaces := 0, 0, sets.NewString() | |||
| totalItems, processedItems, createdItems, existingNamespaces := 0, 0, 0, sets.NewString() | |||
There was a problem hiding this comment.
Please double-check whether this covers CRD updating case
There was a problem hiding this comment.
Let's put the returning items into a structure
Signed-off-by: lou <alex1988@outlook.com>
ywk253100
approved these changes
Nov 27, 2023
qiuming-best
approved these changes
Nov 27, 2023
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.
Please add a summary of your change
discoveryHelper.Refresh()was called after every crd restore, this logic has two issues:In my env, a refresh takes 9s, and I have many crds, which causing the restore extremely slow
This pr improve it by calling refresh after all crds are restored and at least one crd are created during restore
Does your change fix a particular issue?
Fixes #(issue)
Please indicate you've done the following:
/kind changelog-not-requiredas a comment on this pull request.site/content/docs/main.