Skip to content

Commit

Permalink
Invoke FingerprintManager's Reload() func during agent's SIGHUP (#14615)
Browse files Browse the repository at this point in the history
Fixes #14614
  • Loading branch information
pruiz committed Oct 6, 2022
1 parent 2b9158b commit 536260c
Show file tree
Hide file tree
Showing 2 changed files with 10 additions and 2 deletions.
3 changes: 3 additions & 0 deletions .changelog/14615.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
```release-note:bug
client: Fixed a bug where network fingerprinters were not reloaded when the client configuration was reloaded with SIGHUP
```
9 changes: 7 additions & 2 deletions client/client.go
Original file line number Diff line number Diff line change
Expand Up @@ -298,6 +298,9 @@ type Client struct {
endpoints rpcEndpoints
streamingRpcs *structs.StreamingRpcRegistry

// fingerprintManager is the FingerprintManager registered by the client
fingerprintManager *FingerprintManager

// pluginManagers is the set of PluginManagers registered by the client
pluginManagers *pluginmanager.PluginGroup

Expand Down Expand Up @@ -441,14 +444,14 @@ func NewClient(cfg *config.Config, consulCatalog consul.CatalogAPI, consulProxie
return nil, fmt.Errorf("node setup failed: %v", err)
}

fingerprintManager := NewFingerprintManager(
c.fingerprintManager = NewFingerprintManager(
cfg.PluginSingletonLoader, c.GetConfig, cfg.Node,
c.shutdownCh, c.updateNodeFromFingerprint, c.logger)

c.pluginManagers = pluginmanager.New(c.logger)

// Fingerprint the node and scan for drivers
if err := fingerprintManager.Run(); err != nil {
if err := c.fingerprintManager.Run(); err != nil {
return nil, fmt.Errorf("fingerprinting failed: %v", err)
}

Expand Down Expand Up @@ -743,6 +746,8 @@ func (c *Client) Reload(newConfig *config.Config) error {
return c.reloadTLSConnections(newConfig.TLSConfig)
}

c.fingerprintManager.Reload()

return nil
}

Expand Down

0 comments on commit 536260c

Please sign in to comment.