Merge pull request #112 from Altinity/release-0.3.0

dev: retry for CREATE and DROP TABLE
Altinity · Jun 1, 2019 · 0a91caa · 0a91caa
2 parents adbbe9e + 8f07ad0
commit 0a91caa
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 4 deletions.
diff --git a/pkg/controller/chi/controller.go b/pkg/controller/chi/controller.go
@@ -540,11 +540,11 @@ func (c *Controller) onUpdateChi(old, new *chop.ClickHouseInstallation) error {
 		new.WalkClusters(func(cluster *chop.ChiCluster) error {
 			dbNames, createDatabaseSQLs, _ := c.schemer.ClusterGetCreateDatabases(new, cluster)
 			glog.V(1).Infof("Creating databases: %v", dbNames)
-			_ = c.schemer.ClusterApplySQLs(cluster, createDatabaseSQLs, false)
+			_ = c.schemer.ClusterApplySQLs(cluster, createDatabaseSQLs, true)
 
 			tableNames, createTableSQLs, _ := c.schemer.ClusterGetCreateTables(new, cluster)
 			glog.V(1).Infof("Creating tables: %v", tableNames)
-			_ = c.schemer.ClusterApplySQLs(cluster, createTableSQLs, false)
+			_ = c.schemer.ClusterApplySQLs(cluster, createTableSQLs, true)
 			return nil
 		})
 		_ = c.updateCHIResource(new)

diff --git a/pkg/controller/chi/deleters.go b/pkg/controller/chi/deleters.go
@@ -38,7 +38,7 @@ func (c *Controller) deleteTablesOnReplica(replica *chop.ChiReplica) {
 	// Delete tables on replica
 	tableNames, dropTableSQLs, _ := c.schemer.ReplicaGetDropTables(replica)
 	glog.V(1).Infof("Drop tables: %v as %v", tableNames, dropTableSQLs)
-	_ = c.schemer.ReplicaApplySQLs(replica, dropTableSQLs, false)
+	_ = c.schemer.ReplicaApplySQLs(replica, dropTableSQLs, true)
 }
 
 // deleteReplica deletes all kubernetes resources related to replica *chop.ChiReplica

diff --git a/pkg/model/clickhouse/clickhouse.go b/pkg/model/clickhouse/clickhouse.go
@@ -108,7 +108,7 @@ func (c *Conn) Exec(sql string) error {
 	}
 
 	if err := connect.Ping(); err != nil {
-		glog.V(1).Infof("FAILED Ping(%d) %v for SQL: %s", dsn, err, sql)
+		glog.V(1).Infof("FAILED Ping(%s) %v for SQL: %s", dsn, err, sql)
 		return err
 	}