diff --git a/pkg/cluster/cluster.go b/pkg/cluster/cluster.go index d1f285be6..a6e2ece59 100644 --- a/pkg/cluster/cluster.go +++ b/pkg/cluster/cluster.go @@ -149,7 +149,7 @@ func (c *Cluster) setProcessName(procName string, args ...interface{}) { } // SetStatus of Postgres cluster -func (c *Cluster) SetStatus(status string) { +func (c *Cluster) setStatus(status string) { // TODO: eventually switch to updateStatus() for kubernetes 1.11 and above patch, err := json.Marshal(acidv1.PostgresStatus{PostgresClusterStatus: status}) if err != nil { @@ -210,13 +210,13 @@ func (c *Cluster) Create() error { defer func() { if err == nil { - c.SetStatus(acidv1.ClusterStatusRunning) //TODO: are you sure it's running? + c.setStatus(acidv1.ClusterStatusRunning) //TODO: are you sure it's running? } else { - c.SetStatus(acidv1.ClusterStatusAddFailed) + c.setStatus(acidv1.ClusterStatusAddFailed) } }() - c.SetStatus(acidv1.ClusterStatusCreating) + c.setStatus(acidv1.ClusterStatusCreating) for _, role := range []PostgresRole{Master, Replica} { @@ -483,14 +483,14 @@ func (c *Cluster) Update(oldSpec, newSpec *acidv1.Postgresql) error { c.mu.Lock() defer c.mu.Unlock() - c.SetStatus(acidv1.ClusterStatusUpdating) + c.setStatus(acidv1.ClusterStatusUpdating) c.setSpec(newSpec) defer func() { if updateFailed { - c.SetStatus(acidv1.ClusterStatusUpdateFailed) + c.setStatus(acidv1.ClusterStatusUpdateFailed) } else { - c.SetStatus(acidv1.ClusterStatusRunning) + c.setStatus(acidv1.ClusterStatusRunning) } }() diff --git a/pkg/cluster/cluster_test.go b/pkg/cluster/cluster_test.go index 547ec19c7..b20189777 100644 --- a/pkg/cluster/cluster_test.go +++ b/pkg/cluster/cluster_test.go @@ -350,7 +350,7 @@ func TestSetStatus(t *testing.T) { } for _, tt := range tests { - cl.SetStatus(tt.status.PostgresClusterStatus) + cl.setStatus(tt.status.PostgresClusterStatus) if tt.outcome { t.Errorf("Wrong status: %s", cl.Status.String()) } diff --git a/pkg/cluster/sync.go b/pkg/cluster/sync.go index 259f421bf..9ba2ee40a 100644 --- a/pkg/cluster/sync.go +++ b/pkg/cluster/sync.go @@ -27,9 +27,9 @@ func (c *Cluster) Sync(newSpec *acidv1.Postgresql) error { defer func() { if err != nil { c.logger.Warningf("error while syncing cluster state: %v", err) - c.SetStatus(acidv1.ClusterStatusSyncFailed) + c.setStatus(acidv1.ClusterStatusSyncFailed) } else if !c.Status.Running() { - c.SetStatus(acidv1.ClusterStatusRunning) + c.setStatus(acidv1.ClusterStatusRunning) } }()