config: fix url config

cmd/weirproxy/main.go

@@ -21,6 +21,7 @@ import (
 	"github.com/pingcap/TiProxy/pkg/config"
 	"github.com/pingcap/TiProxy/pkg/server"
 	"github.com/pingcap/TiProxy/pkg/util/cmd"
+	"github.com/pingcap/TiProxy/pkg/util/waitgroup"
 	"github.com/spf13/cobra"
 	"go.uber.org/zap"
 )
@@ -71,14 +72,21 @@ func main() {
 			return err
 		}
 
-		<-cmd.Context().Done()
+		var wg waitgroup.WaitGroup
+		wg.Run(func() {
+			if err := srv.Run(cmd.Context()); err != nil {
+				logger.Error("shutdown with error", zap.Error(err))
+			}
+		})
 
-		if err = srv.Close(); err != nil {
-			logger.Error("shutdown with errors", zap.Error(err))
+		<-cmd.Context().Done()
+		if e := srv.Close(); e != nil {
+			logger.Error("shutdown with errors", zap.Error(e))
 		} else {
 			logger.Info("gracefully shutdown")
 		}
 
+		wg.Wait()
 		return nil
 	}
 

conf/namespace/default.yaml

@@ -0,0 +1,8 @@
+namespace: ""
+frontend:
+  security:
+backend:
+  instances:
+    - "127.0.0.1:4000"
+  selector_type: "random"
+  security:

conf/weirproxy.yaml

@@ -1,6 +1,12 @@
 workdir: "./work"
 listen-urls:
-  - "0.0.0.0:2379"
+  - "http://0.0.0.0:3080"
+advertise-urls:
+  - "http://127.0.0.1:3080"
+listen-peer-urls:
+  - "http://0.0.0.0:3081"
+advertise-peer-urls:
+  - "http://127.0.0.1:3081"
 config:
   ignore_wrong_namespace: true
 proxy:

pkg/config/proxy.go

