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

rename cpu_total_compute and docs

This commit is contained in:
Alex Dadgar 2017-03-14 14:15:49 -07:00
parent 1afba8d6e2
commit 177bd14718
6 changed files with 11 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
CHANGELOG.md
View File

@ -22,7 +22,7 @@ IMPROVEMENTS:
* client: Artifact support for git and hg as well as netrc support [GH-2386] * client: Artifact support for git and hg as well as netrc support [GH-2386]
* client: Add metrics to show number of allocations on in each state [GH-2425] * client: Add metrics to show number of allocations on in each state [GH-2425]
* client: Add `NOMAD_{IP,PORT}_<task>_<label>` environment variables [GH-2426] * client: Add `NOMAD_{IP,PORT}_<task>_<label>` environment variables [GH-2426]
* client: Allow specification of cpu_compute to override fingerprinter * client: Allow specification of `cpu_total_compute` to override fingerprinter
[GH-2447] [GH-2447]
* client: Reproducible Node ID on OSes that provide system-level UUID * client: Reproducible Node ID on OSes that provide system-level UUID
[GH-2277] [GH-2277]

2
client/fingerprint/cpu.go
View File

@ -42,7 +42,7 @@ func (f *CPUFingerprint) Fingerprint(cfg *config.Config, node *structs.Node) (bo
f.logger.Printf("[ERR] fingerprint.cpu: %v", err) f.logger.Printf("[ERR] fingerprint.cpu: %v", err)
f.logger.Printf("[INFO] fingerprint.cpu: cpu compute may be set manually"+ f.logger.Printf("[INFO] fingerprint.cpu: cpu compute may be set manually"+
" using the client config option %q on machines where cpu information"+ " using the client config option %q on machines where cpu information"+
" can not be automatically detected.", "cpu_compute") " can not be automatically detected.", "cpu_total_compute")
return false, err return false, err
} }

2
command/agent/config-test-fixtures/basic.hcl
View File

@ -39,7 +39,7 @@ client {
} }
network_interface = "eth0" network_interface = "eth0"
network_speed = 100 network_speed = 100
cpu_compute = 4444 cpu_total_compute = 4444
reserved { reserved {
cpu = 10 cpu = 10
memory = 10 memory = 10

2
command/agent/config.go
View File

@ -183,7 +183,7 @@ type ClientConfig struct {
NetworkSpeed int `mapstructure:"network_speed"` NetworkSpeed int `mapstructure:"network_speed"`
// CpuCompute is used to override any detected or default total CPU compute. // CpuCompute is used to override any detected or default total CPU compute.
CpuCompute int `mapstructure:"cpu_compute"` CpuCompute int `mapstructure:"cpu_total_compute"`
// MaxKillTimeout allows capping the user-specifiable KillTimeout. // MaxKillTimeout allows capping the user-specifiable KillTimeout.
MaxKillTimeout string `mapstructure:"max_kill_timeout"` MaxKillTimeout string `mapstructure:"max_kill_timeout"`

2
command/agent/config_parse.go
View File

@ -336,7 +336,7 @@ func parseClient(result **ClientConfig, list *ast.ObjectList) error {
"chroot_env", "chroot_env",
"network_interface", "network_interface",
"network_speed", "network_speed",
"cpu_compute", "cpu_total_compute",
"max_kill_timeout", "max_kill_timeout",
"client_max_port", "client_max_port",
"client_min_port", "client_min_port",

6
website/source/docs/agent/configuration/client.html.md
View File

@ -58,6 +58,12 @@ client {
clients can determine their speed automatically, and thus in most cases this clients can determine their speed automatically, and thus in most cases this
should be left unset. should be left unset.
- `cpu_total_compute` `(int: 0)` - Specifies an override for the total cpu
compute. This value should be set to `# Cores * Core MHz`. For example, a
quadcore running at 2GHz would have a total compute of 8000 (4 * 2000). Most
clients can determine their total cpu compute automatically, and thus in most
cases this should be left unset.
- `node_class` `(string: "")` - Specifies an arbitrary string used to logically - `node_class` `(string: "")` - Specifies an arbitrary string used to logically
group client nodes by user-defined class. This can be used during job group client nodes by user-defined class. This can be used during job
placement as a filter. placement as a filter.