Avoid showing an extra error when resizing volume fails (zalando#350)

alexeyklyukin · web-flow · commit 12871aad1ab6 · 2018-07-20T14:12:25.000+02:00
Do not show 'persistent volumes are not compatible' errors for the
volumes that failed to be resized because of the other reasons (i.e.
the new size is smaller than the existing one).
diff --git a/pkg/cluster/volumes.go b/pkg/cluster/volumes.go
@@ -91,7 +91,8 @@ func (c *Cluster) listPersistentVolumes() ([]*v1.PersistentVolume, error) {
 func (c *Cluster) resizeVolumes(newVolume spec.Volume, resizers []volumes.VolumeResizer) error {
 	c.setProcessName("resizing volumes")
 
-	totalCompatible := 0
+	var totalIncompatible int
+
 	newQuantity, err := resource.ParseQuantity(newVolume.Size)
 	if err != nil {
 		return fmt.Errorf("could not parse volume size: %v", err)
@@ -100,7 +101,6 @@ func (c *Cluster) resizeVolumes(newVolume spec.Volume, resizers []volumes.Volume
 	if err != nil {
 		return fmt.Errorf("could not list persistent volumes: %v", err)
 	}
-
 	for _, pv := range pvs {
 		volumeSize := quantityToGigabyte(pv.Spec.Capacity[v1.ResourceStorage])
 		if volumeSize >= newSize {
@@ -109,11 +109,12 @@ func (c *Cluster) resizeVolumes(newVolume spec.Volume, resizers []volumes.Volume
 			}
 			continue
 		}
+		compatible := false
 		for _, resizer := range resizers {
 			if !resizer.VolumeBelongsToProvider(pv) {
 				continue
 			}
-			totalCompatible++
+			compatible = true
 			if !resizer.IsConnectedToProvider() {
 				err := resizer.ConnectToProvider()
 				if err != nil {
@@ -146,9 +147,13 @@ func (c *Cluster) resizeVolumes(newVolume spec.Volume, resizers []volumes.Volume
 			}
 			c.logger.Debugf("successfully updated persistent volume %q", pv.Name)
 		}
+		if !compatible {
+			c.logger.Warningf("volume %q is incompatible with all available resizing providers", pv.Name)
+			totalIncompatible++
+		}
 	}
-	if len(pvs) > 0 && totalCompatible == 0 {
-		return fmt.Errorf("could not resize EBS volumes: persistent volumes are not compatible with existing resizing providers")
+	if totalIncompatible > 0 {
+		return fmt.Errorf("could not resize EBS volumes: some persistent volumes are not compatible with existing resizing providers")
 	}
 	return nil
 }

Original file line number	Diff line number	Diff line change
`@@ -91,7 +91,8 @@ func (c Cluster) listPersistentVolumes() ([]v1.PersistentVolume, error) {`
`91`	`91`	`func (c *Cluster) resizeVolumes(newVolume spec.Volume, resizers []volumes.VolumeResizer) error {`
`92`	`92`	`c.setProcessName("resizing volumes")`
`93`	`93`
`94`		`- totalCompatible := 0`
	`94`	`+ var totalIncompatible int`
	`95`	`+`
`95`	`96`	`newQuantity, err := resource.ParseQuantity(newVolume.Size)`
`96`	`97`	`if err != nil {`
`97`	`98`	`return fmt.Errorf("could not parse volume size: %v", err)`
`@@ -100,7 +101,6 @@ func (c *Cluster) resizeVolumes(newVolume spec.Volume, resizers []volumes.Volume`
`100`	`101`	`if err != nil {`
`101`	`102`	`return fmt.Errorf("could not list persistent volumes: %v", err)`
`102`	`103`	`}`
`103`		`-`
`104`	`104`	`for _, pv := range pvs {`
`105`	`105`	`volumeSize := quantityToGigabyte(pv.Spec.Capacity[v1.ResourceStorage])`
`106`	`106`	`if volumeSize >= newSize {`
`@@ -109,11 +109,12 @@ func (c *Cluster) resizeVolumes(newVolume spec.Volume, resizers []volumes.Volume`
`109`	`109`	`}`
`110`	`110`	`continue`
`111`	`111`	`}`
	`112`	`+ compatible := false`
`112`	`113`	`for _, resizer := range resizers {`
`113`	`114`	`if !resizer.VolumeBelongsToProvider(pv) {`
`114`	`115`	`continue`
`115`	`116`	`}`
`116`		`- totalCompatible++`
	`117`	`+ compatible = true`
`117`	`118`	`if !resizer.IsConnectedToProvider() {`
`118`	`119`	`err := resizer.ConnectToProvider()`
`119`	`120`	`if err != nil {`
`@@ -146,9 +147,13 @@ func (c *Cluster) resizeVolumes(newVolume spec.Volume, resizers []volumes.Volume`
`146`	`147`	`}`
`147`	`148`	`c.logger.Debugf("successfully updated persistent volume %q", pv.Name)`
`148`	`149`	`}`
	`150`	`+ if !compatible {`
	`151`	`+ c.logger.Warningf("volume %q is incompatible with all available resizing providers", pv.Name)`
	`152`	`+ totalIncompatible++`
	`153`	`+ }`
`149`	`154`	`}`
`150`		`- if len(pvs) > 0 && totalCompatible == 0 {`
`151`		`- return fmt.Errorf("could not resize EBS volumes: persistent volumes are not compatible with existing resizing providers")`
	`155`	`+ if totalIncompatible > 0 {`
	`156`	`+ return fmt.Errorf("could not resize EBS volumes: some persistent volumes are not compatible with existing resizing providers")`
`152`	`157`	`}`
`153`	`158`	`return nil`
`154`	`159`	`}`