public_git
/
postgres-operator
mirror of https://github.com/zalando/postgres-operator.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

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

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).
This commit is contained in:
Oleksii Kliukin 2018-07-20 14:12:25 +02:00 committed by GitHub
parent accbe20804
commit 12871aad1a
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 10 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
pkg/cluster/volumes.go
View File

@ -91,7 +91,8 @@ func (c *Cluster) listPersistentVolumes() ([]*v1.PersistentVolume, error) {
func (c *Cluster) resizeVolumes(newVolume spec.Volume, resizers []volumes.VolumeResizer) error { func (c *Cluster) resizeVolumes(newVolume spec.Volume, resizers []volumes.VolumeResizer) error {
c.setProcessName("resizing volumes") c.setProcessName("resizing volumes")
totalCompatible := 0 var totalIncompatible int
newQuantity, err := resource.ParseQuantity(newVolume.Size) newQuantity, err := resource.ParseQuantity(newVolume.Size)
if err != nil { if err != nil {
return fmt.Errorf("could not parse volume size: %v", err) 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 { if err != nil {
return fmt.Errorf("could not list persistent volumes: %v", err) return fmt.Errorf("could not list persistent volumes: %v", err)
} }
for _, pv := range pvs { for _, pv := range pvs {
volumeSize := quantityToGigabyte(pv.Spec.Capacity[v1.ResourceStorage]) volumeSize := quantityToGigabyte(pv.Spec.Capacity[v1.ResourceStorage])
if volumeSize >= newSize { if volumeSize >= newSize {
@ -109,11 +109,12 @@ func (c *Cluster) resizeVolumes(newVolume spec.Volume, resizers []volumes.Volume
} }
continue continue
} }
compatible := false
for _, resizer := range resizers { for _, resizer := range resizers {
if !resizer.VolumeBelongsToProvider(pv) { if !resizer.VolumeBelongsToProvider(pv) {
continue continue
} }
totalCompatible++ compatible = true
if !resizer.IsConnectedToProvider() { if !resizer.IsConnectedToProvider() {
err := resizer.ConnectToProvider() err := resizer.ConnectToProvider()
if err != nil { 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) 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 return nil
} }