diff --git a/nomad/merge.go b/nomad/merge.go index b3070e9ce..7b6288cc0 100644 --- a/nomad/merge.go +++ b/nomad/merge.go @@ -1,6 +1,10 @@ package nomad -import "github.com/hashicorp/serf/serf" +import ( + "fmt" + + "github.com/hashicorp/serf/serf" +) // serfMergeDelegate is used to handle a cluster merge on the gossip // ring. We check that the peers are nomad servers and abort the merge @@ -9,11 +13,11 @@ type serfMergeDelegate struct { } func (md *serfMergeDelegate) NotifyMerge(members []*serf.Member) error { - //for _, m := range members { - //ok, _ := isConsulServer(*m) - //if !ok { - // return fmt.Errorf("Member '%s' is not a server", m.Name) - //} - //} + for _, m := range members { + ok, _ := isNomadServer(*m) + if !ok { + return fmt.Errorf("member '%s' is not a server", m.Name) + } + } return nil }