@@ -28,11 +28,16 @@ const (
 )
 
 type Config struct {
-	Workdir string    `yaml:"workdir"`
-	LCUrls  []url.URL `yaml:"listen-urls"`
-	ACUrls  []url.URL `yaml:"advertise-urls"`
-	LPUrls  []url.URL `yaml:"listen-peer-urls"`
-	APUrls  []url.URL `yaml:"advertise-peer-urls"`
+	Workdir string `yaml:"workdir"`
+
+	LCUrlsI []string  `yaml:"listen-urls"`
+	ACUrlsI []string  `yaml:"advertise-urls"`
+	LPUrlsI []string  `yaml:"listen-peer-urls"`
+	APUrlsI []string  `yaml:"advertise-peer-urls"`
+	LCUrls  []url.URL `yaml:"-"`
+	ACUrls  []url.URL `yaml:"-"`
+	LPUrls  []url.URL `yaml:"-"`
+	APUrls  []url.URL `yaml:"-"`
 
 	Config   ConfigManager `yaml:"config"`
 	Proxy    ProxyServer   `yaml:"proxy"`
@@ -108,6 +113,23 @@ func NewConfig(data []byte) (*Config, error) {
 }
 
 func (cfg *Config) Check() error {
+	var err error
+	cfg.LCUrls, err = str2url(cfg.LCUrlsI)
+	if err != nil {
+		return err
+	}
+	cfg.ACUrls, err = str2url(cfg.ACUrlsI)
+	if err != nil {
+		return err
+	}
+	cfg.LPUrls, err = str2url(cfg.LPUrlsI)
+	if err != nil {
+		return err
+	}
+	cfg.APUrls, err = str2url(cfg.APUrlsI)
+	if err != nil {
+		return err
+	}
 	if cfg.Metrics.PromCluster == "" {
 		cfg.Metrics.PromCluster = DefaultClusterName
 	}
@@ -122,5 +144,29 @@ func (cfg *Config) Check() error {
 }
 
 func (cfg *Config) ToBytes() ([]byte, error) {
+	cfg.LCUrlsI = url2str(cfg.LCUrls)
+	cfg.ACUrlsI = url2str(cfg.ACUrls)
+	cfg.LPUrlsI = url2str(cfg.LPUrls)
+	cfg.APUrlsI = url2str(cfg.APUrls)
 	return yaml.Marshal(cfg)
 }
+
+func str2url(us []string) ([]url.URL, error) {
+	r := make([]url.URL, len(us))
+	for i, ustr := range us {
+		url, err := url.Parse(ustr)
+		if err != nil {
+			return r, err
+		}
+		r[i] = *url
+	}
+	return r, nil
+}
+
+func url2str(us []url.URL) []string {
+	r := make([]string, len(us))
+	for i, u := range us {
+		r[i] = u.String()
+	}
+	return r
+}

pkg/config/proxy_test.go

@@ -9,6 +9,10 @@ import (
 
 var testProxyConfig = Config{
 	Workdir: "./wd",
+	LCUrlsI: []string{"http://0.0.0.0:3080"},
+	ACUrlsI: []string{},
+	LPUrlsI: []string{"http://0.0.0.0:3081"},
+	APUrlsI: []string{},
 	LCUrls:  []url.URL{},
 	ACUrls:  []url.URL{},
 	LPUrls:  []url.URL{},
@@ -55,9 +59,11 @@ var testProxyConfig = Config{
 }
 
 func TestProxyConfig(t *testing.T) {
-	data, err := testProxyConfig.ToBytes()
+	data1, err := testProxyConfig.ToBytes()
 	require.NoError(t, err)
-	cfg, err := NewConfig(data)
+	cfg, err := NewConfig(data1)
 	require.NoError(t, err)
-	require.Equal(t, testProxyConfig, *cfg)
+	data2, err := cfg.ToBytes()
+	require.NoError(t, err)
+	require.Equal(t, data1, data2)
 }

pkg/manager/namespace/manager.go

@@ -55,7 +55,8 @@ func (mgr *NamespaceManager) buildNamespace(cfg *config.Namespace, client *clien
 		r.frontendTLS = &tls.Config{}
 
 		if !cfg.Frontend.Security.HasCert() {
-			return nil, errors.Errorf("require certificates to secure frontend tls connections")
+			// TODO: require certs here
+			logger.Warn("require certificates to secure frontend tls connections")
 		} else {
 			cert, err := tls.LoadX509KeyPair(cfg.Frontend.Security.Cert, cfg.Frontend.Security.Key)
 			if err != nil {
@@ -83,7 +84,8 @@ func (mgr *NamespaceManager) buildNamespace(cfg *config.Namespace, client *clien
 		r.backendTLS = &tls.Config{}
 		// backend tls configuration
 		if !cfg.Backend.Security.HasCA() {
-			return nil, errors.Errorf("require signed certs to verify backend tls connections")
+			// TODO: require certs here
+			logger.Error("require signed certs to verify backend tls connections")
 		} else {
 			r.backendTLS.RootCAs = x509.NewCertPool()
 			certBytes, err := ioutil.ReadFile(cfg.Backend.Security.CA)

pkg/server/server.go

@@ -19,6 +19,7 @@ import (
 	"fmt"
 	"net/http"
 	"path/filepath"
+	"time"
 
 	ginzap "github.com/gin-contrib/zap"
 	"github.com/gin-gonic/gin"
@@ -93,6 +94,8 @@ func NewServer(ctx context.Context, cfg *config.Config, logger *zap.Logger, name
 		etcd_cfg.ACUrls = cfg.ACUrls
 		etcd_cfg.LPUrls = cfg.LPUrls
 		etcd_cfg.APUrls = cfg.APUrls
+		etcd_cfg.Name = "proxy-" + fmt.Sprint(time.Now().UnixMicro())
+		etcd_cfg.InitialCluster = etcd_cfg.InitialClusterFromName(etcd_cfg.Name)
 		etcd_cfg.Dir = filepath.Join(cfg.Workdir, "etcd")
 		etcd_cfg.ZapLoggerBuilder = embed.NewZapLoggerBuilder(logger.Named("etcd"))
 		etcd_cfg.UserHandlers = map[string]http.Handler{
@@ -162,17 +165,16 @@ func NewServer(ctx context.Context, cfg *config.Config, logger *zap.Logger, name
 			err = errors.WithStack(err)
 			return
 		}
-
-		go func() {
-		}()
 	}
 
 	ready.Toggle()
-
-	err = srv.Proxy.Run(ctx)
 	return
 }
 
+func (s *Server) Run(ctx context.Context) error {
+	return s.Proxy.Run(ctx)
+}
+
 func (s *Server) Close() error {
 	var errs []error
 	if s.Proxy != nil {

pkg/util/cmd/cmd.go

@@ -47,7 +47,6 @@ func RunRootCommand(rootCmd *cobra.Command) {
 
 		// wait for quit signals
 		<-sc
-
 		cancel()
 	}()