etcdctl/v3: add keepalive time/timeout #8663
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
gyuho
reviewed
Oct 8, 2017
etcdctl/ctlv3/ctl.go
Outdated
| @@ -51,6 +53,8 @@ func init() { | |||
|
|
|||
| rootCmd.PersistentFlags().DurationVar(&globalFlags.DialTimeout, "dial-timeout", defaultDialTimeout, "dial timeout for client connections") | |||
| rootCmd.PersistentFlags().DurationVar(&globalFlags.CommandTimeOut, "command-timeout", defaultCommandTimeOut, "timeout for short running command (excluding dial timeout)") | |||
| rootCmd.PersistentFlags().DurationVar(&globalFlags.KeepAliveTime, "keep-alive-time", defaultKeepAliveTime, "keep alive time for client connections") | |||
There was a problem hiding this comment.
s/keep-alive/keepalive/ and s/"keep alive/"keepalive/
There was a problem hiding this comment.
OK, I thought they are two words.
gyuho
reviewed
Oct 8, 2017
etcdctl/ctlv3/ctl.go
Outdated
| @@ -51,6 +53,8 @@ func init() { | |||
|
|
|||
| rootCmd.PersistentFlags().DurationVar(&globalFlags.DialTimeout, "dial-timeout", defaultDialTimeout, "dial timeout for client connections") | |||
| rootCmd.PersistentFlags().DurationVar(&globalFlags.CommandTimeOut, "command-timeout", defaultCommandTimeOut, "timeout for short running command (excluding dial timeout)") | |||
| rootCmd.PersistentFlags().DurationVar(&globalFlags.KeepAliveTime, "keep-alive-time", defaultKeepAliveTime, "keep alive time for client connections") | |||
| rootCmd.PersistentFlags().DurationVar(&globalFlags.KeepAliveTimeout, "keep-alive-timeout", defaultKeepAliveTimeOut, "keep alive timeout for client connections") | |||
There was a problem hiding this comment.
s/keep-alive/keepalive/ and s/"keep alive/"keepalive/
gyuho
reviewed
Oct 8, 2017
etcdctl/ctlv3/command/global.go
Outdated
| @@ -207,6 +217,22 @@ func dialTimeoutFromCmd(cmd *cobra.Command) time.Duration { | |||
| return dialTimeout | |||
| } | |||
|
|
|||
| func keepAliveTimeFromCmd(cmd *cobra.Command) time.Duration { | |||
| keepAliveTime, err := cmd.Flags().GetDuration("keep-alive-time") | |||
gyuho
reviewed
Oct 8, 2017
etcdctl/ctlv3/command/global.go
Outdated
| } | ||
|
|
||
| func keepAliveTimeoutFromCmd(cmd *cobra.Command) time.Duration { | ||
| keepAliveTimeout, err := cmd.Flags().GetDuration("keep-alive-timeout") |
client can switch from fault node to normal when keep alive is timeout Fixes #7941
|
lgtm |
|
defer to @gyuho. |
gyuho
changed the title
gyuho
changed the title
gyuho
changed the title
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
etcdctl: add keep alive time/timeout in etcdctl
client can switch from fault node to normal when keep alive is timeout
Fixes #7941