Feature(cluster add): add deploy type parameter

Signed-off-by: WhereAreBugs <[email protected]>

Author: WhereAreBugs

cli/cli/cli.go

@@ -69,6 +69,7 @@ type CurveAdm struct {
 	clusterName         string // current cluster name
 	clusterTopologyData string // cluster topology
 	clusterPoolData     string // cluster pool
+	clusterType         string // cluster type like develop, production, etc.
 	monitor             storage.Monitor
 }
 
@@ -195,7 +196,7 @@ func (curveadm *CurveAdm) init() error {
 	curveadm.clusterTopologyData = cluster.Topology
 	curveadm.clusterPoolData = cluster.Pool
 	curveadm.monitor = monitor
-
+	curveadm.clusterType = cluster.Type
 	return nil
 }
 
@@ -276,6 +277,7 @@ func (curveadm *CurveAdm) ClusterUUId() string               { return curveadm.c
 func (curveadm *CurveAdm) ClusterName() string               { return curveadm.clusterName }
 func (curveadm *CurveAdm) ClusterTopologyData() string       { return curveadm.clusterTopologyData }
 func (curveadm *CurveAdm) ClusterPoolData() string           { return curveadm.clusterPoolData }
+func (curveadm *CurveAdm) ClusterType() string               { return curveadm.clusterType }
 func (curveadm *CurveAdm) Monitor() storage.Monitor          { return curveadm.monitor }
 
 func (curveadm *CurveAdm) GetHost(host string) (*hosts.HostConfig, error) {

cli/command/cluster/add.go

@@ -47,12 +47,18 @@ var (
 	CHECK_TOPOLOGY_PLAYBOOK_STEPS = []int{
 		playbook.CHECK_TOPOLOGY,
 	}
+	SUPPORTED_DEPLOY_TYPES = []string{
+		"production",
+		"test",
+		"develop",
+	}
 )
 
 type addOptions struct {
 	name        string
 	descriotion string
 	filename    string
+	deployType  string
 }
 
 func NewAddCommand(curveadm *cli.CurveAdm) *cobra.Command {
@@ -63,6 +69,9 @@ func NewAddCommand(curveadm *cli.CurveAdm) *cobra.Command {
 		Short:   "Add cluster",
 		Args:    utils.ExactArgs(1),
 		Example: ADD_EXAMPLE,
+		PreRunE: func(cmd *cobra.Command, args []string) error {
+			return checkAddOptions(cmd)
+		},
 		RunE: func(cmd *cobra.Command, args []string) error {
 			options.name = args[0]
 			return runAdd(curveadm, options)
@@ -73,7 +82,7 @@ func NewAddCommand(curveadm *cli.CurveAdm) *cobra.Command {
 	flags := cmd.Flags()
 	flags.StringVarP(&options.descriotion, "description", "m", "", "Description for cluster")
 	flags.StringVarP(&options.filename, "topology", "f", "", "Specify the path of topology file")
-
+	flags.StringVar(&options.deployType, "type", "develop", "Specify the type of cluster")
 	return cmd
 }
 
@@ -134,6 +143,19 @@ func checkTopology(curveadm *cli.CurveAdm, data string, options addOptions) erro
 	return pb.Run()
 }
 
+func checkAddOptions(cmd *cobra.Command) error {
+	deployType, err := cmd.Flags().GetString("deploy-type")
+	if err != nil {
+		return err
+	}
+	for _, t := range SUPPORTED_DEPLOY_TYPES {
+		if deployType == t {
+			return nil
+		}
+	}
+	return errno.ERR_UNSUPPORT_DEPLOY_TYPE.F("deploy type: %s", deployType)
+}
+
 func runAdd(curveadm *cli.CurveAdm, options addOptions) error {
 	// 1) check wether cluster already exist
 	name := options.name
@@ -163,7 +185,7 @@ func runAdd(curveadm *cli.CurveAdm, options addOptions) error {
 
 	// 4) insert cluster (with topology) into database
 	uuid := uuid.NewString()
-	err = storage.InsertCluster(name, uuid, options.descriotion, data)
+	err = storage.InsertCluster(name, uuid, options.descriotion, data, options.deployType)
 	if err != nil {
 		return errno.ERR_INSERT_CLUSTER_FAILED.E(err)
 	}

cli/command/cluster/import.go

@@ -100,7 +100,7 @@ func importCluster(storage *storage.Storage, dbfile, name string) error {
 	}
 
 	// insert cluster
-	err = storage.InsertCluster(name, cluster.UUId, cluster.Description, cluster.Topology)
+	err = storage.InsertCluster(name, cluster.UUId, cluster.Description, cluster.Topology, cluster.Type)
 	if err != nil {
 		return err
 	}

cli/command/deploy.go

@@ -302,6 +302,7 @@ func displayDeployTitle(curveadm *cli.CurveAdm, dcs []*topology.DeployConfig) {
 	curveadm.WriteOutln("Cluster Name    : %s", curveadm.ClusterName())
 	curveadm.WriteOutln("Cluster Kind    : %s", dcs[0].GetKind())
 	curveadm.WriteOutln("Cluster Services: %s", serviceStats(dcs))
+	curveadm.WriteOutln("Cluster Type    : %s", curveadm.ClusterType())
 	curveadm.WriteOutln("")
 }
 

internal/errno/errno.go

@@ -254,7 +254,7 @@ var (
 	ERR_NO_SERVICES_MATCHED            = EC(210006, "no services matched")
 	// TODO: please check pool set disk type
 	ERR_INVALID_DISK_TYPE = EC(210007, "poolset disk type must be lowercase and can only be one of ssd, hdd and nvme")
-
+	ERR_UNSUPPORT_DEPLOY_TYPE          = EC(210008, "unknown deploy type")
 	// 220: commad options (client common)
 	ERR_UNSUPPORT_CLIENT_KIND = EC(220000, "unsupport client kind")
 	// 221: command options (client/bs)

internal/storage/sql.go

@@ -103,52 +103,69 @@ type Cluster struct {
 	Topology    string
 	Pool        string
 	Current     bool
+	Type        string
 }
 
 var (
 	// table: clusters
 	CreateClustersTable = `
-		CREATE TABLE IF NOT EXISTS clusters (
+		CREATE TABLE IF NOT EXISTS clusters_new (
 			id INTEGER PRIMARY KEY AUTOINCREMENT,
 			uuid TEXT NOT NULL,
 			name TEXT NOT NULL UNIQUE,
 			description TEXT,
 			topology TEXT NULL,
 			pool TEXT NULL,
 			create_time DATE NOT NULL,
-			current INTEGER DEFAULT 0
+			current INTEGER DEFAULT 0,
+			type TEXT NOT NULL
 		)
 	`
 
 	// insert cluster
 	InsertCluster = `
-		INSERT INTO clusters(uuid, name, description, topology, pool, create_time)
-		VALUES(?, ?, ?, ?, "", datetime('now','localtime'))
+		INSERT INTO clusters_new(uuid, name, description, topology, type, pool, create_time)
+		VALUES(?, ?, ?, ?, ?, "", datetime('now','localtime'))
+	`
+	// check if view exists
+	CheckMigrationNeeded = `SELECT COUNT(*) FROM sqlite_master WHERE type='view' AND name = 'clusters'`
+
+	// update new cluster column
+	AddTypeField = `ALTER TABLE clusters_new ADD COLUMN type TEXT NOT NULL DEFAULT 'develop'`
+
+	// rename clusters table
+	RenameClusters = `ALTER TABLE clusters RENAME TO clusters_new`
+
+	// create view for old table
+	CreateClustersView = `
+		CREATE VIEW IF NOT EXISTS clusters AS
+		SELECT id, uuid, name, description, topology, pool, create_time, current
+		FROM clusters_new
 	`
 
 	// delete cluster
-	DeleteCluster = `DELETE from clusters WHERE name = ?`
+	DeleteCluster = `DELETE from clusters_new WHERE name = ?`
 
 	// select cluster
-	SelectCluster = `SELECT * FROM clusters WHERE name LIKE ?`
+	SelectCluster = `SELECT * FROM clusters_new WHERE name LIKE ?`
 
 	// get current cluster
-	GetCurrentCluster = `SELECT * FROM clusters WHERE current = 1`
+	GetCurrentCluster = `SELECT * FROM clusters_new WHERE current = 1`
 
 	// checkout cluster
 	CheckoutCluster = `
-		UPDATE clusters
+		UPDATE clusters_new
 		SET current = CASE name
 			WHEN ? THEN 1
 			ELSE 0
 		END
 	`
 
 	// set cluster topology
-	SetClusterTopology = `UPDATE clusters SET topology = ? WHERE id = ?`
+	SetClusterTopology = `UPDATE clusters_new SET topology = ? WHERE id = ?`
 
 	// set cluster pool
-	SetClusterPool = `UPDATE clusters SET topology = ?, pool = ? WHERE id = ?`
+	SetClusterPool = `UPDATE clusters_new SET topology = ?, pool = ? WHERE id = ?`
 )
 
 // service

internal/storage/storage.go

@@ -82,6 +82,17 @@ func (s *Storage) init() error {
 		CreateAuditTable,
 		CreateMonitorTable,
 		CreateAnyTable,
+		CreateClustersView,
+	}
+
+	tablesOK, err := s.CheckViewExists()
+	if err != nil {
+		return err
+	}
+	if !tablesOK {
+		// allow failed to execute
+		_, err = s.db.Write(RenameClusters)
+		_, err = s.db.Write(AddTypeField)
 	}
 
 	for _, sql := range sqls {
@@ -160,8 +171,26 @@ func (s *Storage) GetHostses() ([]Hosts, error) {
 }
 
 // cluster
-func (s *Storage) InsertCluster(name, uuid, description, topology string) error {
-	return s.write(InsertCluster, uuid, name, description, topology)
+func (s *Storage) InsertCluster(name, uuid, description, topology, deployType string) error {
+	return s.write(InsertCluster, uuid, name, description, topology, deployType)
+}
+
+func (s *Storage) CheckViewExists() (bool, error) {
+	result, err := s.db.Query(CheckMigrationNeeded)
+	if err != nil {
+		return false, err
+	}
+	defer result.Close()
+
+	var needed bool
+	for result.Next() {
+		err = result.Scan(&needed)
+		if err != nil {
+			return false, err
+		}
+		break
+	}
+	return needed, nil
 }
 
 func (s *Storage) DeleteCluster(name string) error {
@@ -187,6 +216,7 @@ func (s *Storage) getClusters(query string, args ...interface{}) ([]Cluster, err
 			&cluster.Pool,
 			&cluster.CreateTime,
 			&cluster.Current,
+			&cluster.Type,
 		)
 		if err != nil {
 			return nil, err