kemko/nomad
1
0
Fork 0
mirror of https://github.com/kemko/nomad.git synced 2026-01-01 16:05:42 +03:00
Code Issues Packages Projects Releases Wiki Activity

nomad: adding merge guard for non-nomad servers

Browse Source
This commit is contained in:
Armon Dadgar
2015-06-04 13:15:46 +02:00
parent 745685ce31
commit 6e0140c6ff
1 changed files with 11 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
nomad/merge.go
View File

@@ -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
}