1.add http deployment method

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

Author: liuminjian

Makefile

@@ -21,6 +21,7 @@ GO := go
 
 # output
 OUTPUT := bin/curveadm
+SERVER_OUTPUT := bin/pigeon
 
 # build flags
 LDFLAGS := -s -w
@@ -52,6 +53,7 @@ TEST_FLAGS += -run $(CASE)
 
 # packages
 PACKAGES := $(PWD)/cmd/curveadm/main.go
+SERVER_PACKAGES := $(PWD)/cmd/service/main.go
 
 # tar
 VERSION := "unknown"

cli/cli/cli.go

@@ -35,6 +35,7 @@ import (
 	configure "github.com/opencurve/curveadm/internal/configure/curveadm"
 	"github.com/opencurve/curveadm/internal/configure/hosts"
 	"github.com/opencurve/curveadm/internal/configure/topology"
+	"github.com/opencurve/curveadm/internal/daemon"
 	"github.com/opencurve/curveadm/internal/errno"
 	"github.com/opencurve/curveadm/internal/storage"
 	tools "github.com/opencurve/curveadm/internal/tools/upgrade"
@@ -43,6 +44,7 @@ import (
 	cliutil "github.com/opencurve/curveadm/internal/utils"
 	log "github.com/opencurve/curveadm/pkg/log/glg"
 	"github.com/opencurve/curveadm/pkg/module"
+	pigeoncore "github.com/opencurve/pigeon"
 )
 
 type CurveAdm struct {
@@ -69,7 +71,11 @@ 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
+
+	// pigeon
+	pigeon *pigeoncore.Pigeon
 }
 
 /*
@@ -195,7 +201,9 @@ func (curveadm *CurveAdm) init() error {
 	curveadm.clusterTopologyData = cluster.Topology
 	curveadm.clusterPoolData = cluster.Pool
 	curveadm.monitor = monitor
-
+	admServer := daemon.NewServer()
+	curveadm.pigeon = pigeoncore.NewPigeon([]*pigeoncore.HTTPServer{admServer})
+	curveadm.clusterType = cluster.Type
 	return nil
 }
 
@@ -276,6 +284,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) {
@@ -534,3 +543,7 @@ func (curveadm *CurveAdm) PostAudit(id int64, ec error) {
 			log.Field("Error", err))
 	}
 }
+
+func (curveadm *CurveAdm) GetPigeon() *pigeoncore.Pigeon {
+	return curveadm.pigeon
+}

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
+	description 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)
@@ -71,9 +80,9 @@ func NewAddCommand(curveadm *cli.CurveAdm) *cobra.Command {
 	}
 
 	flags := cmd.Flags()
-	flags.StringVarP(&options.descriotion, "description", "m", "", "Description for cluster")
+	flags.StringVarP(&options.description, "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.description, 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/cmd.go

@@ -31,6 +31,7 @@ import (
 	"github.com/opencurve/curveadm/cli/command/client"
 	"github.com/opencurve/curveadm/cli/command/cluster"
 	"github.com/opencurve/curveadm/cli/command/config"
+	"github.com/opencurve/curveadm/cli/command/daemon"
 	"github.com/opencurve/curveadm/cli/command/hosts"
 	"github.com/opencurve/curveadm/cli/command/monitor"
 	"github.com/opencurve/curveadm/cli/command/pfs"
@@ -66,6 +67,7 @@ func addSubCommands(cmd *cobra.Command, curveadm *cli.CurveAdm) {
 		target.NewTargetCommand(curveadm),         // curveadm target ...
 		pfs.NewPFSCommand(curveadm),               // curveadm pfs ...
 		monitor.NewMonitorCommand(curveadm),       // curveadm monitor ...
+		daemon.NewDaemonCommand(curveadm),         // curveadm http
 
 		NewAuditCommand(curveadm),      // curveadm audit
 		NewCleanCommand(curveadm),      // curveadm clean

cli/command/daemon/cmd.go

@@ -0,0 +1,44 @@
+/*
+*  Copyright (c) 2023 NetEase Inc.
+*
+*  Licensed under the Apache License, Version 2.0 (the "License");
+*  you may not use this file except in compliance with the License.
+*  You may obtain a copy of the License at
+*
+*      http://www.apache.org/licenses/LICENSE-2.0
+*
+*  Unless required by applicable law or agreed to in writing, software
+*  distributed under the License is distributed on an "AS IS" BASIS,
+*  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+*  See the License for the specific language governing permissions and
+*  limitations under the License.
+ */
+
+/*
+* Project: Curveadm
+* Created Date: 2023-03-31
+* Author: wanghai (SeanHai)
+ */
+
+package daemon
+
+import (
+	"github.com/opencurve/curveadm/cli/cli"
+	cliutil "github.com/opencurve/curveadm/internal/utils"
+	"github.com/spf13/cobra"
+)
+
+func NewDaemonCommand(curveadm *cli.CurveAdm) *cobra.Command {
+	cmd := &cobra.Command{
+		Use:   "daemon",
+		Short: "Manage http service",
+		Args:  cliutil.NoArgs,
+		RunE:  cliutil.ShowHelp(curveadm.Err()),
+	}
+
+	cmd.AddCommand(
+		NewStartCommand(curveadm),
+		NewStopCommand(curveadm),
+	)
+	return cmd
+}

cli/command/daemon/start.go

@@ -0,0 +1,58 @@
+/*
+*  Copyright (c) 2023 NetEase Inc.
+*
+*  Licensed under the Apache License, Version 2.0 (the "License");
+*  you may not use this file except in compliance with the License.
+*  You may obtain a copy of the License at
+*
+*      http://www.apache.org/licenses/LICENSE-2.0
+*
+*  Unless required by applicable law or agreed to in writing, software
+*  distributed under the License is distributed on an "AS IS" BASIS,
+*  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+*  See the License for the specific language governing permissions and
+*  limitations under the License.
+ */
+
+/*
+* Project: Curveadm
+* Created Date: 2023-03-31
+* Author: wanghai (SeanHai)
+ */
+
+package daemon
+
+import (
+	"github.com/opencurve/curveadm/cli/cli"
+	"github.com/spf13/cobra"
+)
+
+const (
+	START_EXAMPLR = `Examples:
+  $ curveadm daemon start -c config/pigeon.yaml  # Start an http service to receive requests`
+)
+
+type startOptions struct {
+	filename string
+}
+
+func NewStartCommand(curveadm *cli.CurveAdm) *cobra.Command {
+	var options startOptions
+	pigeon := curveadm.GetPigeon()
+
+	cmd := &cobra.Command{
+		Use:     "start [OPTIONS]",
+		Short:   "Start http service",
+		Example: START_EXAMPLR,
+		RunE: func(cmd *cobra.Command, args []string) error {
+			return pigeon.Start(options.filename)
+		},
+		DisableFlagsInUseLine: true,
+	}
+
+	flags := cmd.Flags()
+	flags.StringVarP(&options.filename, "conf", "c", pigeon.DefaultConfFile(),
+		"Specify pigeon configure file")
+
+	return cmd
+}

cli/command/daemon/stop.go

@@ -0,0 +1,60 @@
+/*
+*  Copyright (c) 2023 NetEase Inc.
+*
+*  Licensed under the Apache License, Version 2.0 (the "License");
+*  you may not use this file except in compliance with the License.
+*  You may obtain a copy of the License at
+*
+*      http://www.apache.org/licenses/LICENSE-2.0
+*
+*  Unless required by applicable law or agreed to in writing, software
+*  distributed under the License is distributed on an "AS IS" BASIS,
+*  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+*  See the License for the specific language governing permissions and
+*  limitations under the License.
+ */
+
+/*
+* Project: Curveadm
+* Created Date: 2023-03-31
+* Author: wanghai (SeanHai)
+ */
+
+package daemon
+
+import (
+	"github.com/opencurve/curveadm/cli/cli"
+	cliutil "github.com/opencurve/curveadm/internal/utils"
+	"github.com/spf13/cobra"
+)
+
+const (
+	STOP_EXAMPLR = `Examples:
+  $ curveadm daemon stop -c config/pigeon.yaml  # Stop an http service`
+)
+
+type stopOptions struct {
+	filename string
+}
+
+func NewStopCommand(curveadm *cli.CurveAdm) *cobra.Command {
+	var options stopOptions
+	pigeon := curveadm.GetPigeon()
+
+	cmd := &cobra.Command{
+		Use:     "stop",
+		Short:   "Stop http service",
+		Args:    cliutil.NoArgs,
+		Example: STOP_EXAMPLR,
+		RunE: func(cmd *cobra.Command, args []string) error {
+			return pigeon.Stop(options.filename)
+		},
+		DisableFlagsInUseLine: true,
+	}
+
+	flags := cmd.Flags()
+	flags.StringVarP(&options.filename, "conf", "c", pigeon.DefaultConfFile(),
+		"Specify pigeon configure file")
+
+	return cmd
+}

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("")
 }