Merge pull request kubernetes-sigs#115 from ZeroMagic/capacity

fix: check the disk capacity
levimm · Jul 10, 2019 · 3db8e33 · 3db8e33
2 parents a978653 + 047d67b
commit 3db8e33
Show file tree

Hide file tree

Showing 2 changed files with 33 additions and 3 deletions.
diff --git a/pkg/azuredisk/azuredisk.go b/pkg/azuredisk/azuredisk.go
@@ -19,6 +19,7 @@ package azuredisk
 import (
 	"context"
 	"fmt"
+	"reflect"
 	"regexp"
 	"strconv"
 	"strings"
@@ -36,6 +37,9 @@ import (
 	"k8s.io/kubernetes/pkg/util/mount"
 	"k8s.io/kubernetes/pkg/volume/util"
 	"k8s.io/legacy-cloud-providers/azure"
+
+	"google.golang.org/grpc/codes"
+	"google.golang.org/grpc/status"
 )
 
 const (
@@ -49,6 +53,9 @@ const (
 	// see https://docs.microsoft.com/en-us/rest/api/compute/disks/createorupdate#uri-parameters
 	diskNameMinLength = 1
 	diskNameMaxLength = 80
+
+	//default disk size is 1 GiB
+	defaultDiskSize = 1
 )
 
 var (
@@ -174,6 +181,18 @@ func (d *Driver) checkDiskExists(ctx context.Context, diskURI string) error {
 	return nil
 }
 
+func (d *Driver) checkDiskCapacity(ctx context.Context, resourceGroup, diskName string, requestGiB int) (bool, error) {
+	disk, err := d.cloud.DisksClient.Get(ctx, resourceGroup, diskName)
+	// Because we can not judge the reason of the error. Maybe the disk does not exist.
+	// So here we do not handle the error.
+	if err == nil {
+		if !reflect.DeepEqual(disk, compute.Disk{}) && disk.DiskSizeGB != nil && int(*disk.DiskSizeGB) != requestGiB {
+			return false, status.Errorf(codes.AlreadyExists, "the request volume already exists, but its capacity(%v) is different from (%v)", *disk.DiskProperties.DiskSizeGB, requestGiB)
+		}
+	}
+	return true, nil
+}
+
 func isValidDiskURI(diskURI string) error {
 	if isManagedDisk(diskURI) {
 		if strings.Index(diskURI, "/subscriptions/") != 0 {

diff --git a/pkg/azuredisk/controllerserver.go b/pkg/azuredisk/controllerserver.go
@@ -68,9 +68,12 @@ func (d *Driver) CreateVolume(ctx context.Context, req *csi.CreateVolumeRequest)
 	if !isValidVolumeCapabilities(volumeCapabilities) {
 		return nil, status.Error(codes.InvalidArgument, "Volume capabilities not supported")
 	}
-
-	volSizeBytes := int64(req.GetCapacityRange().GetRequiredBytes())
+	capacityBytes := req.GetCapacityRange().GetRequiredBytes()
+	volSizeBytes := int64(capacityBytes)
 	requestGiB := int(volumehelper.RoundUpGiB(volSizeBytes))
+	if requestGiB == 0 {
+		requestGiB = defaultDiskSize
+	}
 
 	maxVolSize := int(req.GetCapacityRange().GetLimitBytes())
 	if (maxVolSize > 0) && (maxVolSize < requestGiB) {
@@ -135,6 +138,10 @@ func (d *Driver) CreateVolume(ctx context.Context, req *csi.CreateVolumeRequest)
 		diskName = getValidDiskName(name)
 	}
 
+	if resourceGroup == "" {
+		resourceGroup = d.cloud.ResourceGroup
+	}
+
 	// normalize values
 	skuName, err := normalizeStorageAccountType(storageAccountType)
 	if err != nil {
@@ -158,6 +165,10 @@ func (d *Driver) CreateVolume(ctx context.Context, req *csi.CreateVolumeRequest)
 
 	selectedAvailabilityZone := pickAvailabilityZone(req.GetAccessibilityRequirements())
 
+	if ok, err := d.checkDiskCapacity(ctx, resourceGroup, diskName, requestGiB); !ok {
+		return nil, err
+	}
+
 	klog.V(2).Infof("begin to create azure disk(%s) account type(%s) rg(%s) location(%s) size(%d)", diskName, skuName, resourceGroup, location, requestGiB)
 
 	diskURI := ""
@@ -228,7 +239,7 @@ func (d *Driver) CreateVolume(ctx context.Context, req *csi.CreateVolumeRequest)
 	return &csi.CreateVolumeResponse{
 		Volume: &csi.Volume{
 			VolumeId:      diskURI,
-			CapacityBytes: req.GetCapacityRange().GetRequiredBytes(),
+			CapacityBytes: capacityBytes,
 			VolumeContext: parameters,
 			AccessibleTopology: []*csi.Topology{
 				{