etcdctl: add timeout to snapshot save command #10301
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
hexfusion
reviewed
Dec 5, 2018
| } else { | ||
| // if user does not specify "--command-timeout" flag, there will be no timeout for snapshot save command | ||
| ctx, cancel = context.WithCancel(context.Background()) | ||
| } |
There was a problem hiding this comment.
seems like you could condense this a bit.
ctx, cancel := context.WithCancel(context.Background())
if ifCommandTimeoutFlagSet(cmd) {
ctx, cancel = commandCtx(cmd)
}
xiang90
reviewed
Dec 5, 2018
etcdctl/ctlv3/command/util.go
Outdated
| @@ -82,6 +82,14 @@ func commandCtx(cmd *cobra.Command) (context.Context, context.CancelFunc) { | |||
| return context.WithTimeout(context.Background(), timeOut) | |||
| } | |||
|
|
|||
| func ifCommandTimeoutFlagSet(cmd *cobra.Command) bool { | |||
xiang90
reviewed
Dec 5, 2018
etcdctl/ctlv3/command/util.go
Outdated
| func ifCommandTimeoutFlagSet(cmd *cobra.Command) bool { | ||
| commandTimeoutFlag := cmd.Flags().Lookup("command-timeout") | ||
| if commandTimeoutFlag == nil { | ||
| ExitWithError(ExitError, fmt.Errorf("expect command-timeout flag to exist")) |
There was a problem hiding this comment.
probably we should panic here. this is an internal error.
|
lgtm after fixing the issues in the comments. |
Codecov Report
@@ Coverage Diff @@
## master #10301 +/- ##
==========================================
- Coverage 71.93% 71.65% -0.29%
==========================================
Files 391 391
Lines 36386 36400 +14
==========================================
- Hits 26176 26084 -92
- Misses 8414 8495 +81
- Partials 1796 1821 +25
Continue to review full report at Codecov.
|
snapshot save command by default has no timeout, but respects user specified command timeout.
jingyih
force-pushed
the
add_timeout_to_etcdctl_snapshot_save
branch
from
bfcb5d3
to
5b6b03d
Compare
|
@xiang90 Thanks for the review. All fixed. |
|
Also let's add a changelog https://github.com/etcd-io/etcd/blob/master/CHANGELOG-3.4.md#etcdctl-v3. |
|
@gyuho Sure. Thanks for reminding:) |
jingyih
added a commit
to jingyih/etcd
that referenced
this pull request
Dec 5, 2018
gyuho
approved these changes
Dec 5, 2018
jingyih
added a commit
to jingyih/etcd
that referenced
this pull request
Dec 5, 2018
xiang90
added a commit
that referenced
this pull request
Dec 5, 2018
CHANGELOG-3.4: update from #10301
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.
Snapshot save command by default has no timeout, but should respect user specified command timeout.
Fix #10298
/cc @jpbetz @gyuho @xiang90