Skip to content

Commit

Permalink
Merge #24469
Browse files Browse the repository at this point in the history
24469: cli: `debug zip` with timeout, added dump for crdb_internal.gossip_* r=windchan7 a=windchan7

Now made command `debug zip` continue past errors with a timeout
(based on peter's timeout commit).

Also dumped information in crdb_internal.gossip_nodes and gossip_liveness
to the output file.

Fixes #23954.

Release note: None
  • Loading branch information
craig[bot] committed Apr 4, 2018
2 parents b48bef3 + 458c350 commit 16262cc
Show file tree
Hide file tree
Showing 3 changed files with 197 additions and 103 deletions.
2 changes: 2 additions & 0 deletions pkg/cli/cli_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -2120,6 +2120,8 @@ writing ` + os.DevNull + `
debug/events
debug/liveness
debug/settings
debug/gossip/liveness
debug/gossip/nodes
debug/nodes/1/status
debug/nodes/1/gossip
debug/nodes/1/stacks
Expand Down
1 change: 1 addition & 0 deletions pkg/cli/flags.go
Original file line number Diff line number Diff line change
Expand Up @@ -294,6 +294,7 @@ func init() {
timeoutCmds := []*cobra.Command{
statusNodeCmd,
lsNodesCmd,
debugZipCmd,
// If you add something here, make sure the actual implementation
// of the command uses `cmdTimeoutContext(.)` or it will ignore
// the timeout.
Expand Down
Loading

0 comments on commit 16262cc

Please sign in to comment.