mirrors/etcd
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Move clientconfig into clientv3 so that it can be reused by both etcdctl and v3 discovery

Browse Source
This commit is contained in:
ahrtr 2022-03-01 00:32:20 +08:00 committed by ahrtr
parent 5ed7f00166
commit 3dcbbf62d9
10 changed files with 141 additions and 148 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
client/v3/config.go
View File

@ -90,3 +90,28 @@ type Config struct {
// TODO: support custom balancer picker // TODO: support custom balancer picker
} }
type ClientConfig struct {
Endpoints []string `json:"endpoints"`
RequestTimeout time.Duration `json:"request-timeout"`
DialTimeout time.Duration `json:"dial-timeout"`
KeepAliveTime time.Duration `json:"keepalive-time"`
KeepAliveTimeout time.Duration `json:"keepalive-timeout"`
Secure *SecureConfig `json:"secure"`
Auth *AuthConfig `json:"auth"`
}
type SecureConfig struct {
Cert string `json:"cert"`
Key string `json:"key"`
Cacert string `json:"cacert"`
ServerName string `json:"server-name"`
InsecureTransport bool `json:"insecure-transport"`
InsecureSkipVerify bool `json:"insecure-skip-tls-verify"`
}
type AuthConfig struct {
Username string `json:"username"`
Password string `json:"password"`
}

4
etcdctl/ctlv3/command/check.go
View File

