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

Fix volume not expanded when using authorization's volumePrefix #412

Merged
merged 4 commits into from
Jan 14, 2025
Merged

Fix volume not expanded when using authorization's volumePrefix #412

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
2aae202
Fix volume not expanded when using authorization's volumePrefix
AkshaySainiDell Jan 13, 2025
761e9c0
add log print statements
shaynafinocchiaro Jan 14, 2025
111a455
account for tenant vol prefix in volName
shaynafinocchiaro Jan 14, 2025
ad1d49a
Merge branch 'main' into bugfix-1663-node-expand-volume
shaynafinocchiaro Jan 14, 2025
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
23 changes: 19 additions & 4 deletions service/node.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2660,10 +2660,25 @@ func (s *service) NodeExpandVolume(

// Get the pmax volume name so that it can be searched in the system
// to find mount information
replace := CSIPrefix + "-" + s.getClusterPrefix() + "-"
volName := strings.Replace(vol.VolumeIdentifier, replace, "", 1)
// remove the namespace from the volName as the mount paths will not have it
volName = strings.Join(strings.Split(volName, "-")[:2], "-")
// Examples of possible volumeIdentifiers: tn1-csi-ABC-csm-3f7da6bf8d-test, csi-ABC-csm-3f7da6bf8d-test
parts := strings.Split(vol.VolumeIdentifier, "-")

var volName string
clusterPrefix := s.getClusterPrefix()
// remove the tenant volume prefix (csm-authorization) and namespace from the volName as the mount paths will not have it
for i, p := range parts {
alikdell marked this conversation as resolved.
Show resolved Hide resolved
if p == CSIPrefix {
if i+3 < len(parts) {
if parts[i+1] == clusterPrefix {
volName = parts[i+2] + "-" + parts[i+3]
log.Infof("Found volume name: %s", volName)
}
} else {
log.Errorf("expected volume identifier format *-%s-%s-[volumeName]-*, got malformed identifier: %s", CSIPrefix, clusterPrefix, vol.VolumeIdentifier)
return nil, status.Error(codes.Internal, "Invalid volume identifer: "+vol.VolumeIdentifier)
}
alikdell marked this conversation as resolved.
Show resolved Hide resolved
}
}

// Locate and fetch all (multipath/regular) mounted paths using this volume
devMnt, err := gofsutil.GetMountInfoFromDevice(ctx, volName)
Expand Down
Loading