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

functional/agent: implement "handle_RESTORE_SNAPSHOT_AND_RESTART_ETCD"

Browse Source 
Signed-off-by: Gyuho Lee <gyuhox@gmail.com>
This commit is contained in:
Gyuho Lee
2018-04-11 15:47:34 -07:00
parent b2b37928e3
commit f725bace31
1 changed files with 48 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

56
functional/agent/handler.go
View File

@ -57,8 +57,10 @@ func (srv *Server) handleTesterRequest(req *rpcpb.Request) (resp *rpcpb.Response
case rpcpb.Operation_SIGQUIT_ETCD_AND_REMOVE_DATA: case rpcpb.Operation_SIGQUIT_ETCD_AND_REMOVE_DATA:
return srv.handle_SIGQUIT_ETCD_AND_REMOVE_DATA() return srv.handle_SIGQUIT_ETCD_AND_REMOVE_DATA()
case rpcpb.Operation_FETCH_SNAPSHOT: case rpcpb.Operation_SAVE_SNAPSHOT:
return srv.handle_FETCH_SNAPSHOT() return srv.handle_SAVE_SNAPSHOT()
case rpcpb.Operation_RESTORE_SNAPSHOT_AND_RESTART_ETCD:
return srv.handle_RESTORE_SNAPSHOT_AND_RESTART_ETCD()
case rpcpb.Operation_SIGQUIT_ETCD_AND_ARCHIVE_DATA: case rpcpb.Operation_SIGQUIT_ETCD_AND_ARCHIVE_DATA:
return srv.handle_SIGQUIT_ETCD_AND_ARCHIVE_DATA() return srv.handle_SIGQUIT_ETCD_AND_ARCHIVE_DATA()
@ -99,7 +101,7 @@ func (srv *Server) handle_INITIAL_START_ETCD(req *rpcpb.Request) (*rpcpb.Respons
return nil, err return nil, err
} }
srv.creatEtcdCmd() srv.creatEtcdCmd(false)
if err = srv.saveTLSAssets(); err != nil { if err = srv.saveTLSAssets(); err != nil {
return nil, err return nil, err
@ -228,8 +230,11 @@ func (srv *Server) createEtcdLogFile() error {
return nil return nil
} }
func (srv *Server) creatEtcdCmd() { func (srv *Server) creatEtcdCmd(fromSnapshot bool) {
etcdPath, etcdFlags := srv.Member.EtcdExecPath, srv.Member.Etcd.Flags() etcdPath, etcdFlags := srv.Member.EtcdExecPath, srv.Member.Etcd.Flags()
if fromSnapshot {
etcdFlags = srv.Member.EtcdOnSnapshotRestore.Flags()
}
u, _ := url.Parse(srv.Member.FailpointHTTPAddr) u, _ := url.Parse(srv.Member.FailpointHTTPAddr)
srv.lg.Info("creating etcd command", srv.lg.Info("creating etcd command",
zap.String("etcd-exec-path", etcdPath), zap.String("etcd-exec-path", etcdPath),
@ -419,7 +424,7 @@ func (srv *Server) handle_RESTART_ETCD() (*rpcpb.Response, error) {
} }
} }
srv.creatEtcdCmd() srv.creatEtcdCmd(false)
if err = srv.saveTLSAssets(); err != nil { if err = srv.saveTLSAssets(); err != nil {
return nil, err return nil, err
@ -505,14 +510,49 @@ func (srv *Server) handle_SIGQUIT_ETCD_AND_REMOVE_DATA() (*rpcpb.Response, error
}, nil }, nil
} }
func (srv *Server) handle_FETCH_SNAPSHOT() (*rpcpb.Response, error) { func (srv *Server) handle_SAVE_SNAPSHOT() (*rpcpb.Response, error) {
err := srv.Member.FetchSnapshot(srv.lg) err := srv.Member.SaveSnapshot(srv.lg)
if err != nil { if err != nil {
return nil, err return nil, err
} }
return &rpcpb.Response{ return &rpcpb.Response{
Success: true, Success: true,
Status: "downloaded snapshot", Status: "saved snapshot",
SnapshotInfo: srv.Member.SnapshotInfo,
}, nil
}
func (srv *Server) handle_RESTORE_SNAPSHOT_AND_RESTART_ETCD() (*rpcpb.Response, error) {
err := srv.Member.RestoreSnapshot(srv.lg)
if err != nil {
return nil, err
}
srv.creatEtcdCmd(true)
if err = srv.saveTLSAssets(); err != nil {
return nil, err
}
if err = srv.startEtcdCmd(); err != nil {
return nil, err
}
srv.lg.Info("restarted etcd", zap.String("command-path", srv.etcdCmd.Path))
if err = srv.loadAutoTLSAssets(); err != nil {
return nil, err
}
// wait some time for etcd listener start
// before setting up proxy
// TODO: local tests should handle port conflicts
// with clients on restart
time.Sleep(time.Second)
if err = srv.startProxy(); err != nil {
return nil, err
}
return &rpcpb.Response{
Success: true,
Status: "restored snapshot and restarted etcd",
SnapshotInfo: srv.Member.SnapshotInfo, SnapshotInfo: srv.Member.SnapshotInfo,
}, nil }, nil
} }