@ -158,7 +158,7 @@ func newCheckPerfCommand(cmd *cobra.Command, args []string) {
cc := clientConfigFromCmd(cmd) cc := clientConfigFromCmd(cmd)
clients := make([]*v3.Client, cfg.clients) clients := make([]*v3.Client, cfg.clients)
for i := 0; i < cfg.clients; i++ { for i := 0; i < cfg.clients; i++ {
clients[i] = cc.mustClient() clients[i] = mustClient(cc)
} }
ctx, cancel := context.WithTimeout(context.Background(), time.Duration(cfg.duration)*time.Second) ctx, cancel := context.WithTimeout(context.Background(), time.Duration(cfg.duration)*time.Second)
@ -331,7 +331,7 @@ func newCheckDatascaleCommand(cmd *cobra.Command, args []string) {
cc := clientConfigFromCmd(cmd) cc := clientConfigFromCmd(cmd)
clients := make([]*v3.Client, cfg.clients) clients := make([]*v3.Client, cfg.clients)
for i := 0; i < cfg.clients; i++ { for i := 0; i < cfg.clients; i++ {
clients[i] = cc.mustClient() clients[i] = mustClient(cc)
} }
// get endpoints // get endpoints

106
etcdctl/ctlv3/command/global.go
View File

@ -60,21 +60,6 @@ type GlobalFlags struct {
Debug bool Debug bool
} }
type secureCfg struct {
cert string
key string
cacert string
serverName string
insecureTransport bool
insecureSkipVerify bool
}
type authCfg struct {
username string
password string
}
type discoveryCfg struct { type discoveryCfg struct {
domain string domain string
insecure bool insecure bool
@ -97,22 +82,13 @@ func initDisplayFromCmd(cmd *cobra.Command) {
} }
} }
type clientConfig struct {
endpoints []string
dialTimeout time.Duration
keepAliveTime time.Duration
keepAliveTimeout time.Duration
scfg *secureCfg
acfg *authCfg
}
type discardValue struct{} type discardValue struct{}
func (*discardValue) String() string { return "" } func (*discardValue) String() string { return "" }
func (*discardValue) Set(string) error { return nil } func (*discardValue) Set(string) error { return nil }
func (*discardValue) Type() string { return "" } func (*discardValue) Type() string { return "" }
func clientConfigFromCmd(cmd *cobra.Command) *clientConfig { func clientConfigFromCmd(cmd *cobra.Command) *clientv3.ClientConfig {
lg, err := zap.NewProduction() lg, err := zap.NewProduction()
if err != nil { if err != nil {
cobrautl.ExitWithError(cobrautl.ExitError, err) cobrautl.ExitWithError(cobrautl.ExitError, err)
@ -143,18 +119,18 @@ func clientConfigFromCmd(cmd *cobra.Command) *clientConfig {
grpclog.SetLoggerV2(grpclog.NewLoggerV2(io.Discard, io.Discard, os.Stderr)) grpclog.SetLoggerV2(grpclog.NewLoggerV2(io.Discard, io.Discard, os.Stderr))
} }
cfg := &clientConfig{} cfg := &clientv3.ClientConfig{}
cfg.endpoints, err = endpointsFromCmd(cmd) cfg.Endpoints, err = endpointsFromCmd(cmd)
if err != nil { if err != nil {
cobrautl.ExitWithError(cobrautl.ExitError, err) cobrautl.ExitWithError(cobrautl.ExitError, err)
} }
cfg.dialTimeout = dialTimeoutFromCmd(cmd) cfg.DialTimeout = dialTimeoutFromCmd(cmd)
cfg.keepAliveTime = keepAliveTimeFromCmd(cmd) cfg.KeepAliveTime = keepAliveTimeFromCmd(cmd)
cfg.keepAliveTimeout = keepAliveTimeoutFromCmd(cmd) cfg.KeepAliveTimeout = keepAliveTimeoutFromCmd(cmd)
cfg.scfg = secureCfgFromCmd(cmd) cfg.Secure = secureCfgFromCmd(cmd)
cfg.acfg = authCfgFromCmd(cmd) cfg.Auth = authCfgFromCmd(cmd)
initDisplayFromCmd(cmd) initDisplayFromCmd(cmd)
return cfg return cfg
@ -162,7 +138,7 @@ func clientConfigFromCmd(cmd *cobra.Command) *clientConfig {
func mustClientCfgFromCmd(cmd *cobra.Command) *clientv3.Config { func mustClientCfgFromCmd(cmd *cobra.Command) *clientv3.Config {
cc := clientConfigFromCmd(cmd) cc := clientConfigFromCmd(cmd)
cfg, err := newClientCfg(cc.endpoints, cc.dialTimeout, cc.keepAliveTime, cc.keepAliveTimeout, cc.scfg, cc.acfg) cfg, err := newClientCfg(cc.Endpoints, cc.DialTimeout, cc.KeepAliveTime, cc.KeepAliveTimeout, cc.Secure, cc.Auth)
if err != nil { if err != nil {
cobrautl.ExitWithError(cobrautl.ExitBadArgs, err) cobrautl.ExitWithError(cobrautl.ExitBadArgs, err)
} }
@ -171,11 +147,11 @@ func mustClientCfgFromCmd(cmd *cobra.Command) *clientv3.Config {
func mustClientFromCmd(cmd *cobra.Command) *clientv3.Client { func mustClientFromCmd(cmd *cobra.Command) *clientv3.Client {
cfg := clientConfigFromCmd(cmd) cfg := clientConfigFromCmd(cmd)
return cfg.mustClient() return mustClient(cfg)
} }
func (cc *clientConfig) mustClient() *clientv3.Client { func mustClient(cc *clientv3.ClientConfig) *clientv3.Client {
cfg, err := newClientCfg(cc.endpoints, cc.dialTimeout, cc.keepAliveTime, cc.keepAliveTimeout, cc.scfg, cc.acfg) cfg, err := newClientCfg(cc.Endpoints, cc.DialTimeout, cc.KeepAliveTime, cc.KeepAliveTimeout, cc.Secure, cc.Auth)
if err != nil { if err != nil {
cobrautl.ExitWithError(cobrautl.ExitBadArgs, err) cobrautl.ExitWithError(cobrautl.ExitBadArgs, err)
} }
@ -188,28 +164,28 @@ func (cc *clientConfig) mustClient() *clientv3.Client {
return client return client
} }
func newClientCfg(endpoints []string, dialTimeout, keepAliveTime, keepAliveTimeout time.Duration, scfg *secureCfg, acfg *authCfg) (*clientv3.Config, error) { func newClientCfg(endpoints []string, dialTimeout, keepAliveTime, keepAliveTimeout time.Duration, scfg *clientv3.SecureConfig, acfg *clientv3.AuthConfig) (*clientv3.Config, error) {
// set tls if any one tls option set // set tls if any one tls option set
var cfgtls *transport.TLSInfo var cfgtls *transport.TLSInfo
tlsinfo := transport.TLSInfo{} tlsinfo := transport.TLSInfo{}
tlsinfo.Logger, _ = zap.NewProduction() tlsinfo.Logger, _ = zap.NewProduction()
if scfg.cert != "" { if scfg.Cert != "" {
tlsinfo.CertFile = scfg.cert tlsinfo.CertFile = scfg.Cert
cfgtls = &tlsinfo cfgtls = &tlsinfo
} }
if scfg.key != "" { if scfg.Key != "" {
tlsinfo.KeyFile = scfg.key tlsinfo.KeyFile = scfg.Key
cfgtls = &tlsinfo cfgtls = &tlsinfo
} }
if scfg.cacert != "" { if scfg.Cacert != "" {
tlsinfo.TrustedCAFile = scfg.cacert tlsinfo.TrustedCAFile = scfg.Cacert
cfgtls = &tlsinfo cfgtls = &tlsinfo
} }
if scfg.serverName != "" { if scfg.ServerName != "" {
tlsinfo.ServerName = scfg.serverName tlsinfo.ServerName = scfg.ServerName
cfgtls = &tlsinfo cfgtls = &tlsinfo
} }
@ -231,19 +207,19 @@ func newClientCfg(endpoints []string, dialTimeout, keepAliveTime, keepAliveTimeo
// if key/cert is not given but user wants secure connection, we // if key/cert is not given but user wants secure connection, we
// should still setup an empty tls configuration for gRPC to setup // should still setup an empty tls configuration for gRPC to setup
// secure connection. // secure connection.
if cfg.TLS == nil && !scfg.insecureTransport { if cfg.TLS == nil && !scfg.InsecureTransport {
cfg.TLS = &tls.Config{} cfg.TLS = &tls.Config{}
} }
// If the user wants to skip TLS verification then we should set // If the user wants to skip TLS verification then we should set
// the InsecureSkipVerify flag in tls configuration. // the InsecureSkipVerify flag in tls configuration.
if scfg.insecureSkipVerify && cfg.TLS != nil { if scfg.InsecureSkipVerify && cfg.TLS != nil {
cfg.TLS.InsecureSkipVerify = true cfg.TLS.InsecureSkipVerify = true
} }
if acfg != nil { if acfg != nil {
cfg.Username = acfg.username cfg.Username = acfg.Username
cfg.Password = acfg.password cfg.Password = acfg.Password
} }
return cfg, nil return cfg, nil
@ -284,7 +260,7 @@ func keepAliveTimeoutFromCmd(cmd *cobra.Command) time.Duration {
return keepAliveTimeout return keepAliveTimeout
} }
func secureCfgFromCmd(cmd *cobra.Command) *secureCfg { func secureCfgFromCmd(cmd *cobra.Command) *clientv3.SecureConfig {
cert, key, cacert := keyAndCertFromCmd(cmd) cert, key, cacert := keyAndCertFromCmd(cmd)
insecureTr := insecureTransportFromCmd(cmd) insecureTr := insecureTransportFromCmd(cmd)
skipVerify := insecureSkipVerifyFromCmd(cmd) skipVerify := insecureSkipVerifyFromCmd(cmd)
@ -294,14 +270,14 @@ func secureCfgFromCmd(cmd *cobra.Command) *secureCfg {
discoveryCfg.domain = "" discoveryCfg.domain = ""
} }
return &secureCfg{ return &clientv3.SecureConfig{
cert: cert, Cert: cert,
key: key, Key: key,
cacert: cacert, Cacert: cacert,
serverName: discoveryCfg.domain, ServerName: discoveryCfg.domain,
insecureTransport: insecureTr, InsecureTransport: insecureTr,
insecureSkipVerify: skipVerify, InsecureSkipVerify: skipVerify,
} }
} }
@ -344,7 +320,7 @@ func keyAndCertFromCmd(cmd *cobra.Command) (cert, key, cacert string) {
return cert, key, cacert return cert, key, cacert
} }
func authCfgFromCmd(cmd *cobra.Command) *authCfg { func authCfgFromCmd(cmd *cobra.Command) *clientv3.AuthConfig {
userFlag, err := cmd.Flags().GetString("user") userFlag, err := cmd.Flags().GetString("user")
if err != nil { if err != nil {
cobrautl.ExitWithError(cobrautl.ExitBadArgs, err) cobrautl.ExitWithError(cobrautl.ExitBadArgs, err)
@ -358,23 +334,23 @@ func authCfgFromCmd(cmd *cobra.Command) *authCfg {
return nil return nil
} }
var cfg authCfg var cfg clientv3.AuthConfig
if passwordFlag == "" { if passwordFlag == "" {
splitted := strings.SplitN(userFlag, ":", 2) splitted := strings.SplitN(userFlag, ":", 2)
if len(splitted) < 2 { if len(splitted) < 2 {
cfg.username = userFlag cfg.Username = userFlag
cfg.password, err = speakeasy.Ask("Password: ") cfg.Password, err = speakeasy.Ask("Password: ")
if err != nil { if err != nil {
cobrautl.ExitWithError(cobrautl.ExitError, err) cobrautl.ExitWithError(cobrautl.ExitError, err)
} }
} else { } else {
cfg.username = splitted[0] cfg.Username = splitted[0]
cfg.password = splitted[1] cfg.Password = splitted[1]
} }
} else { } else {
cfg.username = userFlag cfg.Username = userFlag
cfg.password = passwordFlag cfg.Password = passwordFlag
} }
return &cfg return &cfg

42
etcdctl/ctlv3/command/make_mirror_command.go
View File

@ -69,29 +69,29 @@ func NewMakeMirrorCommand() *cobra.Command {
return c return c
} }
func authDestCfg() *authCfg { func authDestCfg() *clientv3.AuthConfig {
if mmuser == "" { if mmuser == "" {
return nil return nil
} }
var cfg authCfg var cfg clientv3.AuthConfig
if mmpassword == "" { if mmpassword == "" {
splitted := strings.SplitN(mmuser, ":", 2) splitted := strings.SplitN(mmuser, ":", 2)
if len(splitted) < 2 { if len(splitted) < 2 {
var err error var err error
cfg.username = mmuser cfg.Username = mmuser
cfg.password, err = speakeasy.Ask("Destination Password: ") cfg.Password, err = speakeasy.Ask("Destination Password: ")
if err != nil { if err != nil {
cobrautl.ExitWithError(cobrautl.ExitError, err) cobrautl.ExitWithError(cobrautl.ExitError, err)
} }
} else { } else {
cfg.username = splitted[0] cfg.Username = splitted[0]
cfg.password = splitted[1] cfg.Password = splitted[1]
} }
} else { } else {
cfg.username = mmuser cfg.Username = mmuser
cfg.password = mmpassword cfg.Password = mmpassword
} }
return &cfg return &cfg
@ -105,24 +105,24 @@ func makeMirrorCommandFunc(cmd *cobra.Command, args []string) {
dialTimeout := dialTimeoutFromCmd(cmd) dialTimeout := dialTimeoutFromCmd(cmd)
keepAliveTime := keepAliveTimeFromCmd(cmd) keepAliveTime := keepAliveTimeFromCmd(cmd)
keepAliveTimeout := keepAliveTimeoutFromCmd(cmd) keepAliveTimeout := keepAliveTimeoutFromCmd(cmd)
sec := &secureCfg{ sec := &clientv3.SecureConfig{
cert: mmcert, Cert: mmcert,
key: mmkey, Key: mmkey,
cacert: mmcacert, Cacert: mmcacert,
insecureTransport: mminsecureTr, InsecureTransport: mminsecureTr,
} }
auth := authDestCfg() auth := authDestCfg()
cc := &clientConfig{ cc := &clientv3.ClientConfig{
endpoints: []string{args[0]}, Endpoints: []string{args[0]},
dialTimeout: dialTimeout, DialTimeout: dialTimeout,
keepAliveTime: keepAliveTime, KeepAliveTime: keepAliveTime,
keepAliveTimeout: keepAliveTimeout, KeepAliveTimeout: keepAliveTimeout,
scfg: sec, Secure: sec,
acfg: auth, Auth: auth,
} }
dc := cc.mustClient() dc := mustClient(cc)
c := mustClientFromCmd(cmd) c := mustClientFromCmd(cmd)
err := makeMirror(context.TODO(), c, dc) err := makeMirror(context.TODO(), c, dc)

4
etcdctl/ctlv3/command/move_leader_command.go
View File

@ -54,8 +54,8 @@ func transferLeadershipCommandFunc(cmd *cobra.Command, args []string) {
var leaderID uint64 var leaderID uint64
for _, ep := range eps { for _, ep := range eps {
cfg := clientConfigFromCmd(cmd) cfg := clientConfigFromCmd(cmd)
cfg.endpoints = []string{ep} cfg.Endpoints = []string{ep}
cli := cfg.mustClient() cli := mustClient(cfg)
resp, serr := cli.Status(ctx, ep) resp, serr := cli.Status(ctx, ep)
if serr != nil { if serr != nil {
cobrautl.ExitWithError(cobrautl.ExitError, serr) cobrautl.ExitWithError(cobrautl.ExitError, serr)

14
etcdctl/ctlv3/command/util.go
View File

@ -27,7 +27,7 @@ import (
"time" "time"
pb "go.etcd.io/etcd/api/v3/mvccpb" pb "go.etcd.io/etcd/api/v3/mvccpb"
v3 "go.etcd.io/etcd/client/v3" "go.etcd.io/etcd/client/v3"
"go.etcd.io/etcd/pkg/v3/cobrautl" "go.etcd.io/etcd/pkg/v3/cobrautl"
"github.com/spf13/cobra" "github.com/spf13/cobra"
@ -93,7 +93,7 @@ func isCommandTimeoutFlagSet(cmd *cobra.Command) bool {
} }
// get the process_resident_memory_bytes from <server>/metrics // get the process_resident_memory_bytes from <server>/metrics
func endpointMemoryMetrics(host string, scfg *secureCfg) float64 { func endpointMemoryMetrics(host string, scfg *clientv3.SecureConfig) float64 {
residentMemoryKey := "process_resident_memory_bytes" residentMemoryKey := "process_resident_memory_bytes"
var residentMemoryValue string var residentMemoryValue string
if !strings.HasPrefix(host, "http://") && !strings.HasPrefix(host, "https://") { if !strings.HasPrefix(host, "http://") && !strings.HasPrefix(host, "https://") {
@ -102,14 +102,14 @@ func endpointMemoryMetrics(host string, scfg *secureCfg) float64 {
url := host + "/metrics" url := host + "/metrics"
if strings.HasPrefix(host, "https://") { if strings.HasPrefix(host, "https://") {
// load client certificate // load client certificate
cert, err := tls.LoadX509KeyPair(scfg.cert, scfg.key) cert, err := tls.LoadX509KeyPair(scfg.Cert, scfg.Key)
if err != nil { if err != nil {
fmt.Println(fmt.Sprintf("client certificate error: %v", err)) fmt.Println(fmt.Sprintf("client certificate error: %v", err))
return 0.0 return 0.0
} }
http.DefaultTransport.(*http.Transport).TLSClientConfig = &tls.Config{ http.DefaultTransport.(*http.Transport).TLSClientConfig = &tls.Config{
Certificates: []tls.Certificate{cert}, Certificates: []tls.Certificate{cert},
InsecureSkipVerify: scfg.insecureSkipVerify, InsecureSkipVerify: scfg.InsecureSkipVerify,
} }
} }
resp, err := http.Get(url) resp, err := http.Get(url)
@ -144,10 +144,10 @@ func endpointMemoryMetrics(host string, scfg *secureCfg) float64 {
} }
// compact keyspace history to a provided revision // compact keyspace history to a provided revision
func compact(c *v3.Client, rev int64) { func compact(c *clientv3.Client, rev int64) {
fmt.Printf("Compacting with revision %d\n", rev) fmt.Printf("Compacting with revision %d\n", rev)
ctx, cancel := context.WithTimeout(context.Background(), 30*time.Second) ctx, cancel := context.WithTimeout(context.Background(), 30*time.Second)
_, err := c.Compact(ctx, rev, v3.WithCompactPhysical()) _, err := c.Compact(ctx, rev, clientv3.WithCompactPhysical())
cancel() cancel()
if err != nil { if err != nil {
cobrautl.ExitWithError(cobrautl.ExitError, err) cobrautl.ExitWithError(cobrautl.ExitError, err)
@ -156,7 +156,7 @@ func compact(c *v3.Client, rev int64) {
} }
// defrag a given endpoint // defrag a given endpoint
func defrag(c *v3.Client, ep string) { func defrag(c *clientv3.Client, ep string) {
fmt.Printf("Defragmenting %q\n", ep) fmt.Printf("Defragmenting %q\n", ep)
ctx, cancel := context.WithTimeout(context.Background(), 30*time.Second) ctx, cancel := context.WithTimeout(context.Background(), 30*time.Second)
_, err := c.Defragment(ctx, ep) _, err := c.Defragment(ctx, ep)

18
server/embed/config.go
View File

@ -31,6 +31,7 @@ import (
"go.etcd.io/etcd/client/pkg/v3/tlsutil" "go.etcd.io/etcd/client/pkg/v3/tlsutil"
"go.etcd.io/etcd/client/pkg/v3/transport" "go.etcd.io/etcd/client/pkg/v3/transport"
"go.etcd.io/etcd/client/pkg/v3/types" "go.etcd.io/etcd/client/pkg/v3/types"
"go.etcd.io/etcd/client/v3"
"go.etcd.io/etcd/pkg/v3/flags" "go.etcd.io/etcd/pkg/v3/flags"
"go.etcd.io/etcd/pkg/v3/netutil" "go.etcd.io/etcd/pkg/v3/netutil"
"go.etcd.io/etcd/server/v3/config" "go.etcd.io/etcd/server/v3/config"
@ -516,10 +517,15 @@ func NewConfig() *Config {
V2Deprecation: config.V2_DEPR_DEFAULT, V2Deprecation: config.V2_DEPR_DEFAULT,
DiscoveryCfg: v3discovery.DiscoveryConfig{ DiscoveryCfg: v3discovery.DiscoveryConfig{
ClientConfig: clientv3.ClientConfig{
DialTimeout: DefaultDiscoveryDialTimeout, DialTimeout: DefaultDiscoveryDialTimeout,
RequestTimeOut: DefaultDiscoveryRequestTimeOut, RequestTimeout: DefaultDiscoveryRequestTimeOut,
KeepAliveTime: DefaultDiscoveryKeepAliveTime, KeepAliveTime: DefaultDiscoveryKeepAliveTime,
KeepAliveTimeout: DefaultDiscoveryKeepAliveTimeOut, KeepAliveTimeout: DefaultDiscoveryKeepAliveTimeOut,
Secure: &clientv3.SecureConfig{},
Auth: &clientv3.AuthConfig{},
},
}, },
} }
cfg.InitialCluster = cfg.InitialClusterFromName(cfg.Name) cfg.InitialCluster = cfg.InitialClusterFromName(cfg.Name)
@ -688,11 +694,11 @@ func (cfg *Config) Validate() error {
v2discoveryFlagsExist := cfg.Dproxy != "" v2discoveryFlagsExist := cfg.Dproxy != ""
v3discoveryFlagsExist := len(cfg.DiscoveryCfg.Endpoints) > 0 || v3discoveryFlagsExist := len(cfg.DiscoveryCfg.Endpoints) > 0 ||
cfg.DiscoveryCfg.Token != "" || cfg.DiscoveryCfg.Token != "" ||
cfg.DiscoveryCfg.CertFile != "" || cfg.DiscoveryCfg.Secure.Cert != "" ||
cfg.DiscoveryCfg.KeyFile != "" || cfg.DiscoveryCfg.Secure.Key != "" ||
cfg.DiscoveryCfg.TrustedCAFile != "" || cfg.DiscoveryCfg.Secure.Cacert != "" ||
cfg.DiscoveryCfg.User != "" || cfg.DiscoveryCfg.Auth.Username != "" ||
cfg.DiscoveryCfg.Password != "" cfg.DiscoveryCfg.Auth.Password != ""
if v2discoveryFlagsExist && v3discoveryFlagsExist { if v2discoveryFlagsExist && v3discoveryFlagsExist {
return errors.New("both v2 discovery settings (discovery, discovery-proxy) " + return errors.New("both v2 discovery settings (discovery, discovery-proxy) " +

14
server/embed/etcd.go
View File

@ -349,15 +349,15 @@ func print(lg *zap.Logger, ec Config, sc config.ServerConfig, memberInitialized
zap.String("discovery-token", sc.DiscoveryCfg.Token), zap.String("discovery-token", sc.DiscoveryCfg.Token),
zap.String("discovery-endpoints", strings.Join(sc.DiscoveryCfg.Endpoints, ",")), zap.String("discovery-endpoints", strings.Join(sc.DiscoveryCfg.Endpoints, ",")),
zap.String("discovery-dial-timeout", sc.DiscoveryCfg.DialTimeout.String()), zap.String("discovery-dial-timeout", sc.DiscoveryCfg.DialTimeout.String()),
zap.String("discovery-request-timeout", sc.DiscoveryCfg.RequestTimeOut.String()), zap.String("discovery-request-timeout", sc.DiscoveryCfg.RequestTimeout.String()),
zap.String("discovery-keepalive-time", sc.DiscoveryCfg.KeepAliveTime.String()), zap.String("discovery-keepalive-time", sc.DiscoveryCfg.KeepAliveTime.String()),
zap.String("discovery-keepalive-timeout", sc.DiscoveryCfg.KeepAliveTimeout.String()), zap.String("discovery-keepalive-timeout", sc.DiscoveryCfg.KeepAliveTimeout.String()),
zap.Bool("discovery-insecure-transport", sc.DiscoveryCfg.InsecureTransport), zap.Bool("discovery-insecure-transport", sc.DiscoveryCfg.Secure.InsecureTransport),
zap.Bool("discovery-insecure-skip-tls-verify", sc.DiscoveryCfg.InsecureSkipVerify), zap.Bool("discovery-insecure-skip-tls-verify", sc.DiscoveryCfg.Secure.InsecureSkipVerify),
zap.String("discovery-cert", sc.DiscoveryCfg.CertFile), zap.String("discovery-cert", sc.DiscoveryCfg.Secure.Cert),
zap.String("discovery-key", sc.DiscoveryCfg.KeyFile), zap.String("discovery-key", sc.DiscoveryCfg.Secure.Key),
zap.String("discovery-cacert", sc.DiscoveryCfg.TrustedCAFile), zap.String("discovery-cacert", sc.DiscoveryCfg.Secure.Cacert),
zap.String("discovery-user", sc.DiscoveryCfg.User), zap.String("discovery-user", sc.DiscoveryCfg.Auth.Username),
zap.String("downgrade-check-interval", sc.DowngradeCheckTime.String()), zap.String("downgrade-check-interval", sc.DowngradeCheckTime.String()),
zap.Int("max-learners", sc.ExperimentalMaxLearners), zap.Int("max-learners", sc.ExperimentalMaxLearners),

16
server/etcdmain/config.go
View File

@ -196,16 +196,16 @@ func newConfig() *config {
) )
fs.StringVar(&cfg.ec.DiscoveryCfg.Token, "discovery-token", "", "V3 discovery: discovery token for the etcd cluster to be bootstrapped.") fs.StringVar(&cfg.ec.DiscoveryCfg.Token, "discovery-token", "", "V3 discovery: discovery token for the etcd cluster to be bootstrapped.")
fs.DurationVar(&cfg.ec.DiscoveryCfg.DialTimeout, "discovery-dial-timeout", cfg.ec.DiscoveryCfg.DialTimeout, "V3 discovery: dial timeout for client connections.") fs.DurationVar(&cfg.ec.DiscoveryCfg.DialTimeout, "discovery-dial-timeout", cfg.ec.DiscoveryCfg.DialTimeout, "V3 discovery: dial timeout for client connections.")
fs.DurationVar(&cfg.ec.DiscoveryCfg.RequestTimeOut, "discovery-request-timeout", cfg.ec.DiscoveryCfg.RequestTimeOut, "V3 discovery: timeout for discovery requests (excluding dial timeout).") fs.DurationVar(&cfg.ec.DiscoveryCfg.RequestTimeout, "discovery-request-timeout", cfg.ec.DiscoveryCfg.RequestTimeout, "V3 discovery: timeout for discovery requests (excluding dial timeout).")
fs.DurationVar(&cfg.ec.DiscoveryCfg.KeepAliveTime, "discovery-keepalive-time", cfg.ec.DiscoveryCfg.KeepAliveTime, "V3 discovery: keepalive time for client connections.") fs.DurationVar(&cfg.ec.DiscoveryCfg.KeepAliveTime, "discovery-keepalive-time", cfg.ec.DiscoveryCfg.KeepAliveTime, "V3 discovery: keepalive time for client connections.")
fs.DurationVar(&cfg.ec.DiscoveryCfg.KeepAliveTimeout, "discovery-keepalive-timeout", cfg.ec.DiscoveryCfg.KeepAliveTimeout, "V3 discovery: keepalive timeout for client connections.") fs.DurationVar(&cfg.ec.DiscoveryCfg.KeepAliveTimeout, "discovery-keepalive-timeout", cfg.ec.DiscoveryCfg.KeepAliveTimeout, "V3 discovery: keepalive timeout for client connections.")
fs.BoolVar(&cfg.ec.DiscoveryCfg.InsecureTransport, "discovery-insecure-transport", true, "V3 discovery: disable transport security for client connections.") fs.BoolVar(&cfg.ec.DiscoveryCfg.Secure.InsecureTransport, "discovery-insecure-transport", true, "V3 discovery: disable transport security for client connections.")
fs.BoolVar(&cfg.ec.DiscoveryCfg.InsecureSkipVerify, "discovery-insecure-skip-tls-verify", false, "V3 discovery: skip server certificate verification (CAUTION: this option should be enabled only for testing purposes).") fs.BoolVar(&cfg.ec.DiscoveryCfg.Secure.InsecureSkipVerify, "discovery-insecure-skip-tls-verify", false, "V3 discovery: skip server certificate verification (CAUTION: this option should be enabled only for testing purposes).")
fs.StringVar(&cfg.ec.DiscoveryCfg.CertFile, "discovery-cert", "", "V3 discovery: identify secure client using this TLS certificate file.") fs.StringVar(&cfg.ec.DiscoveryCfg.Secure.Cert, "discovery-cert", "", "V3 discovery: identify secure client using this TLS certificate file.")
fs.StringVar(&cfg.ec.DiscoveryCfg.KeyFile, "discovery-key", "", "V3 discovery: identify secure client using this TLS key file.") fs.StringVar(&cfg.ec.DiscoveryCfg.Secure.Key, "discovery-key", "", "V3 discovery: identify secure client using this TLS key file.")
fs.StringVar(&cfg.ec.DiscoveryCfg.TrustedCAFile, "discovery-cacert", "", "V3 discovery: verify certificates of TLS-enabled secure servers using this CA bundle.") fs.StringVar(&cfg.ec.DiscoveryCfg.Secure.Cacert, "discovery-cacert", "", "V3 discovery: verify certificates of TLS-enabled secure servers using this CA bundle.")
fs.StringVar(&cfg.ec.DiscoveryCfg.User, "discovery-user", "", "V3 discovery: username[:password] for authentication (prompt if password is not supplied).") fs.StringVar(&cfg.ec.DiscoveryCfg.Auth.Username, "discovery-user", "", "V3 discovery: username[:password] for authentication (prompt if password is not supplied).")
fs.StringVar(&cfg.ec.DiscoveryCfg.Password, "discovery-password", "", "V3 discovery: password for authentication (if this option is used, --user option shouldn't include password).") fs.StringVar(&cfg.ec.DiscoveryCfg.Auth.Password, "discovery-password", "", "V3 discovery: password for authentication (if this option is used, --user option shouldn't include password).")
fs.StringVar(&cfg.ec.Dproxy, "discovery-proxy", cfg.ec.Dproxy, "HTTP proxy to use for traffic to discovery service. Will be deprecated in v3.7, and be decommissioned in v3.8.") fs.StringVar(&cfg.ec.Dproxy, "discovery-proxy", cfg.ec.Dproxy, "HTTP proxy to use for traffic to discovery service. Will be deprecated in v3.7, and be decommissioned in v3.8.")
fs.StringVar(&cfg.ec.DNSCluster, "discovery-srv", cfg.ec.DNSCluster, "DNS domain used to bootstrap initial cluster.") fs.StringVar(&cfg.ec.DNSCluster, "discovery-srv", cfg.ec.DNSCluster, "DNS domain used to bootstrap initial cluster.")

40
server/etcdserver/api/v3discovery/discovery.go
View File

@ -55,22 +55,8 @@ var (
) )
type DiscoveryConfig struct { type DiscoveryConfig struct {
Token string `json:"discovery-token"` clientv3.ClientConfig `json:"client"`
Endpoints []string `json:"discovery-endpoints"` Token string `json:"token"`
DialTimeout time.Duration `json:"discovery-dial-timeout"`
RequestTimeOut time.Duration `json:"discovery-request-timeout"`
KeepAliveTime time.Duration `json:"discovery-keepalive-time"`
KeepAliveTimeout time.Duration `json:"discovery-keepalive-timeout"`
InsecureTransport bool `json:"discovery-insecure-transport"`
InsecureSkipVerify bool `json:"discovery-insecure-skip-tls-verify"`
CertFile string `json:"discovery-cert"`
KeyFile string `json:"discovery-key"`
TrustedCAFile string `json:"discovery-cacert"`
User string `json:"discovery-user"`
Password string `json:"discovery-password"`
} }
type memberInfo struct { type memberInfo struct {
@ -211,11 +197,11 @@ func newDiscovery(lg *zap.Logger, dcfg *DiscoveryConfig, id types.ID) (*discover
func newClientCfg(dcfg *DiscoveryConfig, lg *zap.Logger) (*clientv3.Config, error) { func newClientCfg(dcfg *DiscoveryConfig, lg *zap.Logger) (*clientv3.Config, error) {
var cfgtls *transport.TLSInfo var cfgtls *transport.TLSInfo
if dcfg.CertFile != "" || dcfg.KeyFile != "" || dcfg.TrustedCAFile != "" { if dcfg.Secure.Cert != "" || dcfg.Secure.Key != "" || dcfg.Secure.Cacert != "" {
cfgtls = &transport.TLSInfo{ cfgtls = &transport.TLSInfo{
CertFile: dcfg.CertFile, CertFile: dcfg.Secure.Cert,
KeyFile: dcfg.KeyFile, KeyFile: dcfg.Secure.Key,
TrustedCAFile: dcfg.TrustedCAFile, TrustedCAFile: dcfg.Secure.Cacert,
Logger: lg, Logger: lg,
} }
} }
@ -225,8 +211,8 @@ func newClientCfg(dcfg *DiscoveryConfig, lg *zap.Logger) (*clientv3.Config, erro
DialTimeout: dcfg.DialTimeout, DialTimeout: dcfg.DialTimeout,
DialKeepAliveTime: dcfg.KeepAliveTime, DialKeepAliveTime: dcfg.KeepAliveTime,
DialKeepAliveTimeout: dcfg.KeepAliveTimeout, DialKeepAliveTimeout: dcfg.KeepAliveTimeout,
Username: dcfg.User, Username: dcfg.Auth.Username,
Password: dcfg.Password, Password: dcfg.Auth.Password,
} }
if cfgtls != nil { if cfgtls != nil {
@ -240,13 +226,13 @@ func newClientCfg(dcfg *DiscoveryConfig, lg *zap.Logger) (*clientv3.Config, erro
// If key/cert is not given but user wants secure connection, we // If key/cert is not given but user wants secure connection, we
// should still setup an empty tls configuration for gRPC to setup // should still setup an empty tls configuration for gRPC to setup
// secure connection. // secure connection.
if cfg.TLS == nil && !dcfg.InsecureTransport { if cfg.TLS == nil && !dcfg.Secure.InsecureTransport {
cfg.TLS = &tls.Config{} cfg.TLS = &tls.Config{}
} }
// If the user wants to skip TLS verification then we should set // If the user wants to skip TLS verification then we should set
// the InsecureSkipVerify flag in tls configuration. // the InsecureSkipVerify flag in tls configuration.
if cfg.TLS != nil && dcfg.InsecureSkipVerify { if cfg.TLS != nil && dcfg.Secure.InsecureSkipVerify {
cfg.TLS.InsecureSkipVerify = true cfg.TLS.InsecureSkipVerify = true
} }
@ -293,7 +279,7 @@ func (d *discovery) joinCluster(config string) (string, error) {
func (d *discovery) getClusterSize() (int, error) { func (d *discovery) getClusterSize() (int, error) {
configKey := geClusterSizeKey(d.clusterToken) configKey := geClusterSizeKey(d.clusterToken)
ctx, cancel := context.WithTimeout(context.Background(), d.cfg.RequestTimeOut) ctx, cancel := context.WithTimeout(context.Background(), d.cfg.RequestTimeout)
defer cancel() defer cancel()
resp, err := d.c.Get(ctx, configKey) resp, err := d.c.Get(ctx, configKey)
@ -320,7 +306,7 @@ func (d *discovery) getClusterSize() (int, error) {
func (d *discovery) getClusterMembers() (*clusterInfo, int64, error) { func (d *discovery) getClusterMembers() (*clusterInfo, int64, error) {
membersKeyPrefix := getMemberKeyPrefix(d.clusterToken) membersKeyPrefix := getMemberKeyPrefix(d.clusterToken)
ctx, cancel := context.WithTimeout(context.Background(), d.cfg.RequestTimeOut) ctx, cancel := context.WithTimeout(context.Background(), d.cfg.RequestTimeout)
defer cancel() defer cancel()
resp, err := d.c.Get(ctx, membersKeyPrefix, clientv3.WithPrefix()) resp, err := d.c.Get(ctx, membersKeyPrefix, clientv3.WithPrefix())
@ -404,7 +390,7 @@ func (d *discovery) registerSelfRetry(contents string) error {
} }
func (d *discovery) registerSelf(contents string) error { func (d *discovery) registerSelf(contents string) error {
ctx, cancel := context.WithTimeout(context.Background(), d.cfg.RequestTimeOut) ctx, cancel := context.WithTimeout(context.Background(), d.cfg.RequestTimeout)
memberKey := getMemberKey(d.clusterToken, d.memberId.String()) memberKey := getMemberKey(d.clusterToken, d.memberId.String())
_, err := d.c.Put(ctx, memberKey, contents) _, err := d.c.Put(ctx, memberKey, contents)
cancel() cancel()