kemko/nomad
1
0
Fork 0
mirror of https://github.com/kemko/nomad.git synced 2026-01-06 10:25:42 +03:00
Code Issues Packages Projects Releases Wiki Activity

add client updateNodeResources to merge but preserve manual config

Browse Source
This commit is contained in:
Lang Martin
2019-03-27 12:05:39 -04:00
parent 6897825240
commit 84bd433c7e
1 changed files with 27 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

48
client/client.go
View File

@@ -1227,14 +1227,12 @@ func (c *Client) updateNodeFromFingerprint(response *fingerprint.FingerprintResp
}
// COMPAT(0.10): Remove in 0.10
if response.Resources != nil && !resourcesAreEqual(c.config.Node.Resources, response.Resources) {
if updateResources(c.config, response.Resources) {
nodeHasChanged = true
c.config.Node.Resources.Merge(response.Resources)
}
if response.NodeResources != nil && !c.config.Node.NodeResources.Equals(response.NodeResources) {
if updateNodeResources(c.config, response.NodeResources) {
nodeHasChanged = true
c.config.Node.NodeResources.Merge(response.NodeResources)
}
if nodeHasChanged {
@@ -1244,31 +1242,39 @@ func (c *Client) updateNodeFromFingerprint(response *fingerprint.FingerprintResp
return c.configCopy.Node
}
// resourcesAreEqual is a temporary function to compare whether resources are
// equal. We can use this until we change fingerprinters to set pointers on a
// return type.
func resourcesAreEqual(first, second *structs.Resources) bool {
if first.CPU != second.CPU {
// updateNodeResources modifies the client NodeResources, returns whether it did so
func updateNodeResources(c *config.Config, up *structs.NodeResources) bool {
if up == nil {
return false
}
if first.MemoryMB != second.MemoryMB {
if c.NetworkInterface != "" || c.NetworkSpeed != 0 {
// - if a network is configured, keep it
// - the update may contain a change to an automatically
// assigned interface (eg, via the AWS plugin)
// - the update should reflect the active
// fingerprinted network
up.Networks = c.Node.NodeResources.Networks
}
if c.Node.NodeResources.Equals(up) {
return false
}
if first.DiskMB != second.DiskMB {
c.Node.NodeResources.Merge(up)
return true
}
// COMPAT(0.10): Remove in 0.10
// updateResources is updateNodeResources for the Resources type
func updateResources(c *config.Config, up *structs.Resources) bool {
if up == nil {
return false
}
if len(first.Networks) != len(second.Networks) {
if c.NetworkInterface != "" || c.NetworkSpeed != 0 {
up.Networks = c.Node.Resources.Networks
}
if c.Node.Resources.Equals(up) {
return false
}
for i, e := range first.Networks {
if len(second.Networks) < i {
return false
}
f := second.Networks[i]
if !e.Equals(f) {
return false
}
}
c.Node.Resources.Merge(up)
return true
}