PLAT-1315 Apply patch from hashicorp#16663 (comment)

stayforlong · May 26, 2023 · e84f143 · e84f143
1 parent 478dbf1
commit e84f143
Showing 1 changed file with 2 additions and 3 deletions.
diff --git a/agent/agent.go b/agent/agent.go
@@ -673,8 +673,7 @@ func (a *Agent) Start(ctx context.Context) error {
 	}
 
 	// Load checks/services/metadata.
-	emptyCheckSnapshot := map[structs.CheckID]*structs.HealthCheck{}
-	if err := a.loadServices(c, emptyCheckSnapshot); err != nil {
+	if err := a.loadServices(c, nil); err != nil {
 		return err
 	}
 	if err := a.loadChecks(c, nil); err != nil {
@@ -4140,7 +4139,7 @@ func (a *Agent) reloadConfigInternal(newCfg *config.RuntimeConfig) error {
 	}
 
 	// Reload service/check definitions and metadata.
-	if err := a.loadServices(newCfg, snap); err != nil {
+	if err := a.loadServices(newCfg, nil); err != nil {
 		return fmt.Errorf("Failed reloading services: %s", err)
 	}
 	if err := a.loadChecks(newCfg, snap); err != nil {