kemko/nomad
1
0
Fork 0
mirror of https://github.com/kemko/nomad.git synced 2026-01-10 12:25:42 +03:00
Code Issues Packages Projects Releases Wiki Activity
4,207 Commits 1 Branch 0 Tags
66dc946852f69de985c692e7ac1d0f7bf4bfc0e4
Commit Graph

593 Commits

Author SHA1 Message Date
Sean Chittenden
ab434b4079 Fix typo in comment 2016-06-10 15:50:11 -04:00
Sean Chittenden
503c6a996f Fix test TestClientConfigCommand_UpdateServers() 
Now that hostnames are validated on input, switch to IPs since they
bypass DNS resolution.
 2016-06-10 15:50:11 -04:00
Sean Chittenden
f03765814e Add some trace-level logging for /v1/agent/servers when writing 
This endpoint shouldn't be hit often, but this could be useful in
logs down the road.
 2016-06-10 15:50:11 -04:00
Sean Chittenden
37e7038a27 Fix config_parse_test to reflect that consul.addr does not exist. 
`consul.address` does, but not `consul.addr`.
 2016-06-10 15:50:11 -04:00
Sean Chittenden
a55395678f Fix tests for client.TestAgent_ServerConfig 
Add similar logic in Agent `serverConfig()` to set up the
`serverSerfAddr` the same as `serverHttpAddr` and `serverRpcAddr`.
 2016-06-10 15:50:11 -04:00
Sean Chittenden
ed30876186 Change the endpoint for /v1/agent/servers and fix tests. 
When an agent is running a server, the list of servers includes the
Raft peers.  When the agent is running a client (which is always the
case?), include a list of the servers found in the Client's RpcProxy.
Dedupe and provide a unique list back to the caller.
 2016-06-10 15:50:11 -04:00
Sean Chittenden
b9f230b7b2 Move client.DefaultConfig() to client/config.DefaultConfig() 
Resolves an import cycle in testing and is more appropriate because
the default should reside next to its struct definition.
 2016-06-10 15:50:11 -04:00
Sean Chittenden
b2357598ba Register the serf service with the Nomad server service. 
This will be unused in this PR.
 2016-06-10 15:50:11 -04:00
Sean Chittenden
6b8a9b435c Update the nomad_server_service default from nomad-server to just nomad. 2016-06-10 15:50:11 -04:00
Sean Chittenden
d6769f59f7 Create a weak decoder to parse time.Duration. 
Hat tip to Alex for pointing this out (vs patching mapstructure)
 2016-06-10 15:50:11 -04:00
Sean Chittenden
ca0f2d982d Nuke a.consulConfig in favor of a.consul.Config 2016-06-10 15:50:11 -04:00
Sean Chittenden
3d22c22bf5 Remove types.ShutdownChannel and replace with chan struct{} 2016-06-10 15:50:11 -04:00
Sean Chittenden
4d47eedd58 Teach Client to reuse an Agent's consulSyncer. 
"There can be only one."
 2016-06-10 15:50:11 -04:00
Sean Chittenden
bc86e897ed Register two services each for clients and servers, http and rpc. 
In order to give clients a fighting chance to talk to the right port,
differentiate RPC services from HTTP services by registering two
services with different tags.  This yields
`rpc.nomad-server.service.consul` and
`http.nomad-server.service.consul` which is immensely more useful to
clients attempting to bootstrap their world.
 2016-06-10 15:50:11 -04:00
Sean Chittenden
ce8c03d708 Advertise the server's RPC endpoint, not its HTTP endpoint. 
Rename c.serverRpcAddr to serverRpcAddr.  This will be broken out
into in additional set of services in a subsequent commit.
 2016-06-10 15:50:11 -04:00
Sean Chittenden
7cdf0edcfe Rename the package from client/rpc_proxy to client/rpcproxy 
Also rename `NewRpcProxy()` to just `New()` to avoid package stutter.
 2016-06-10 15:50:11 -04:00
Sean Chittenden
1fa43a09dd Reduce all forms of ConsulConfig down to a single struct 
nomad/structs/config/consul.go's ConsulConfig is the canonical definition
for all things Consul now.
 2016-06-10 15:50:11 -04:00
Sean Chittenden
4d30c98aa6 Rename consulConfig to consulAgentConfig 2016-06-10 15:50:11 -04:00
Sean Chittenden
5e0d76f7ce Rename client/config/config's ConsulConfig to ConsulAgentConfig 
A follow up commit to the previous rename.  More to come.
 2016-06-10 15:50:11 -04:00
Sean Chittenden
e6397da738 Centralize the creation of a consul/api.Config struct. 
While documented, the consul.timeout parameter wasn't ever set
except one-off in the Consul fingerprinter.
 2016-06-10 15:50:11 -04:00
Sean Chittenden
71dde1b584 Reconcile consul's address configuration section. 
There were conflicting directives previously, both consul.addr and
consul.address were required to achieve the desired behavior.  The
documentation said `consul.address` was the canonical name for the
parameter, so consolidate configuration parameters to `consul.address`.
 2016-06-10 15:50:11 -04:00
