luxolus
/
open-nomad
2
0
Fork 0
Code Issues 1 Pull Requests Packages Releases Wiki Activity

0 compute == error

This commit is contained in:
Michael Schurter 2017-07-03 13:25:33 -07:00
parent 0f65a56627
commit b2382f99f2
1 changed files with 12 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
client/fingerprint/cpu.go
View File

@ -59,19 +59,20 @@ func (f *CPUFingerprint) Fingerprint(cfg *config.Config, node *structs.Node) (bo
tt = cfg.CpuCompute
}
// Set the node compute resources if they are detected/configured
if tt > 0 {
node.Attributes["cpu.totalcompute"] = fmt.Sprintf("%d", tt)
if node.Resources == nil {
node.Resources = &structs.Resources{}
}
node.Resources.CPU = tt
} else {
f.logger.Printf("[INFO] fingerprint.cpu: cannot detect cpu total compute. "+
// Return an error if no cpu was detected or explicitly set as this
// node would be unable to receive any allocations.
if tt == 0 {
return false, fmt.Errorf("cannot detect cpu total compute. "+
"CPU compute must be set manually using the client config option %q",
"cpu_total_compute")
}
node.Attributes["cpu.totalcompute"] = fmt.Sprintf("%d", tt)
if node.Resources == nil {
node.Resources = &structs.Resources{}
}
node.Resources.CPU = tt
return true, nil
}