From ce90a54cf937a689623ed8a82c7aa8fb2c2b55bc Mon Sep 17 00:00:00 2001 From: Murat Kabilov Date: Mon, 10 Apr 2017 14:30:08 +0200 Subject: [PATCH] create key in the cluster map on cluster creation failure --- pkg/controller/postgresql.go | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/pkg/controller/postgresql.go b/pkg/controller/postgresql.go index dcc3cf728..1e06f7f3b 100644 --- a/pkg/controller/postgresql.go +++ b/pkg/controller/postgresql.go @@ -96,6 +96,9 @@ func (c *Controller) postgresqlAdd(obj interface{}) { c.logger.Infof("Creation of a new Postgresql cluster '%s' started", clusterName) cl := cluster.New(c.makeClusterConfig(), *pg, c.logger.Logger) + + c.clusters[clusterName] = cl + cl.SetStatus(spec.ClusterStatusCreating) if err := cl.Create(); err != nil { c.logger.Errorf("Can't create cluster: %s", err) @@ -103,10 +106,8 @@ func (c *Controller) postgresqlAdd(obj interface{}) { return } cl.SetStatus(spec.ClusterStatusRunning) //TODO: are you sure it's running? - stopCh := make(chan struct{}) c.stopChMap[clusterName] = stopCh - c.clusters[clusterName] = cl go cl.Run(stopCh) c.logger.Infof("Postgresql cluster '%s' has been created", clusterName)