Sean Chittenden
05bbbd2d55 Reconcile renamed structures during rebase 2016-06-10 15:50:11 -04:00
Sean Chittenden
c159e77fe3 An Agent's consulSyncer is always not nil now. 2016-06-10 15:50:11 -04:00
Sean Chittenden
89d48c8e82 Revise Agent.syncAgentServicesWithConsul()'s interface 
Reduce down to its lowest common helper function denominator.
 2016-06-10 15:50:11 -04:00
Sean Chittenden
8da18b60f3 Alpha sort config keys for Consul 2016-06-10 15:50:11 -04:00
Sean Chittenden
d268dcb85d Reduce all forms of ConsulConfig down to a single struct 
nomad/structs/config/consul.go's ConsulConfig is the canonical definition
for all things Consul now.
 2016-06-10 15:50:11 -04:00
Sean Chittenden
f6e3587321 Define a type for the PeriodicCallback handlers and ShutdownChannel 2016-06-10 15:50:11 -04:00
Sean Chittenden
ffcd2332d4 Rebalance Nomad client RPCs among different Nomad servers. 
Implement client/rpc_proxy.RpcProxy.
 2016-06-10 15:50:11 -04:00
Sean Chittenden
7c6ad53d89 Rename NewConsulService to NewSyncer 2016-06-10 15:49:37 -04:00
Sean Chittenden
f280c59633 Rename client/consul/sync.PeriodicSync to Run 2016-06-10 15:49:37 -04:00
Sean Chittenden
d84d71847c Rename client/consul/sync.ConsulService to client/consul/sync.Syncer 
Syncer describes the responsibility and actions of the type.
 2016-06-10 15:49:37 -04:00
Sean Chittenden
092e07f334 Create a nomad/structs/config to break an import cycle. 
Flattening and normalizing the various Consul config structures and
services has led to an import cycle.  Break this by creating a new package
that is intended to be terminal in the import DAG.
 2016-06-10 15:48:36 -04:00
Sean Chittenden
af72200cf4 Distill config.Config.ConsulConfig down to config.Config.Consul 
The enclosed struct provides the necessary context
 2016-06-10 15:48:36 -04:00
Sean Chittenden
1f7bfb30d9 Rename consulConfig to consulAgentConfig 2016-06-10 15:48:36 -04:00
Sean Chittenden
4fed6b0ab5 Rename client/config/config's ConsulConfig to ConsulAgentConfig 
A follow up commit to the previous rename.  More to come.
 2016-06-10 15:48:36 -04:00
Sean Chittenden
0e1bdad2a0 Rename consul.ConsulConfig to consul.AgentConfig 
There were two `ConsulConfig` structs running around, one of them
needed to go away.  Rely on the package's path to provide context
for the type of AgentConfig.
 2016-06-10 15:48:36 -04:00
Sean Chittenden
7db2eb03c4 Use consul/lib's RandomStagger 
Removes four redundant copies of the method in the process.
 2016-06-10 15:48:36 -04:00
Alex Dadgar
359cf00d3d Merge pull request #1252 from hashicorp/f-blocked-eval-text 
Better placement failure text for blocked evals
 2016-06-10 11:41:41 -07:00
Alex Dadgar
185c896ac0 helper 2016-06-10 11:02:15 -07:00
Alex Dadgar
f6aa384efb better placement failure text for blocked evals 2016-06-10 10:56:32 -07:00
Alex Dadgar
693c8f9e42 Alloc-status only shows measured statistics and fixes to CPU calculations 2016-06-10 10:38:29 -07:00
Diptanu Choudhury
b9594f64e5 Merge pull request #1246 from hashicorp/fix-node-cpu-usage 
Changed the logic of calculation of node cpu usage
 2016-06-09 19:29:12 -07:00
Diptanu Choudhury
e4bad88a87 Changed the logic of calculation of node cpu usage 2016-06-10 03:24:42 +01:00
Alex Dadgar
5ffb2f024c Merge pull request #1237 from hashicorp/b-regions 
CLI can forward request to different regions
 2016-06-08 11:00:23 -07:00
Diptanu Choudhury
4fc5eedfa7 Moving the stats error to the bottom of alloc status 2016-06-08 12:28:41 -04:00
Diptanu Choudhury
5b50e01b93 Moving the stats error to the bottom of node status 2016-06-08 12:21:20 -04:00
Diptanu Choudhury
52dd756afe Fixed the formating of % in nomad alloc status 2016-06-08 08:53:33 -04:00
Alex Dadgar
baff94f3ba docs 2016-06-07 11:33:55 -07:00
Alex Dadgar
cc80c2442f Run and plan automatically sets the region 2016-06-07 11:28:07 -07:00
Alex Dadgar
92ea016fa0 Add region flag and environment variable 2016-06-07 11:16:04 -07:00