Mirroristas/etcd
2
0
Fork 0
mirror of https://github.com/etcd-io/etcd.git synced 2024-09-27 06:25:44 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #8604 from gyuho/debug-client

Browse Source 
etcdctl,clientv3: add debugging logs
This commit is contained in:
Gyu-Ho Lee 2017-09-26 07:18:00 +09:00 committed by GitHub
commit 2240b6a592
3 changed files with 16 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
clientv3/balancer.go
View File

@ -309,6 +309,9 @@ func (b *simpleBalancer) up(addr grpc.Address) (func(error), bool) {
close(b.upc)
b.downc = make(chan struct{})
b.pinAddr = addr.Addr
if logger.V(4) {
logger.Infof("clientv3: balancer pins endpoint to %s", addr.Addr)
}
// notify client that a connection is up
b.readyOnce.Do(func() { close(b.readyc) })
return func(err error) {
@ -317,6 +320,9 @@ func (b *simpleBalancer) up(addr grpc.Address) (func(error), bool) {
close(b.downc)
b.pinAddr = ""
b.mu.Unlock()
if logger.V(4) {
logger.Infof("clientv3: unpin %s (%v)", addr.Addr, err)
}
}, true
}

3
clientv3/health_balancer.go
View File

@ -186,6 +186,9 @@ func (hb *healthBalancer) mayPin(addr grpc.Address) bool {
hb.mu.Lock()
hb.unhealthy[addr.Addr] = time.Now()
hb.mu.Unlock()
if logger.V(4) {
logger.Infof("clientv3: %s becomes unhealthy", addr.Addr)
}
return false
}

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

@ -30,6 +30,7 @@ import (
"github.com/coreos/etcd/pkg/srv"
"github.com/coreos/etcd/pkg/transport"
"github.com/spf13/cobra"
"github.com/spf13/pflag"
"google.golang.org/grpc/grpclog"
)
@ -90,14 +91,18 @@ func initDisplayFromCmd(cmd *cobra.Command) {
}
func mustClientFromCmd(cmd *cobra.Command) *clientv3.Client {
flags.SetPflagsFromEnv("ETCDCTL", cmd.InheritedFlags())
fs := cmd.InheritedFlags()
flags.SetPflagsFromEnv("ETCDCTL", fs)
debug, derr := cmd.Flags().GetBool("debug")
if derr != nil {
ExitWithError(ExitError, derr)
}
if debug {
clientv3.SetLogger(grpclog.NewLoggerV2(os.Stderr, os.Stderr, os.Stderr))
clientv3.SetLogger(grpclog.NewLoggerV2WithVerbosity(os.Stderr, os.Stderr, os.Stderr, 4))
fs.VisitAll(func(f *pflag.Flag) {
fmt.Fprintf(os.Stderr, "%s=%v\n", flags.FlagToEnv("ETCDCTL", f.Name), f.Value)
})
}
endpoints, err := endpointsFromCmd(cmd)