Skip to content
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

Jump to bottom

Avoid volume copy in checkAttachableInlineVolume #117488

Merged
merged 1 commit into from Apr 24, 2023
Merged

Avoid volume copy in checkAttachableInlineVolume #117488

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.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
14 changes: 7 additions & 7 deletions pkg/scheduler/framework/plugins/nodevolumelimits/csi.go
View file
Open in desktop
Expand Up @@ -172,7 +172,7 @@ func (pl *CSILimits) filterAttachableVolumes(
// - If the volume is migratable and CSI migration is enabled, need to count it
// as well.
// - If the volume is not migratable, it will be count in non_csi filter.
if err := pl.checkAttachableInlineVolume(vol, csiNode, pod, result); err != nil {
if err := pl.checkAttachableInlineVolume(&vol, csiNode, pod, result); err != nil {
return err
}

Expand Down Expand Up @@ -220,15 +220,15 @@ func (pl *CSILimits) filterAttachableVolumes(

// checkAttachableInlineVolume takes an inline volume and add to the result map if the
// volume is migratable and CSI migration for this plugin has been enabled.
func (pl *CSILimits) checkAttachableInlineVolume(vol v1.Volume, csiNode *storagev1.CSINode,
func (pl *CSILimits) checkAttachableInlineVolume(vol *v1.Volume, csiNode *storagev1.CSINode,
pod *v1.Pod, result map[string]string) error {
if !pl.translator.IsInlineMigratable(&vol) {
if !pl.translator.IsInlineMigratable(vol) {
return nil
}
// Check if the intree provisioner CSI migration has been enabled.
inTreeProvisionerName, err := pl.translator.GetInTreePluginNameFromSpec(nil, &vol)
inTreeProvisionerName, err := pl.translator.GetInTreePluginNameFromSpec(nil, vol)
if err != nil {
return fmt.Errorf("looking up provisioner name for volume %v: %w", vol, err)
return fmt.Errorf("looking up provisioner name for volume %s: %w", vol.Name, err)
}
if !isCSIMigrationOn(csiNode, inTreeProvisionerName) {
csiNodeName := ""
Expand All @@ -240,9 +240,9 @@ func (pl *CSILimits) checkAttachableInlineVolume(vol v1.Volume, csiNode *storage
return nil
}
// Do translation for the in-tree volume.
translatedPV, err := pl.translator.TranslateInTreeInlineVolumeToCSI(&vol, pod.Namespace)
translatedPV, err := pl.translator.TranslateInTreeInlineVolumeToCSI(vol, pod.Namespace)
if err != nil || translatedPV == nil {
return fmt.Errorf("converting volume(%v) from inline to csi: %w", vol, err)
return fmt.Errorf("converting volume(%s) from inline to csi: %w", vol.Name, err)
}
driverName, err := pl.translator.GetCSINameFromInTreeName(inTreeProvisionerName)
if err != nil {
Expand Down