mirror of
https://github.com/zalando/postgres-operator.git
synced 2026-10-04 16:01:21 +02:00
Add error checks per report from errcheck-ng
This commit is contained in:
committed by
Oleksii Kliukin
parent
292a9bda05
commit
bc0e9ab4bc
@@ -532,7 +532,9 @@ func (c *Cluster) Delete() error {
|
||||
|
||||
// ReceivePodEvent is called back by the controller in order to add the cluster's pod event to the queue.
|
||||
func (c *Cluster) ReceivePodEvent(event spec.PodEvent) {
|
||||
c.podEventsQueue.Add(event)
|
||||
if err := c.podEventsQueue.Add(event); err != nil {
|
||||
c.logger.Errorf("error when receiving pod events: %v", err)
|
||||
}
|
||||
}
|
||||
|
||||
func (c *Cluster) processPodEvent(obj interface{}) error {
|
||||
@@ -562,7 +564,9 @@ func (c *Cluster) processPodEventQueue(stopCh <-chan struct{}) {
|
||||
case <-stopCh:
|
||||
return
|
||||
default:
|
||||
c.podEventsQueue.Pop(cache.PopProcessFunc(c.processPodEvent))
|
||||
if _, err := c.podEventsQueue.Pop(cache.PopProcessFunc(c.processPodEvent)); err != nil {
|
||||
c.logger.Errorf("error when processing pod event queeue %v", err)
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@@ -37,10 +37,7 @@ func (c *Cluster) resizePostgresFilesystem(podName *spec.NamespacedName, resizer
|
||||
return c.ExecCommand(podName, "bash", "-c", cmd)
|
||||
})
|
||||
|
||||
if err != nil {
|
||||
return err
|
||||
}
|
||||
return nil
|
||||
return err
|
||||
}
|
||||
return fmt.Errorf("could not resize filesystem: no compatible resizers for the filesystem of type %s", fsType)
|
||||
}
|
||||
|
||||
+9
-2
@@ -48,7 +48,9 @@ func (c *Cluster) initDbConn() (err error) {
|
||||
}
|
||||
err = conn.Ping()
|
||||
if err != nil {
|
||||
conn.Close()
|
||||
if err2 := conn.Close(); err2 != nil {
|
||||
c.logger.Error("error when closing PostgreSQL connection after another error: %v", err2)
|
||||
}
|
||||
return err
|
||||
}
|
||||
|
||||
@@ -64,7 +66,12 @@ func (c *Cluster) readPgUsersFromDatabase(userNames []string) (users spec.PgUser
|
||||
if rows, err = c.pgDb.Query(getUserSQL, pq.Array(userNames)); err != nil {
|
||||
return nil, fmt.Errorf("error when querying users: %v", err)
|
||||
}
|
||||
defer rows.Close()
|
||||
defer func() {
|
||||
if err2 := rows.Close(); err2 != nil {
|
||||
err = fmt.Errorf("error when closing query cursor: %v", err2)
|
||||
}
|
||||
|
||||
}()
|
||||
for rows.Next() {
|
||||
var (
|
||||
rolname, rolpassword string
|
||||
|
||||
@@ -108,7 +108,11 @@ func (c *Cluster) resizeVolumes(newVolume spec.Volume, resizers []volumes.Volume
|
||||
if err != nil {
|
||||
return fmt.Errorf("could not connect to the volume provider: %v", err)
|
||||
}
|
||||
defer resizer.DisconnectFromProvider()
|
||||
defer func() {
|
||||
err2 := resizer.DisconnectFromProvider(); if err2 != nil {
|
||||
c.logger.Errorf("%v", err2)
|
||||
}
|
||||
}()
|
||||
}
|
||||
awsVolumeId, err := resizer.GetProviderVolumeID(pv)
|
||||
if err != nil {
|
||||
|
||||
Reference in New Issue
Block a user