BUG/MINOR: discovery: reload haproxy on changes

Author: rmaticevic

configure_data_plane.go

@@ -504,7 +504,10 @@ func configureAPI(api *operations.DataPlaneAPI) http.Handler {
 	})
 
 	// set up service discovery handlers
-	discovery := service_discovery.NewServiceDiscoveries(client.Configuration)
+	discovery := service_discovery.NewServiceDiscoveries(service_discovery.ServiceDiscoveriesParams{
+		Client:      client.Configuration,
+		ReloadAgent: ra,
+	})
 	api.ServiceDiscoveryCreateConsulHandler = &handlers.CreateConsulHandlerImpl{Discovery: discovery, PersistCallback: cfg.SaveConsuls}
 	api.ServiceDiscoveryDeleteConsulHandler = &handlers.DeleteConsulHandlerImpl{Discovery: discovery, PersistCallback: cfg.SaveConsuls}
 	api.ServiceDiscoveryGetConsulHandler = &handlers.GetConsulHandlerImpl{Discovery: discovery}

discovery/consul_service_discovery.go

@@ -22,20 +22,23 @@ import (
 	"time"
 
 	"github.com/haproxytech/client-native/v2/configuration"
+	"github.com/haproxytech/dataplaneapi/haproxy"
 	"github.com/haproxytech/models/v2"
 )
 
 type consulServiceDiscovery struct {
 	consulServices map[string]*consulInstance
 	client         *configuration.Client
+	reloadAgent    haproxy.IReloadAgent
 	mu             sync.RWMutex
 }
 
 //NewConsulDiscoveryService creates a new ServiceDiscovery that connects to consul
-func NewConsulDiscoveryService(client *configuration.Client) ServiceDiscovery {
+func NewConsulDiscoveryService(params ServiceDiscoveriesParams) ServiceDiscovery {
 	return &consulServiceDiscovery{
 		consulServices: make(map[string]*consulInstance),
-		client:         client,
+		client:         params.Client,
+		reloadAgent:    params.ReloadAgent,
 	}
 }
 
@@ -57,7 +60,7 @@ func (c *consulServiceDiscovery) AddNode(id string, params ServiceDiscoveryParam
 	instance := &consulInstance{
 		params:  cParams,
 		timeout: timeout,
-		discoveryConfig: NewServiceDiscoveryInstance(c.client, discoveryInstanceParams{
+		discoveryConfig: NewServiceDiscoveryInstance(c.client, c.reloadAgent, discoveryInstanceParams{
 			Whitelist:       cParams.ServiceWhitelist,
 			Blacklist:       cParams.ServiceBlacklist,
 			ServerSlotsBase: int(*cParams.ServerSlotsBase),

discovery/service_discovery.go

@@ -20,6 +20,7 @@ import (
 	"sync"
 
 	"github.com/haproxytech/client-native/v2/configuration"
+	"github.com/haproxytech/dataplaneapi/haproxy"
 )
 
 //ServiceDiscoveryParams configuration for a specific service discovery
@@ -45,19 +46,23 @@ type ServiceDiscoveries interface {
 	UpdateNode(serviceName string, id string, params ServiceDiscoveryParams) error
 }
 
+// ServiceDiscoveriesParams contain the parameters for the service discovery initialization
+type ServiceDiscoveriesParams struct {
+	Client      *configuration.Client
+	ReloadAgent haproxy.IReloadAgent
+}
+
 //NewServiceDiscoveries creates a new ServiceDiscoveries instance
-func NewServiceDiscoveries(client *configuration.Client) ServiceDiscoveries {
+func NewServiceDiscoveries(params ServiceDiscoveriesParams) ServiceDiscoveries {
 	sd := &serviceDiscoveryImpl{
 		services: make(map[string]ServiceDiscovery),
-		client:   client,
 	}
 	//nolint
-	sd.AddService("consul", NewConsulDiscoveryService(client))
+	sd.AddService("consul", NewConsulDiscoveryService(params))
 	return sd
 }
 
 type serviceDiscoveryImpl struct {
-	client   *configuration.Client
 	services map[string]ServiceDiscovery
 	mu       sync.RWMutex
 }

discovery/service_discovery_instance.go

@@ -17,6 +17,7 @@ package discovery
 
 import (
 	"github.com/haproxytech/client-native/v2/configuration"
+	"github.com/haproxytech/dataplaneapi/haproxy"
 )
 
 //ServiceInstance specifies the needed information required from the service to provide for the ServiceDiscoveryInstance.
@@ -44,16 +45,18 @@ type discoveryInstanceParams struct {
 type ServiceDiscoveryInstance struct {
 	services      map[string]*confService
 	client        *configuration.Client
+	reloadAgent   haproxy.IReloadAgent
 	params        discoveryInstanceParams
 	transactionID string
 }
 
 //NewServiceDiscoveryInstance creates a new ServiceDiscoveryInstance.
-func NewServiceDiscoveryInstance(client *configuration.Client, params discoveryInstanceParams) *ServiceDiscoveryInstance {
+func NewServiceDiscoveryInstance(client *configuration.Client, reloadAgent haproxy.IReloadAgent, params discoveryInstanceParams) *ServiceDiscoveryInstance {
 	return &ServiceDiscoveryInstance{
-		client:   client,
-		params:   params,
-		services: make(map[string]*confService),
+		client:      client,
+		reloadAgent: reloadAgent,
+		params:      params,
+		services:    make(map[string]*confService),
 	}
 }
 
@@ -104,7 +107,11 @@ func (s *ServiceDiscoveryInstance) UpdateServices(services []ServiceInstance) er
 	}
 	reload = reload || s.removeDeleted()
 	if reload {
-		return s.commitTransaction()
+		if err := s.commitTransaction(); err != nil {
+			return err
+		}
+		s.reloadAgent.Reload()
+		return nil
 	}
 	s.deleteTransaction()
 	return nil