baalajimaestro/traefik
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions

Improved cluster api to include the current leader node

Browse source
This commit is contained in:
Alex Antonov 2018-04-16 07:10:04 -05:00 committed by Traefiker Bot
parent 1954a49f37
commit 6b82a77e36
1 changed files with 14 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
cluster/leadership.go
View file

@ -14,6 +14,8 @@ import (
"github.com/unrolled/render" "github.com/unrolled/render"
) )
const clusterLeaderKeySuffix = "/leader"
var templatesRenderer = render.New(render.Options{ var templatesRenderer = render.New(render.Options{
Directory: "nowhere", Directory: "nowhere",
}) })
@ -32,7 +34,7 @@ func NewLeadership(ctx context.Context, cluster *types.Cluster) *Leadership {
return &Leadership{ return &Leadership{
Pool: safe.NewPool(ctx), Pool: safe.NewPool(ctx),
Cluster: cluster, Cluster: cluster,
candidate: leadership.NewCandidate(cluster.Store, cluster.Store.Prefix+"/leader", cluster.Node, 20*time.Second), candidate: leadership.NewCandidate(cluster.Store, cluster.Store.Prefix+clusterLeaderKeySuffix, cluster.Node, 20*time.Second),
listeners: []LeaderListener{}, listeners: []LeaderListener{},
leader: safe.New(false), leader: safe.New(false),
} }
@ -106,11 +108,19 @@ func (l *Leadership) onElection(elected bool) {
} }
type leaderResponse struct { type leaderResponse struct {
Leader bool `json:"leader"` Leader bool `json:"leader"`
LeaderNode string `json:"leader_node"`
} }
func (l *Leadership) getLeaderHandler(response http.ResponseWriter, request *http.Request) { func (l *Leadership) getLeaderHandler(response http.ResponseWriter, request *http.Request) {
leader := &leaderResponse{Leader: l.IsLeader()} leaderNode := ""
leaderKv, err := l.Cluster.Store.Get(l.Cluster.Store.Prefix+clusterLeaderKeySuffix, nil)
if err != nil {
log.Error(err)
} else {
leaderNode = string(leaderKv.Value)
}
leader := &leaderResponse{Leader: l.IsLeader(), LeaderNode: leaderNode}
status := http.StatusOK status := http.StatusOK
if !leader.Leader { if !leader.Leader {
@ -118,7 +128,7 @@ func (l *Leadership) getLeaderHandler(response http.ResponseWriter, request *htt
status = http.StatusTooManyRequests status = http.StatusTooManyRequests
} }
err := templatesRenderer.JSON(response, status, leader) err = templatesRenderer.JSON(response, status, leader)
if err != nil { if err != nil {
log.Error(err) log.Error(err)
} }