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

Merge pull request #250 from zalando-incubator/show_warning_on_cluster_list_unmarshal 

Make errors in the cluster list function visible.
This commit is contained in:
zerg-junior 2018-02-22 20:53:25 +01:00 committed by GitHub
parent 65ef1da715 f18bb6eaaa
commit 6a29bbbcfa
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
pkg/controller/postgresql.go
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