Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

etcdctl/ctlv2: total-timeout for Sync #5310

Merged
merged 1 commit into from
May 10, 2016
Merged

etcdctl/ctlv2: total-timeout for Sync #5310

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 8 additions & 2 deletions etcdctl/ctlv2/command/util.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -156,7 +156,13 @@ func getTransport(c *cli.Context) (*http.Transport, error) {
CertFile: certfile,
KeyFile: keyfile,
}
return transport.NewTransport(tls, defaultDialTimeout)

dialTimeout := defaultDialTimeout
totalTimeout := c.GlobalDuration("total-timeout")
if totalTimeout != 0 && totalTimeout < dialTimeout {
dialTimeout = totalTimeout
}
return transport.NewTransport(tls, dialTimeout)
}

func getUsernamePasswordFromFlag(usernameFlag string) (username string, password string, err error) {
Expand Down Expand Up @@ -203,7 +209,7 @@ func mustNewClient(c *cli.Context) client.Client {
if debug {
fmt.Fprintf(os.Stderr, "start to sync cluster using endpoints(%s)\n", strings.Join(hc.Endpoints(), ","))
}
ctx, cancel := context.WithTimeout(context.Background(), client.DefaultRequestTimeout)
ctx, cancel := contextWithTotalTimeout(c)
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

also here, we should also add a timeout for the request timeout.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@xiang90

also here, we should also add a timeout for the request timeout.

Sorry, can you explain more? This already puts timeout for the command:

func contextWithTotalTimeout(c *cli.Context) (context.Context, context.CancelFunc) {
    return context.WithTimeout(context.Background(), c.GlobalDuration("total-timeout"))
}

c.GlobalDuration("timeout") is already used for HeaderTimeoutPerRequest here https://github.com/coreos/etcd/blob/master/etcdctl/ctlv2/command/util.go#L302

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Oh. I am not aware of https://github.com/coreos/etcd/blob/master/etcdctl/ctlv2/command/util.go#L302.

Then this is fine. Thanks.

err := hc.Sync(ctx)
cancel()
if err != nil {
Expand Down