is a distributed reliable key-value store for the most critical data of a distributed system (written in "Go").
| handler.go (etcd-3.5.5) | : | handler.go (etcd-3.5.6) |
|---|
| | |
| skipping to change at line 476 | | skipping to change at line 476 |
|---|
| | |
| func (srv *Server) handle_INITIAL_START_ETCD(req *rpcpb.Request) (*rpcpb.Respons
e, error) { | | func (srv *Server) handle_INITIAL_START_ETCD(req *rpcpb.Request) (*rpcpb.Respons
e, error) { |
| if srv.last != rpcpb.Operation_NOT_STARTED { | | if srv.last != rpcpb.Operation_NOT_STARTED { |
| return &rpcpb.Response{ | | return &rpcpb.Response{ |
| Success: false, | | Success: false, |
| Status: fmt.Sprintf("%q is not valid; last server operat
ion was %q", rpcpb.Operation_INITIAL_START_ETCD.String(), srv.last.String()), | | Status: fmt.Sprintf("%q is not valid; last server operat
ion was %q", rpcpb.Operation_INITIAL_START_ETCD.String(), srv.last.String()), |
| Member: req.Member, | | Member: req.Member, |
| }, nil | | }, nil |
| } | | } |
| | |
|
| err := fileutil.TouchDirAll(srv.Member.BaseDir) | | err := fileutil.TouchDirAll(srv.lg, srv.Member.BaseDir) |
| if err != nil { | | if err != nil { |
| return nil, err | | return nil, err |
| } | | } |
| srv.lg.Info("created base directory", zap.String("path", srv.Member.BaseD
ir)) | | srv.lg.Info("created base directory", zap.String("path", srv.Member.BaseD
ir)) |
| | |
| if srv.etcdServer == nil { | | if srv.etcdServer == nil { |
| if err = srv.createEtcdLogFile(); err != nil { | | if err = srv.createEtcdLogFile(); err != nil { |
| return nil, err | | return nil, err |
| } | | } |
| } | | } |
| | |
| skipping to change at line 511 | | skipping to change at line 511 |
|---|
| return &rpcpb.Response{ | | return &rpcpb.Response{ |
| Success: true, | | Success: true, |
| Status: "start etcd PASS", | | Status: "start etcd PASS", |
| Member: srv.Member, | | Member: srv.Member, |
| }, nil | | }, nil |
| } | | } |
| | |
| func (srv *Server) handle_RESTART_ETCD(req *rpcpb.Request) (*rpcpb.Response, err
or) { | | func (srv *Server) handle_RESTART_ETCD(req *rpcpb.Request) (*rpcpb.Response, err
or) { |
| var err error | | var err error |
| if !fileutil.Exist(srv.Member.BaseDir) { | | if !fileutil.Exist(srv.Member.BaseDir) { |
|
| err = fileutil.TouchDirAll(srv.Member.BaseDir) | | err = fileutil.TouchDirAll(srv.lg, srv.Member.BaseDir) |
| if err != nil { | | if err != nil { |
| return nil, err | | return nil, err |
| } | | } |
| } | | } |
| | |
| if err = srv.saveTLSAssets(); err != nil { | | if err = srv.saveTLSAssets(); err != nil { |
| return nil, err | | return nil, err |
| } | | } |
| if err = srv.creatEtcd(false, req.Member.Failpoints); err != nil { | | if err = srv.creatEtcd(false, req.Member.Failpoints); err != nil { |
| return nil, err | | return nil, err |
| | |
| skipping to change at line 582 | | skipping to change at line 582 |
|---|
| return nil, err | | return nil, err |
| } | | } |
| srv.lg.Info( | | srv.lg.Info( |
| "renamed", | | "renamed", |
| zap.String("base-dir", srv.Member.BaseDir), | | zap.String("base-dir", srv.Member.BaseDir), |
| zap.String("new-dir", srv.Member.BaseDir+".backup"), | | zap.String("new-dir", srv.Member.BaseDir+".backup"), |
| ) | | ) |
| | |
| // create a new log file for next new member restart | | // create a new log file for next new member restart |
| if !fileutil.Exist(srv.Member.BaseDir) { | | if !fileutil.Exist(srv.Member.BaseDir) { |
|
| err = fileutil.TouchDirAll(srv.Member.BaseDir) | | err = fileutil.TouchDirAll(srv.lg, srv.Member.BaseDir) |
| if err != nil { | | if err != nil { |
| return nil, err | | return nil, err |
| } | | } |
| } | | } |
| | |
| return &rpcpb.Response{ | | return &rpcpb.Response{ |
| Success: true, | | Success: true, |
| Status: "killed etcd and removed base directory", | | Status: "killed etcd and removed base directory", |
| }, nil | | }, nil |
| } | | } |
| | |
| skipping to change at line 654 | | skipping to change at line 654 |
|---|
| | |
| if srv.etcdServer != nil { | | if srv.etcdServer != nil { |
| srv.etcdServer.GetLogger().Sync() | | srv.etcdServer.GetLogger().Sync() |
| } else { | | } else { |
| srv.etcdLogFile.Sync() | | srv.etcdLogFile.Sync() |
| srv.etcdLogFile.Close() | | srv.etcdLogFile.Close() |
| } | | } |
| | |
| // TODO: support separate WAL directory | | // TODO: support separate WAL directory |
| if err = archive( | | if err = archive( |
|
| | srv.lg, |
| srv.Member.BaseDir, | | srv.Member.BaseDir, |
| srv.Member.Etcd.LogOutputs[0], | | srv.Member.Etcd.LogOutputs[0], |
| srv.Member.Etcd.DataDir, | | srv.Member.Etcd.DataDir, |
| ); err != nil { | | ); err != nil { |
| return nil, err | | return nil, err |
| } | | } |
| srv.lg.Info("archived data", zap.String("base-dir", srv.Member.BaseDir)) | | srv.lg.Info("archived data", zap.String("base-dir", srv.Member.BaseDir)) |
| | |
| if srv.etcdServer == nil { | | if srv.etcdServer == nil { |
| if err = srv.createEtcdLogFile(); err != nil { | | if err = srv.createEtcdLogFile(); err != nil { |
| | | |
| End of changes. 4 change blocks. |
|---|
| 3 lines changed or deleted | | 4 lines changed or added |
|---|
"Fossies" - the Fresh Open Source Software Archive 