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

functional-tester/agent: clean up handler logs

Browse Source 
Signed-off-by: Gyuho Lee <gyuhox@gmail.com>
This commit is contained in:
Gyuho Lee 2018-04-04 19:57:02 -07:00
parent 190119569a
commit 32c34b582a
1 changed files with 0 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -78,7 +78,6 @@ func (srv *Server) handleInitialStartEtcd(req *rpcpb.Request) (*rpcpb.Response,
srv.Member = req.Member
srv.Tester = req.Tester
srv.lg.Info("creating base directory", zap.String("path", srv.Member.BaseDir))
err := fileutil.TouchDirAll(srv.Member.BaseDir)
if err != nil {
return nil, err
@ -90,7 +89,6 @@ func (srv *Server) handleInitialStartEtcd(req *rpcpb.Request) (*rpcpb.Response,
}
srv.creatEtcdCmd()
srv.lg.Info("starting etcd")
err = srv.startEtcdCmd()
if err != nil {
return nil, err
@ -121,7 +119,6 @@ func (srv *Server) startProxy() error {
return err
}
srv.lg.Info("starting proxy on client traffic", zap.String("url", advertiseClientURL.String()))
srv.advertiseClientPortToProxy[advertiseClientURLPort] = transport.NewProxy(transport.ProxyConfig{
Logger: srv.lg,
From: *advertiseClientURL,
@ -145,7 +142,6 @@ func (srv *Server) startProxy() error {
return err
}
srv.lg.Info("starting proxy on peer traffic", zap.String("url", advertisePeerURL.String()))
srv.advertisePeerPortToProxy[advertisePeerURLPort] = transport.NewProxy(transport.ProxyConfig{
Logger: srv.lg,
From: *advertisePeerURL,
@ -164,11 +160,6 @@ func (srv *Server) startProxy() error {
func (srv *Server) stopProxy() {
if srv.Member.EtcdClientProxy && len(srv.advertiseClientPortToProxy) > 0 {
for port, px := range srv.advertiseClientPortToProxy {
srv.lg.Info("closing proxy",
zap.Int("port", port),
zap.String("from", px.From()),
zap.String("to", px.To()),
)
if err := px.Close(); err != nil {
srv.lg.Warn("failed to close proxy", zap.Int("port", port))
continue
@ -189,11 +180,6 @@ func (srv *Server) stopProxy() {
}
if srv.Member.EtcdPeerProxy && len(srv.advertisePeerPortToProxy) > 0 {
for port, px := range srv.advertisePeerPortToProxy {
srv.lg.Info("closing proxy",
zap.Int("port", port),
zap.String("from", px.From()),
zap.String("to", px.To()),
)
if err := px.Close(); err != nil {
srv.lg.Warn("failed to close proxy", zap.Int("port", port))
continue
@ -215,7 +201,6 @@ func (srv *Server) stopProxy() {
}
func (srv *Server) createEtcdFile() error {
srv.lg.Info("creating etcd log file", zap.String("path", srv.Member.EtcdLogPath))
var err error
srv.etcdLogFile, err = os.Create(srv.Member.EtcdLogPath)
if err != nil {
@ -273,7 +258,6 @@ func (srv *Server) handleRestartEtcd() (*rpcpb.Response, error) {
func (srv *Server) handleKillEtcd() (*rpcpb.Response, error) {
srv.stopProxy()
srv.lg.Info("killing etcd", zap.String("signal", syscall.SIGTERM.String()))
err := stopWithSig(srv.etcdCmd, syscall.SIGTERM)
if err != nil {
return nil, err
@ -290,7 +274,6 @@ func (srv *Server) handleFailArchive() (*rpcpb.Response, error) {
srv.stopProxy()
// exit with stackstrace
srv.lg.Info("killing etcd", zap.String("signal", syscall.SIGQUIT.String()))
err := stopWithSig(srv.etcdCmd, syscall.SIGQUIT)
if err != nil {
return nil, err
@ -301,7 +284,6 @@ func (srv *Server) handleFailArchive() (*rpcpb.Response, error) {
srv.etcdLogFile.Close()
// TODO: support separate WAL directory
srv.lg.Info("archiving data", zap.String("base-dir", srv.Member.BaseDir))
if err = archive(
srv.Member.BaseDir,
srv.Member.EtcdLogPath,
@ -329,14 +311,12 @@ func (srv *Server) handleFailArchive() (*rpcpb.Response, error) {
// stop proxy, etcd, delete data directory
func (srv *Server) handleDestroyEtcdAgent() (*rpcpb.Response, error) {
srv.lg.Info("killing etcd", zap.String("signal", syscall.SIGTERM.String()))
err := stopWithSig(srv.etcdCmd, syscall.SIGTERM)
if err != nil {
return nil, err
}
srv.lg.Info("killed etcd", zap.String("signal", syscall.SIGTERM.String()))
srv.lg.Info("removing base directory", zap.String("dir", srv.Member.BaseDir))
err = os.RemoveAll(srv.Member.BaseDir)
if err != nil {
return nil, err
@ -347,12 +327,10 @@ func (srv *Server) handleDestroyEtcdAgent() (*rpcpb.Response, error) {
srv.Stop()
for port, px := range srv.advertiseClientPortToProxy {
srv.lg.Info("closing proxy", zap.Int("client-port", port))
err := px.Close()
srv.lg.Info("closed proxy", zap.Int("client-port", port), zap.Error(err))
}
for port, px := range srv.advertisePeerPortToProxy {
srv.lg.Info("closing proxy", zap.Int("peer-port", port))
err := px.Close()
srv.lg.Info("closed proxy", zap.Int("peer-port", port), zap.Error(err))
}