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

etcdctl: add timeout to snapshot save command

Browse Source 
snapshot save command by default has no timeout, but respects user
specified command timeout.
This commit is contained in:
Jingyi Hu 2018-12-04 18:55:15 -08:00
parent 7f450bf696
commit 5b6b03d081
2 changed files with 16 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -102,8 +102,15 @@ func snapshotSaveCommandFunc(cmd *cobra.Command, args []string) {
sp := snapshot.NewV3(lg) sp := snapshot.NewV3(lg)
cfg := mustClientCfgFromCmd(cmd) cfg := mustClientCfgFromCmd(cmd)
// if user does not specify "--command-timeout" flag, there will be no timeout for snapshot save command
ctx, cancel := context.WithCancel(context.Background())
if isCommandTimeoutFlagSet(cmd) {
ctx, cancel = commandCtx(cmd)
}
defer cancel()
path := args[0] path := args[0]
if err := sp.Save(context.TODO(), *cfg, path); err != nil { if err := sp.Save(ctx, *cfg, path); err != nil {
ExitWithError(ExitInterrupted, err) ExitWithError(ExitInterrupted, err)
} }
fmt.Printf("Snapshot saved at %s\n", path) fmt.Printf("Snapshot saved at %s\n", path)

8
etcdctl/ctlv3/command/util.go
View File

@ -82,6 +82,14 @@ func commandCtx(cmd *cobra.Command) (context.Context, context.CancelFunc) {
return context.WithTimeout(context.Background(), timeOut) return context.WithTimeout(context.Background(), timeOut)
} }
func isCommandTimeoutFlagSet(cmd *cobra.Command) bool {
commandTimeoutFlag := cmd.Flags().Lookup("command-timeout")
if commandTimeoutFlag == nil {
panic("expect command-timeout flag to exist")
}
return commandTimeoutFlag.Changed
}
// get the process_resident_memory_bytes from <server:2379>/metrics // get the process_resident_memory_bytes from <server:2379>/metrics
func endpointMemoryMetrics(host string) float64 { func endpointMemoryMetrics(host string) float64 {
residentMemoryKey := "process_resident_memory_bytes" residentMemoryKey := "process_resident_memory_bytes"