Skip to content

Optimizing the use of orLabelSelectors to get resources #7256

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

Open
learner0810 wants to merge 1 commit into
base: main
Choose a base branch
from
+6 −14
Open

Optimizing the use of orLabelSelectors to get resources #7256

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
20 changes: 6 additions & 14 deletions pkg/backup/item_collector.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -316,34 +316,26 @@ func (r *itemCollector) getResourceItems(log logrus.FieldLogger, gv schema.Group
for _, s := range r.backupRequest.Spec.OrLabelSelectors {
orLabelSelectors = append(orLabelSelectors, metav1.FormatLabelSelector(s))
}
} else {
orLabelSelectors = []string{}
}

log.Info("Listing items")
unstructuredItems := make([]unstructured.Unstructured, 0)

// Listing items for orLabelSelectors
errListingForNS := false
for _, label := range orLabelSelectors {
unstructuredItems, err = r.listItemsForLabel(unstructuredItems, gr, label, resourceClient)
if err != nil {
errListingForNS = true
log.WithError(err).Error("Error listing items")
break
}
}

if errListingForNS {
Copy link
Contributor

@blackpiglet blackpiglet Jan 4, 2024

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Although, after modification, there should be no unstructed object found when listing with or label selector, it's better to have an early return.

log.WithError(err).Error("Error listing items")
continue
}

var labelSelector string
if selector := r.backupRequest.Spec.LabelSelector; selector != nil {
labelSelector = metav1.FormatLabelSelector(selector)
}

// Listing items for labelSelector (singular)
if len(orLabelSelectors) == 0 {
var labelSelector string
if selector := r.backupRequest.Spec.LabelSelector; selector != nil {
labelSelector = metav1.FormatLabelSelector(selector)
}
unstructuredItems, err = r.listItemsForLabel(unstructuredItems, gr, labelSelector, resourceClient)
if err != nil {
log.WithError(err).Error("Error listing items")
Expand Down