Merge pull request #1240 from docker/revert-1238-dispatcher-unknown-e…

…xtra-graceperiod Revert "dispatcher: Give a couple of minutes for nodes to recover on re-election"
moby · Jul 26, 2016 · 7e6cb5d · 7e6cb5d
2 parents 5eca1b1 + d4c4812
commit 7e6cb5d
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 17 deletions.
diff --git a/manager/dispatcher/dispatcher.go b/manager/dispatcher/dispatcher.go
@@ -31,7 +31,6 @@ const (
 	defaultHeartBeatEpsilon      = 500 * time.Millisecond
 	defaultGracePeriodMultiplier = 3
 	defaultRateLimitPeriod       = 8 * time.Second
-	defaultStartupGracePeriod    = 2 * time.Minute
 
 	// maxBatchItems is the threshold of queued writes that should
 	// trigger an actual transaction to commit them to the shared store.
@@ -62,10 +61,9 @@ var (
 // DefautConfig.
 type Config struct {
 	// Addr configures the address the dispatcher reports to agents.
-	Addr               string
-	HeartbeatPeriod    time.Duration
-	HeartbeatEpsilon   time.Duration
-	StartupGracePeriod time.Duration
+	Addr             string
+	HeartbeatPeriod  time.Duration
+	HeartbeatEpsilon time.Duration
 	// RateLimitPeriod specifies how often node with same ID can try to register
 	// new session.
 	RateLimitPeriod       time.Duration
@@ -77,7 +75,6 @@ func DefaultConfig() *Config {
 	return &Config{
 		HeartbeatPeriod:       DefaultHeartBeatPeriod,
 		HeartbeatEpsilon:      defaultHeartBeatEpsilon,
-		StartupGracePeriod:    defaultStartupGracePeriod,
 		RateLimitPeriod:       defaultRateLimitPeriod,
 		GracePeriodMultiplier: defaultGracePeriodMultiplier,
 	}
@@ -125,7 +122,7 @@ func (b weightedPeerByNodeID) Swap(i, j int) { b[i], b[j] = b[j], b[i] }
 func New(cluster Cluster, c *Config) *Dispatcher {
 	return &Dispatcher{
 		addr:                      c.Addr,
-		nodes:                     newNodeStore(c.HeartbeatPeriod, c.HeartbeatEpsilon, c.GracePeriodMultiplier, c.StartupGracePeriod, c.RateLimitPeriod),
+		nodes:                     newNodeStore(c.HeartbeatPeriod, c.HeartbeatEpsilon, c.GracePeriodMultiplier, c.RateLimitPeriod),
 		store:                     cluster.MemoryStore(),
 		cluster:                   cluster,
 		mgrQueue:                  watch.NewQueue(16),

diff --git a/manager/dispatcher/dispatcher_test.go b/manager/dispatcher/dispatcher_test.go
@@ -273,7 +273,6 @@ func TestHeartbeatTimeout(t *testing.T) {
 	cfg := DefaultConfig()
 	cfg.HeartbeatPeriod = 100 * time.Millisecond
 	cfg.HeartbeatEpsilon = 0
-	cfg.StartupGracePeriod = 100 * time.Millisecond
 	gd, err := startDispatcher(cfg)
 	assert.NoError(t, err)
 	defer gd.Close()
@@ -738,7 +737,6 @@ func TestNodesCount(t *testing.T) {
 	cfg := DefaultConfig()
 	cfg.HeartbeatPeriod = 100 * time.Millisecond
 	cfg.HeartbeatEpsilon = 0
-	cfg.StartupGracePeriod = 100 * time.Millisecond
 	gd, err := startDispatcher(cfg)
 	assert.NoError(t, err)
 	defer gd.Close()

diff --git a/manager/dispatcher/nodes.go b/manager/dispatcher/nodes.go
@@ -12,9 +12,7 @@ import (
 	"github.com/docker/swarmkit/manager/dispatcher/heartbeat"
 )
 
-const (
-	rateLimitCount = 3
-)
+const rateLimitCount = 3
 
 type registeredNode struct {
 	SessionID  string
@@ -47,18 +45,16 @@ func (rn *registeredNode) checkSessionID(sessionID string) error {
 type nodeStore struct {
 	periodChooser         *periodChooser
 	gracePeriodMultiplier time.Duration
-	startupGracePeriod    time.Duration
 	rateLimitPeriod       time.Duration
 	nodes                 map[string]*registeredNode
 	mu                    sync.RWMutex
 }
 
-func newNodeStore(hbPeriod, hbEpsilon time.Duration, graceMultiplier int, startupGracePeriod, rateLimitPeriod time.Duration) *nodeStore {
+func newNodeStore(hbPeriod, hbEpsilon time.Duration, graceMultiplier int, rateLimitPeriod time.Duration) *nodeStore {
 	return &nodeStore{
 		nodes:                 make(map[string]*registeredNode),
 		periodChooser:         newPeriodChooser(hbPeriod, hbEpsilon),
 		gracePeriodMultiplier: time.Duration(graceMultiplier),
-		startupGracePeriod:    startupGracePeriod,
 		rateLimitPeriod:       rateLimitPeriod,
 	}
 }
@@ -83,8 +79,7 @@ func (s *nodeStore) AddUnknown(n *api.Node, expireFunc func()) error {
 		Node: n,
 	}
 	s.nodes[n.ID] = rn
-	hb := s.periodChooser.Choose()*s.gracePeriodMultiplier + s.startupGracePeriod
-	rn.Heartbeat = heartbeat.New(hb, expireFunc)
+	rn.Heartbeat = heartbeat.New(s.periodChooser.Choose()*s.gracePeriodMultiplier, expireFunc)
 	return nil
 }