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

functional-tester/agent: improve logging

Browse Source 
Signed-off-by: Gyuho Lee <gyuhox@gmail.com>
This commit is contained in:
Gyuho Lee
2018-04-01 00:38:28 -07:00
parent 3fe077746f
commit ee66a8087b
1 changed files with 12 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
tools/functional-tester/agent/handler.go
View File

@ -90,12 +90,12 @@ func (srv *Server) handleInitialStartEtcd(req *rpcpb.Request) (*rpcpb.Response,
} }
srv.creatEtcdCmd() srv.creatEtcdCmd()
srv.logger.Info("starting etcd process") srv.logger.Info("starting etcd")
err = srv.startEtcdCmd() err = srv.startEtcdCmd()
if err != nil { if err != nil {
return nil, err return nil, err
} }
srv.logger.Info("started etcd process", zap.String("command-path", srv.etcdCmd.Path)) srv.logger.Info("started etcd", zap.String("command-path", srv.etcdCmd.Path))
// wait some time for etcd listener start // wait some time for etcd listener start
// before setting up proxy // before setting up proxy
@ -248,15 +248,17 @@ func (srv *Server) startEtcdCmd() error {
func (srv *Server) handleRestartEtcd() (*rpcpb.Response, error) { func (srv *Server) handleRestartEtcd() (*rpcpb.Response, error) {
srv.creatEtcdCmd() srv.creatEtcdCmd()
srv.logger.Info("restarting etcd process") srv.logger.Info("restarting etcd")
err := srv.startEtcdCmd() err := srv.startEtcdCmd()
if err != nil { if err != nil {
return nil, err return nil, err
} }
srv.logger.Info("restarted etcd process", zap.String("command-path", srv.etcdCmd.Path)) srv.logger.Info("restarted etcd", zap.String("command-path", srv.etcdCmd.Path))
// wait some time for etcd listener start // wait some time for etcd listener start
// before setting up proxy // before setting up proxy
// TODO: local tests should handle port conflicts
// with clients on restart
time.Sleep(time.Second) time.Sleep(time.Second)
if err = srv.startProxy(); err != nil { if err = srv.startProxy(); err != nil {
return nil, err return nil, err
@ -271,12 +273,12 @@ func (srv *Server) handleRestartEtcd() (*rpcpb.Response, error) {
func (srv *Server) handleKillEtcd() (*rpcpb.Response, error) { func (srv *Server) handleKillEtcd() (*rpcpb.Response, error) {
srv.stopProxy() srv.stopProxy()
srv.logger.Info("killing etcd process", zap.String("signal", syscall.SIGTERM.String())) srv.logger.Info("killing etcd", zap.String("signal", syscall.SIGTERM.String()))
err := stopWithSig(srv.etcdCmd, syscall.SIGTERM) err := stopWithSig(srv.etcdCmd, syscall.SIGTERM)
if err != nil { if err != nil {
return nil, err return nil, err
} }
srv.logger.Info("killed etcd process", zap.String("signal", syscall.SIGTERM.String())) srv.logger.Info("killed etcd", zap.String("signal", syscall.SIGTERM.String()))
return &rpcpb.Response{ return &rpcpb.Response{
Success: true, Success: true,
@ -288,12 +290,12 @@ func (srv *Server) handleFailArchive() (*rpcpb.Response, error) {
srv.stopProxy() srv.stopProxy()
// exit with stackstrace // exit with stackstrace
srv.logger.Info("killing etcd process", zap.String("signal", syscall.SIGQUIT.String())) srv.logger.Info("killing etcd", zap.String("signal", syscall.SIGQUIT.String()))
err := stopWithSig(srv.etcdCmd, syscall.SIGQUIT) err := stopWithSig(srv.etcdCmd, syscall.SIGQUIT)
if err != nil { if err != nil {
return nil, err return nil, err
} }
srv.logger.Info("killed etcd process", zap.String("signal", syscall.SIGQUIT.String())) srv.logger.Info("killed etcd", zap.String("signal", syscall.SIGQUIT.String()))
srv.etcdLogFile.Sync() srv.etcdLogFile.Sync()
srv.etcdLogFile.Close() srv.etcdLogFile.Close()
@ -327,12 +329,12 @@ func (srv *Server) handleFailArchive() (*rpcpb.Response, error) {
// stop proxy, etcd, delete data directory // stop proxy, etcd, delete data directory
func (srv *Server) handleDestroyEtcdAgent() (*rpcpb.Response, error) { func (srv *Server) handleDestroyEtcdAgent() (*rpcpb.Response, error) {
srv.logger.Info("killing etcd process", zap.String("signal", syscall.SIGTERM.String())) srv.logger.Info("killing etcd", zap.String("signal", syscall.SIGTERM.String()))
err := stopWithSig(srv.etcdCmd, syscall.SIGTERM) err := stopWithSig(srv.etcdCmd, syscall.SIGTERM)
if err != nil { if err != nil {
return nil, err return nil, err
} }
srv.logger.Info("killed etcd process", zap.String("signal", syscall.SIGTERM.String())) srv.logger.Info("killed etcd", zap.String("signal", syscall.SIGTERM.String()))
srv.logger.Info("removing base directory", zap.String("dir", srv.Member.BaseDir)) srv.logger.Info("removing base directory", zap.String("dir", srv.Member.BaseDir))
err = os.RemoveAll(srv.Member.BaseDir) err = os.RemoveAll(srv.Member.BaseDir)