Make errors in the cluster list function visible.

Sometimes the operator does not pick up clusters right away when
they are created. The change attempts to shed light on the
reason behind that.
This commit is contained in:
Oleksii Kliukin 2018-02-22 16:45:10 +01:00
parent 65ef1da715
commit f18bb6eaaa
1 changed files with 5 additions and 3 deletions

View File

@ -30,8 +30,7 @@ func (c *Controller) clusterResync(stopCh <-chan struct{}, wg *sync.WaitGroup) {
for { for {
select { select {
case <-ticker.C: case <-ticker.C:
_, err := c.clusterListFunc(metav1.ListOptions{ResourceVersion: "0"}) if _, err := c.clusterListFunc(metav1.ListOptions{ResourceVersion: "0"}); err != nil {
if err != nil {
c.logger.Errorf("could not list clusters: %v", err) c.logger.Errorf("could not list clusters: %v", err)
} }
case <-stopCh: case <-stopCh:
@ -52,9 +51,12 @@ func (c *Controller) clusterListFunc(options metav1.ListOptions) (runtime.Object
b, err := req.DoRaw() b, err := req.DoRaw()
if err != nil { if err != nil {
c.logger.Errorf("could not get the list of postgresql CRD objects: %v", err)
return nil, err return nil, err
} }
err = json.Unmarshal(b, &list) if err = json.Unmarshal(b, &list); err != nil {
c.logger.Warningf("could not unmarshal list of clusters: %v", err)
}
if time.Now().Unix()-atomic.LoadInt64(&c.lastClusterSyncTime) <= int64(c.opConfig.ResyncPeriod.Seconds()) { if time.Now().Unix()-atomic.LoadInt64(&c.lastClusterSyncTime) <= int64(c.opConfig.ResyncPeriod.Seconds()) {
return &list, err return &list, err