unistack-org/micro
4
0
Fork 3
Code Issues 17 Pull Requests 1 Actions Packages Projects Releases 258 Wiki Activity

Merge branch 'master' of github.com:micro/go-micro

Browse Source
This commit is contained in:
Asim Aslam 2018-11-22 10:40:33 +00:00
commit 4dc593eca3
1 changed files with 16 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
registry/consul_registry.go
View File

@ -24,6 +24,8 @@ type consulRegistry struct {
sync.Mutex sync.Mutex
register map[string]uint64 register map[string]uint64
// lastChecked tracks when a node was last checked as existing in Consul
lastChecked map[string]time.Time
} }
func getDeregisterTTL(t time.Duration) time.Duration { func getDeregisterTTL(t time.Duration) time.Duration {
@ -118,8 +120,9 @@ func configure(c *consulRegistry, opts ...Option) {
func newConsulRegistry(opts ...Option) Registry { func newConsulRegistry(opts ...Option) Registry {
cr := &consulRegistry{ cr := &consulRegistry{
opts: Options{}, opts: Options{},
register: make(map[string]uint64), register: make(map[string]uint64),
lastChecked: make(map[string]time.Time),
} }
configure(cr, opts...) configure(cr, opts...)
return cr return cr
@ -135,9 +138,10 @@ func (c *consulRegistry) Deregister(s *Service) error {
return errors.New("Require at least one node") return errors.New("Require at least one node")
} }
// delete our hash of the service // delete our hash and time check of the service
c.Lock() c.Lock()
delete(c.register, s.Name) delete(c.register, s.Name)
delete(c.lastChecked, s.Name)
c.Unlock() c.Unlock()
node := s.Nodes[0] node := s.Nodes[0]
@ -181,7 +185,13 @@ func (c *consulRegistry) Register(s *Service, opts ...RegisterOption) error {
// if it's already registered and matches then just pass the check // if it's already registered and matches then just pass the check
if ok && v == h { if ok && v == h {
if options.TTL == time.Duration(0) { if options.TTL == time.Duration(0) {
services, _, err := c.Client.Health().Checks(s.Name, nil) // ensure that our service hasn't been deregistered by Consul
if time.Since(c.lastChecked[s.Name]) <= getDeregisterTTL(regInterval) {
return nil
}
services, _, err := c.Client.Health().Checks(s.Name, &consul.QueryOptions{
AllowStale: true,
})
if err == nil { if err == nil {
for _, v := range services { for _, v := range services {
if v.ServiceID == node.Id { if v.ServiceID == node.Id {
@ -245,9 +255,10 @@ func (c *consulRegistry) Register(s *Service, opts ...RegisterOption) error {
return err return err
} }
// save our hash of the service // save our hash and time check of the service
c.Lock() c.Lock()
c.register[s.Name] = h c.register[s.Name] = h
c.lastChecked[s.Name] = time.Now()
c.Unlock() c.Unlock()
// if the TTL is 0 we don't mess with the checks // if the TTL is 0 we don't mess with the checks