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

do not export setStatus

This commit is contained in:
Felix Kunde 2019-05-02 11:18:41 +02:00
parent 9e7760d80a
commit de40e508b9
3 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
pkg/cluster/cluster.go
View File

@ -149,7 +149,7 @@ func (c *Cluster) setProcessName(procName string, args ...interface{}) {
} }
// SetStatus of Postgres cluster // 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 // TODO: eventually switch to updateStatus() for kubernetes 1.11 and above
patch, err := json.Marshal(acidv1.PostgresStatus{PostgresClusterStatus: status}) patch, err := json.Marshal(acidv1.PostgresStatus{PostgresClusterStatus: status})
if err != nil { if err != nil {
@ -210,13 +210,13 @@ func (c *Cluster) Create() error {
defer func() { defer func() {
if err == nil { 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 { } else {
c.SetStatus(acidv1.ClusterStatusAddFailed) c.setStatus(acidv1.ClusterStatusAddFailed)
} }
}() }()
c.SetStatus(acidv1.ClusterStatusCreating) c.setStatus(acidv1.ClusterStatusCreating)
for _, role := range []PostgresRole{Master, Replica} { for _, role := range []PostgresRole{Master, Replica} {
@ -483,14 +483,14 @@ func (c *Cluster) Update(oldSpec, newSpec *acidv1.Postgresql) error {
c.mu.Lock() c.mu.Lock()
defer c.mu.Unlock() defer c.mu.Unlock()
c.SetStatus(acidv1.ClusterStatusUpdating) c.setStatus(acidv1.ClusterStatusUpdating)
c.setSpec(newSpec) c.setSpec(newSpec)
defer func() { defer func() {
if updateFailed { if updateFailed {
c.SetStatus(acidv1.ClusterStatusUpdateFailed) c.setStatus(acidv1.ClusterStatusUpdateFailed)
} else { } else {
c.SetStatus(acidv1.ClusterStatusRunning) c.setStatus(acidv1.ClusterStatusRunning)
} }
}() }()

2
pkg/cluster/cluster_test.go
View File

@ -350,7 +350,7 @@ func TestSetStatus(t *testing.T) {
} }
for _, tt := range tests { for _, tt := range tests {
cl.SetStatus(tt.status.PostgresClusterStatus) cl.setStatus(tt.status.PostgresClusterStatus)
if tt.outcome { if tt.outcome {
t.Errorf("Wrong status: %s", cl.Status.String()) t.Errorf("Wrong status: %s", cl.Status.String())
} }

4
pkg/cluster/sync.go
View File

@ -27,9 +27,9 @@ func (c *Cluster) Sync(newSpec *acidv1.Postgresql) error {
defer func() { defer func() {
if err != nil { if err != nil {
c.logger.Warningf("error while syncing cluster state: %v", err) c.logger.Warningf("error while syncing cluster state: %v", err)
c.SetStatus(acidv1.ClusterStatusSyncFailed) c.setStatus(acidv1.ClusterStatusSyncFailed)
} else if !c.Status.Running() { } else if !c.Status.Running() {
c.SetStatus(acidv1.ClusterStatusRunning) c.setStatus(acidv1.ClusterStatusRunning)
} }
}() }()