fix typos;

remove unnecessary tests;
go fmt -s
This commit is contained in:
Murat Kabilov
2017-06-08 15:52:01 +02:00
committed by Oleksii Kliukin
parent e104a67260
commit 1540a2ba65
6 changed files with 18 additions and 34 deletions
+1 -1
View File
@@ -430,7 +430,7 @@ func (c *Cluster) Update(newSpec *spec.Postgresql) error {
c.logger.Infof("%s service '%s' has been created", role, util.NameFromMeta(service.ObjectMeta))
}
}
// only proceeed further if both old and new load balancer were present
// only proceed further if both old and new load balancer were present
if !(newSpec.Spec.ReplicaLoadBalancer && c.Spec.ReplicaLoadBalancer) {
continue
}
+1 -1
View File
@@ -39,7 +39,7 @@ func (c *Cluster) Sync() error {
if c.Service[role] != nil {
// delete the left over replica service
if err := c.deleteService(role); err != nil {
return fmt.Errorf("could not delete obsolete %s service: %v", role)
return fmt.Errorf("could not delete obsolete %s service: %v", role, err)
}
}
continue
+3 -3
View File
@@ -109,8 +109,8 @@ func (c *Cluster) resizeVolumes(newVolume spec.Volume, resizers []volumes.Volume
return fmt.Errorf("could not connect to the volume provider: %v", err)
}
defer func() {
err2 := resizer.DisconnectFromProvider(); if err2 != nil {
c.logger.Errorf("%v", err2)
if err := resizer.DisconnectFromProvider(); err != nil {
c.logger.Errorf("%v", err)
}
}()
}
@@ -127,7 +127,7 @@ func (c *Cluster) resizeVolumes(newVolume spec.Volume, resizers []volumes.Volume
if err := c.resizePostgresFilesystem(podName, []filesystems.FilesystemResizer{&filesystems.Ext234Resize{}}); err != nil {
return fmt.Errorf("could not resize the filesystem on pod '%s': %v", podName, err)
}
c.logger.Debugf("filesystem resize successfull on volume %s", pv.Name)
c.logger.Debugf("filesystem resize successful on volume %s", pv.Name)
pv.Spec.Capacity[v1.ResourceStorage] = newQuantity
c.logger.Debugf("updating persistent volume definition for volume %s", pv.Name)
if _, err := c.KubeClient.PersistentVolumes().Update(pv); err != nil {