unistack-org/micro
4
0
Fork 2
Code Issues 18 Pull Requests Actions Packages Projects Releases 331 Wiki Activity

Delete route when no node is available.

Browse Source
This commit is contained in:
Milos Gajdos
2019-06-18 11:44:09 +01:00
parent b20dd16f92
commit 2674294cbe
1 changed files with 8 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
router/default_router.go
View File

@@ -118,7 +118,7 @@ func (r *router) Start() error {
return fmt.Errorf("failed to create network registry watcher: %v", err) return fmt.Errorf("failed to create network registry watcher: %v", err)
} }
// we only watch local netwrork entries which we then propagate upstream to network // NOTE: we only watch local netwrork entries which we then propagate upstream to network
tableWatcher, err := r.opts.Table.Watch(WatchNetwork("local")) tableWatcher, err := r.opts.Table.Watch(WatchNetwork("local"))
if err != nil { if err != nil {
return fmt.Errorf("failed to create routing table watcher: %v", err) return fmt.Errorf("failed to create routing table watcher: %v", err)
@@ -225,7 +225,7 @@ func (r *router) manageServiceRoutes(w registry.Watcher, network string, metric
} }
} }
case "delete": case "delete":
if len(res.Service.Nodes) <= 1 { if len(res.Service.Nodes) < 1 {
// only return error if the route is present in the table, but something else has failed // only return error if the route is present in the table, but something else has failed
if err := r.opts.Table.Delete(route); err != nil && err != ErrRouteNotFound { if err := r.opts.Table.Delete(route); err != nil && err != ErrRouteNotFound {
return fmt.Errorf("failed to delete route for service: %v", res.Service.Name) return fmt.Errorf("failed to delete route for service: %v", res.Service.Name)
@@ -268,6 +268,7 @@ func (r *router) watchTable(w Watcher) error {
return fmt.Errorf("failed to parse router into node: %v", err) return fmt.Errorf("failed to parse router into node: %v", err)
} }
// we know that .DestAddr contains the registered service name
service := &registry.Service{ service := &registry.Service{
Name: event.Route.Options().DestAddr, Name: event.Route.Options().DestAddr,
Nodes: []*registry.Node{node}, Nodes: []*registry.Node{node},
@@ -275,21 +276,15 @@ func (r *router) watchTable(w Watcher) error {
switch event.Type { switch event.Type {
case CreateEvent: case CreateEvent:
// only register remotely if the service is "local"
if event.Route.Options().Network == "local" {
if err := r.opts.NetworkRegistry.Register(service, registry.RegisterTTL(120*time.Second)); err != nil { if err := r.opts.NetworkRegistry.Register(service, registry.RegisterTTL(120*time.Second)); err != nil {
return fmt.Errorf("failed to register service %s in network registry: %v", service.Name, err) return fmt.Errorf("failed to register service %s in network registry: %v", service.Name, err)
} }
} case DeleteEvent:
case UpdateEvent:
// only deregister remotely if the service is "local"
if event.Route.Options().Network == "local" {
if err := r.opts.NetworkRegistry.Deregister(service); err != nil { if err := r.opts.NetworkRegistry.Deregister(service); err != nil {
return fmt.Errorf("failed to deregister service %s from network registry: %v", service.Name, err) return fmt.Errorf("failed to deregister service %s from network registry: %v", service.Name, err)
} }
} }
} }
}
return watchErr return watchErr
} }