Merge pull request kubernetes#81373 from gnufied/fix-cinder-online-expansion-error

k8s-ci-robot · web-flow · commit 424d951af7e4 · 2019-08-15T19:16:48.000-07:00
Fix event when Cinder volume can not be expanded when in-use
diff --git a/pkg/cloudprovider/providers/openstack/openstack_volumes.go b/pkg/cloudprovider/providers/openstack/openstack_volumes.go
@@ -418,7 +418,7 @@ func (os *OpenStack) ExpandVolume(volumeID string, oldSize resource.Quantity, ne
 	}
 	if volume.Status != volumeAvailableStatus {
 		// cinder volume can not be expanded if its status is not available
-		return oldSize, fmt.Errorf("volume status is not available")
+		return oldSize, fmt.Errorf("volume in %s status can not be expanded, it must be available and not attached to a node", volume.Status)
 	}
 
 	// Cinder works with gigabytes, convert to GiB with rounding up

Original file line number	Diff line number	Diff line change
`@@ -418,7 +418,7 @@ func (os *OpenStack) ExpandVolume(volumeID string, oldSize resource.Quantity, ne`
`418`	`418`	`}`
`419`	`419`	`if volume.Status != volumeAvailableStatus {`
`420`	`420`	`// cinder volume can not be expanded if its status is not available`
`421`		`- return oldSize, fmt.Errorf("volume status is not available")`
	`421`	`+ return oldSize, fmt.Errorf("volume in %s status can not be expanded, it must be available and not attached to a node", volume.Status)`
`422`	`422`	`}`
`423`	`423`
`424`	`424`	`// Cinder works with gigabytes, convert to GiB with rounding up`