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

Refactor node server and mount interface, add volume stats #138

Merged
merged 4 commits into from
Jul 1, 2024
Merged

Refactor node server and mount interface, add volume stats #138

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
b84309a
refactor: Improve node <-> mount interface
hrak Jul 1, 2024
f19f684
fix: correct topology HostID key and value
hrak Jul 1, 2024
106d416
lint: Mark arch-specific conversions as nolint
hrak Jul 1, 2024
ac7cf70
fix: Fix & improve sanity tests
hrak Jul 1, 2024
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
26 changes: 10 additions & 16 deletions pkg/driver/controller.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -490,7 +490,7 @@ func (cs *controllerServer) ControllerExpandVolume(ctx context.Context, req *csi
return nil, status.Error(codes.OutOfRange, "Volume size exceeds the limit specified")
}

volume, err := cs.connector.GetVolumeByID(ctx, volumeID)
_, err := cs.connector.GetVolumeByID(ctx, volumeID)
if err != nil {
if errors.Is(err, cloud.ErrNotFound) {
return nil, status.Errorf(codes.NotFound, "Volume %v not found", volumeID)
Expand All @@ -499,19 +499,6 @@ func (cs *controllerServer) ControllerExpandVolume(ctx context.Context, req *csi
return nil, status.Error(codes.Internal, fmt.Sprintf("GetVolume failed with error %v", err))
}

if volume.Size >= util.GigaBytesToBytes(volSizeGB) {
// A volume was already resized.
logger.Info("Volume has already been expanded",
"volumeID", volumeID,
"volumeSize", volume.Size,
"volumeSizeRequested", volSizeGB)

return &csi.ControllerExpandVolumeResponse{
CapacityBytes: volume.Size,
NodeExpansionRequired: true,
}, nil
}

// lock out volumeID for clone and delete operation
if err := cs.operationLocks.GetExpandLock(volumeID); err != nil {
logger.Error(err, "failed acquiring expand lock", "volumeID", volumeID)
Expand All @@ -530,15 +517,22 @@ func (cs *controllerServer) ControllerExpandVolume(ctx context.Context, req *csi
"volumeSize", volSizeGB,
)

nodeExpansionRequired := true
// Node expansion is not required for raw block volumes.
volCap := req.GetVolumeCapability()
if volCap != nil && volCap.GetBlock() != nil {
nodeExpansionRequired = false
}

return &csi.ControllerExpandVolumeResponse{
CapacityBytes: util.GigaBytesToBytes(volSizeGB),
NodeExpansionRequired: true,
NodeExpansionRequired: nodeExpansionRequired,
}, nil
}

func (cs *controllerServer) ControllerGetCapabilities(ctx context.Context, req *csi.ControllerGetCapabilitiesRequest) (*csi.ControllerGetCapabilitiesResponse, error) {
logger := klog.FromContext(ctx)
logger.V(6).Info("ControllerExpandVolume: called", "args", protosanitizer.StripSecrets(*req))
logger.V(6).Info("ControllerGetCapabilities: called", "args", protosanitizer.StripSecrets(*req))

resp := &csi.ControllerGetCapabilitiesResponse{
Capabilities: []*csi.ControllerServiceCapability{
Expand Down
Loading
Loading