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

Add ClientPolicy.TendTimeout #216

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Add ClientPolicy.TendTimeout #216

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
2e4da38
Added ClientPolicy.TendTimeout
Nov 22, 2017
6ddb503
Use ClientPolicy.TendTimeout when tending the cluster for the first time
Nov 22, 2017
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
5 changes: 5 additions & 0 deletions client_policy.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,6 +58,10 @@ type ClientPolicy struct {
// Minimum possible interval is 10 Milliseconds.
TendInterval time.Duration //= 1 second

// Initial cluster connection timeout duration.
// The timeout when connecting to the cluster for the first time.
TendTimeout time.Duration //= 30 seconds

// A IP translation table is used in cases where different clients
// use different server IP addresses. This may be necessary when
// using clients from both inside and outside a local area
Expand Down Expand Up @@ -95,6 +99,7 @@ type ClientPolicy struct {
func NewClientPolicy() *ClientPolicy {
return &ClientPolicy{
Timeout: 30 * time.Second,
TendTimeout: 30 * time.Second,
IdleTimeout: defaultIdleTimeout,
ConnectionQueueSize: 256,
FailIfNotConnected: true,
Expand Down
4 changes: 2 additions & 2 deletions cluster.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -533,7 +533,7 @@ func (clstr *Cluster) waitTillStabilized() error {
}()

select {
case <-time.After(clstr.clientPolicy.Timeout):
case <-time.After(clstr.clientPolicy.TendTimeout):
return errors.New("Connecting to the cluster timed out.")
case err := <-doneCh:
return err
Expand Down Expand Up @@ -608,7 +608,7 @@ L:
case <-successChan:
// even one seed is enough
return true, nil
case <-time.After(clstr.clientPolicy.Timeout):
case <-time.After(clstr.clientPolicy.TendTimeout):
// time is up, no seeds found
wg.Wait()
break L
Expand Down