ed23dff23c
Merge pull request #1571 from hashicorp/t-logs-tests
...
Fixing logs tests on travis
2016-08-11 19:24:46 -07:00
b3dca54a1a
Wrap file rotator tests in wait for
2016-08-11 19:23:03 -07:00
8323b6a0b5
only use polling
2016-08-11 18:59:48 -07:00
b71f687f62
Merge pull request #1413 from hashicorp/b-tests
...
Fix flaky tests
2016-08-11 18:15:29 -07:00
2614b0f06e
Update task_runner_test.go
2016-08-11 18:01:27 -07:00
ac7749f70e
Fix task runner test
2016-08-11 13:16:17 -07:00
fe13453012
Update after the review
2016-08-11 10:53:33 +09:00
c3b871e90d
Return error when client failed to collect host stats
2016-08-11 09:38:28 +09:00
9a75052d2c
Merge pull request #1518 from pubnub/feature/chroot-map-rebase
...
Add config field to specify chroot mapping for exec driver
2016-08-10 17:00:03 -07:00
28b3f511e0
Fixed some error messages
2016-08-10 15:17:32 -07:00
1b74f863fe
Merge pull request #1533 from nak3/fix-error-in-client
...
tiny: Return fmt.Errorf instead of duplicated error messages
2016-08-10 15:13:47 -07:00
6ec6c27cb4
Update debug option from string to bool
2016-08-09 16:51:00 +09:00
11a8a7218e
Add debug option to rkt task config
2016-08-09 09:01:05 +09:00
6a810e6f1e
Update after review
2016-08-09 08:57:26 +09:00
5c621b74e5
tiny: Return fmt.Errorf instead of duplicated error messages
2016-08-09 08:57:26 +09:00
09113ffbc8
Fix Linux executor isolation test
...
- Properly expects the hard-coded mounts (alloc, dev, and proc) and hardcoded local directories (local and tmp)
- Also verifies that etc contains only the requested paths
2016-08-08 14:04:09 -07:00
c0ec1b2101
Merge pull request #1532 from nak3/fix-fingerprint-cpu-log
...
tiny: Fix duplicated error message in CPU fingerprint
2016-08-08 13:44:49 -04:00
70d2f8ef1d
Merge pull request #1534 from nak3/fix-intask_runner
...
tiny: print task name and error message for SaveState error
2016-08-08 13:37:25 -04:00
e7863ea8ee
tiny: print task name and error message for the SaveState error in task_runner
2016-08-07 13:33:58 +09:00
71371fc592
tiny: Fix duplicated error message in CPU fingerprint
2016-08-07 12:49:40 +09:00
60b58eed84
Update GetArtifact by removing unused logger
2016-08-06 23:37:32 +09:00
fb178a1f5f
Merge pull request #1477 from nak3/add-syslog_server-test
...
Add Syslog server start shutdown test
2016-08-05 12:01:24 -07:00
ddd8adce96
changelog + use driver config
2016-08-05 10:55:20 -07:00
f8e4bc73c9
Merge pull request #1493 from nak3/rkt-fix1
...
Pass command and trust_prefix to the validation of rkt task configuration
2016-08-05 10:52:02 -07:00
096956257d
changelog
2016-08-05 10:47:44 -07:00
fc1195b7ea
Add Syslog server start shutdown test
2016-08-06 02:01:33 +09:00
b688261a99
Set windows containers default network mode to 'nat'
2016-08-05 06:01:26 +02:00
2ae059b41d
Address review comments
...
- Simplify map length check in Linux Executor
- Added a `chroot_env` test for config parser
- Moved `ChrootEnv` field from ExecutorCommand to ExecutorContext
- Added a test for `chroot_env` functionality
2016-08-04 15:33:06 -07:00
5ff750db96
Merge pull request #1501 from hashicorp/f-stats-opt-in
...
Allow operators to opt into publishing node and alloc metrics
2016-08-04 13:33:56 -07:00
531b619ce4
Merge pull request #1475 from mwieczorek/windows-hostIp-portBindings
...
Empty host ip for windows containers port bindings
2016-08-04 13:30:43 -07:00
1fe4158097
Merge pull request #1519 from vrenjith/master
...
Remove docker volumes while removing container
2016-08-04 12:54:00 -07:00
24e8f752ab
Add chroot_env to Java driver (which uses the exec driver internally)
2016-08-04 11:15:35 -07:00
cd12645e4c
Add TestRktTaskValidate
2016-08-04 23:15:13 +09:00
bf27963903
Add TestRktTrustPrefix
2016-08-04 17:26:10 +09:00
1176fd123e
Pass command and trust_prefix to the validation of rkt task configuration
2016-08-04 17:24:56 +09:00
41cf7cc623
Update docker.go
...
Remove container volumes
2016-08-04 11:43:50 +05:30
4e603e1306
Update checks_test.go
...
Remove docker volumes while exiting container
2016-08-04 11:42:47 +05:30
7df692226a
Add config field to specify chroot mapping for exec driver
...
- Same format as used by the internal chroot mapping
- Map: source_path -> dest_path
- Example HCL:
client {
chroot_env {
"/etc" = "/etc"
"/lib" = "/lib"
"/opt/projects/foo/bin" = "/usr/bin"
}
}
2016-08-03 17:17:17 -07:00
0727db4ca0
Test configuration of Docker working directory
2016-08-03 16:35:49 +02:00
d91f7dbdf8
Docker driver: allow to configure working directory
2016-08-03 16:18:15 +02:00
47f5c8f523
use priviledge of the config
2016-08-02 16:10:15 -07:00
cec6d8a1eb
remove gating of ipc, user ns and pidmode based on hosts priviledge mode config
2016-08-02 16:02:34 -07:00
acbee08a0a
Fix typo: atttempts
2016-08-02 18:11:03 +02:00
41b540fbc8
Allow operators to opt into publishing node and alloc metrics
2016-08-01 19:52:20 -07:00
e8ce8408a4
Fix gofmt in restarts_test.go
2016-07-30 21:11:06 +09:00
777bdf4a1e
fix setup consul syncer error message
2016-07-28 22:14:52 -05:00
2999c12ef1
disable swap
2016-07-28 12:17:00 -07:00
4b82b6c3d4
Empty host ip for windows containers port bindings
2016-07-28 00:00:57 +02:00
50842b88c7
Fixed some bugs
2016-07-25 17:26:38 -07:00
42df093939
Merge pull request #1456 from hashicorp/b-system-job
...
Node Register handles transistioning to ready and creating evals
2016-07-25 12:46:35 -07:00
3ea95bb91c
initial log api impl
2016-07-25 11:16:01 -07:00
84c3711989
Merge pull request #1457 from hashicorp/f-kill-event
...
Add killing event and mark task as not running when killed
2016-07-22 17:33:18 -07:00
3ec9cf3e0d
Merge pull request #1454 from hashicorp/b-blocking-stats
...
Driver Kill() does not block Stats()
2016-07-22 17:29:52 -07:00
b6b3e24541
Link speed for windows network fingerprinting - tests
2016-07-22 22:49:03 +02:00
90748cedad
Add killing event and mark task as not running when killed
2016-07-21 15:49:54 -07:00
ebac5cb283
Node.Register handles the case of transistioning to ready and creating evals
2016-07-21 15:22:02 -07:00
898435d372
Retrieve task runners in helper
2016-07-21 13:41:01 -07:00
679fefc155
Link speed for windows network fingerprinting
2016-07-20 22:13:50 +02:00
22af229cef
Merge pull request #1321 from mwieczorek/f-windows-binds
...
Volume binds for windows containers
2016-07-18 10:20:44 -06:00
c8e7b909c7
Merge pull request #1404 from hashicorp/f-streaming
...
Implement a streaming API and tail in the fs command
2016-07-12 17:23:04 -06:00
661d100f2f
address comments
2016-07-12 17:01:33 -06:00
807bf3cf6c
tests wait for the container to start
2016-07-12 11:36:06 -06:00
caa0e48841
Debug timeout
2016-07-12 11:07:05 -06:00
e1d68f3e9b
Docker host network test
2016-07-12 10:59:34 -06:00
9085b5ca0d
Merge pull request #1405 from novilabs/delay-on-startup-failure
...
do not fail for multiple startup failures, delay instead
2016-07-12 09:51:40 -06:00
d7fe56ecf3
test policy delay for startup error
2016-07-11 20:54:36 -05:00
dd314ea06e
if policy mode is delay, do not fail for multiple startup failures, delay instead
2016-07-11 20:40:53 -05:00
ed3be34105
Introduced an env var for rkt tests
2016-07-11 15:48:16 -06:00
4e0b621ffa
Skipping travis tests and not installing rkt on travis
2016-07-11 15:10:09 -06:00
a9b3f5e552
Alpha-sort the build platforms
2016-07-11 12:23:46 -07:00
267198742f
Merge branch 'master' into f-resource-isolation-fingerprinter
2016-07-11 12:23:09 -07:00
d309649ada
Darwin currently has allocdir support.
...
Pointed out by: @dadgar
2016-07-11 12:19:17 -07:00
20d87f1782
Remove cgroup fingerprinter from non-linux systems.
...
If someone wants to extend or reuse Cgroup detenction in the future they
can move `cgroup_linux.go` to `cgroup.go` and add the relevant build
tags.
Requested by: @dadgar
2016-07-11 12:16:56 -07:00
e2909db9ef
Merge pull request #1388 from novilabs/support-docker-syslog-unixformat-and-defaultformat
...
Support docker syslog unixformat and defaultformat
2016-07-11 11:17:30 -07:00
f11b1ce079
Get windows to build
2016-07-11 11:52:41 -06:00
e9ffadfdc6
initial comments
2016-07-11 10:58:18 -06:00
9966169596
Merge branch 'f-resource-isolation-cleanup' into f-resource-isolation-fingerprinter
2016-07-11 00:10:21 -07:00
d20c5fc327
Merge pull request #1402 from hashicorp/f-resource-isolation-cleanup
...
Resource isolation cleanup
2016-07-11 02:09:35 -05:00
be272168c7
Rename resourceContainer{,Context} and resCon{,Ctx}.
2016-07-11 00:02:55 -07:00
1c14e01ac0
Add a comment describing IsolationConfig
2016-07-10 23:45:44 -07:00
5e2e5b6ccc
Merge branch 'b-exec-cleanup' into f-resource-isolation-cleanup
2016-07-10 23:41:04 -07:00
cf6b97ec6c
Merge pull request #1400 from hashicorp/b-exec-cleanup
...
Initialize the list of available fingerprinters per platform.
2016-07-10 23:22:02 -07:00
f39e84b672
Improve readability: use of a switch vs two if's
2016-07-10 20:18:57 -07:00
2ffbeee06c
Skip the network fingerprinter test when offline.
...
Conditionalize the network fingerprinter test so that it works when a
user is offline. Similarly, when the network fingerprint test fails in
the future pass a HINT to the user to set an env var to allow the test
to be skipped in the future.
2016-07-10 20:16:06 -07:00
2983bd6fce
Fix test for non-Linux platforms.
...
The following tests now check a whitelist for whether or not their
driver is present or not, or if the OS is supported or not.
* `TestAllocDir_MountSharedAlloc`
* `TestClient_Drivers_InWhitelist` (`exec` driver)
* `TestClient_Drivers` (`exec` driver)
* `TestJavaDriver_Fingerprint` (`java` driver)
2016-07-10 15:19:49 -07:00
710173e9cb
Build the Cgroup fingerprinter on only Linux.
...
Change the logic from `!linux` to an empty build tag so that *if*
another platform picks up Cgroups support they can add themselves to the
necessary build tags for this fingerprinter and be on their way.
Because this technology isn't inherently Linux-specific and isn't
mutually exclusive of other resource isolation containers, resist the
urge to rename the Cgroup fingerprinter to something generic like the
ResourceContainerFingerprinter.
2016-07-10 13:55:06 -07:00
51ae7ace25
initial tail impl
2016-07-10 13:57:04 -04:00
d4fe69ddf9
Update comments and pushdown a lock into the resource container
2016-07-10 00:12:59 -07:00
fc9cd8d4af
Push down the Linux-specific bits into resourceContainer
2016-07-10 00:06:53 -07:00
6fc269d2a6
Move unit tests around into per-platform where appropriate.
2016-07-09 23:56:31 -07:00
a5dc6c2da9
Push the Client's cleanup of Cgroups down
2016-07-09 23:45:33 -07:00
5dbc0bf382
Rename resourceContainer.cleanup() to executorCleanup()
...
Not to be confused with the imminent ClientCleanup().
2016-07-09 23:25:33 -07:00
5f8f0a50ac
Begin cgroup pushdown into platform specific files
2016-07-09 23:01:14 -07:00
bdd7022fdc
Centralize the fingerprintrs.
...
Add platform specific fingerprinters per platform.
Requested by: @diptanu
2016-07-09 22:31:14 -07:00
1e2e0ca050
Initialize the list of available fingerprinters per platform.
2016-07-09 00:22:42 -07:00
5b39a5db40
Fixed a debug message
2016-07-09 00:12:53 -07:00
e5310b76a6
Merge pull request #1399 from hashicorp/b-exec-cleanup
...
WIP: Cleanup exec driver
2016-07-09 00:08:43 -07:00
03c571c61b
Consolidate fingerprinters into a single `map`.
2016-07-08 23:37:14 -07:00
7530b27014
Move all non-Linux Fingerprinter items to the default exec driver
2016-07-08 18:35:46 -07:00
5d61fa01f1
Fixed tests
2016-07-08 18:27:51 -07:00
3c4002c48b
Fixed the client tests
2016-07-08 17:49:58 -07:00
1784d98182
Fixed the host port environment variable
2016-07-08 15:37:44 -07:00
921a6c889c
remove the expected leading space, after the colon in syslog
2016-07-06 11:08:24 -05:00
07a9e15560
get into the hour minute second part of the time before looking for spaces, and then looking for the : seperator
2016-07-06 11:08:24 -05:00
c35b1be845
Set running when restoring
2016-06-28 13:47:59 -07:00
a73422b4ff
Fix docker driver lockup during nomad boot
...
Unit mismatch caused docker driver to wait almost indefinitely during boot
(when one or more containers were a bit uncooperative during StopContainer())
This should fix problems described in #1202
2016-06-28 14:26:47 +02:00
d1e7d9c50f
write state to temp file and then rename
2016-06-27 12:29:33 -05:00
f094969c7b
Update failing tests
2016-06-23 11:28:17 -04:00
14e950f882
Treat float as int
2016-06-22 15:09:39 -07:00
4ff8edd2da
Floor CPU MHz and total compute and mark hostname as unique
2016-06-22 15:01:36 -07:00
0a10873aa6
Merge pull request #1335 from hashicorp/f-set-docker-timeout
...
Setting a timeout in the docker client
2016-06-21 17:00:14 -07:00
2837d3395d
Setting a timeout in the docker client
2016-06-21 16:58:21 -07:00
1d5c5b18f3
Making SSL default
2016-06-21 16:41:14 -07:00
8bdb38d016
Code golf
...
Pointed out by: @dadgar
2016-06-21 14:26:01 -07:00
df4fe2e502
Fix the shuffling of remote datacenters.
...
Pointed out by: @ryanuber
2016-06-21 13:37:22 -07:00
88ac1b33a4
Not emitting per-pid stats and added the total ticks consumed by a Task
2016-06-20 17:30:25 -07:00
19024f4da0
Merge pull request #1322 from hashicorp/b-docker-logs-splicing
...
Make line copy to avoid being overriden by subsequent scans
2016-06-20 13:17:49 -07:00
661dc200f3
Make line copy to avoid being overriden by subsequent scans
2016-06-20 13:14:43 -07:00
67a04bb1cc
Volume binds for windows containers
2016-06-20 21:46:33 +02:00
3cd9c9590b
guard against NaN
2016-06-20 10:29:46 -07:00
7b83503596
finer grain locking
2016-06-20 10:19:06 -07:00
744270590b
Guard against bad restore
2016-06-17 14:58:53 -07:00
c9f7467ccb
Driver tests use client default config
2016-06-17 14:24:49 -07:00
7b9961f09b
Initialize the stats helpers before accessing them for the first time
2016-06-17 13:23:30 -07:00
9cb649d247
Merge pull request #1307 from hashicorp/f-fingerprint-cpus
...
F fingerprint cpus
2016-06-17 12:23:40 -07:00
9e287858de
Merge pull request #1310 from hashicorp/b-logger
...
Create and pass only one `logger` object around per Agent
2016-06-17 12:16:35 -07:00
21b84fc3e6
Memoize the CPU stats. Error if CPU fingerprinting fails.
2016-06-17 12:13:53 -07:00
27c6398639
debug message when stopping container
2016-06-17 11:52:44 -07:00
686c125fea
Record and use only the first Mhz from the CPU fingerprinter.
...
Assume all cores are the same speed.
2016-06-17 11:06:57 -07:00
46e2d54acf
Provide `nomad.Config` with a default `LogOutput` of `os.StdErr`
2016-06-17 06:44:10 -07:00
9a60999100
Pass a logger arg to `NewClient` and `NewServer`
2016-06-16 23:29:23 -07:00
4cc90753f8
In the debug log, split the unit from the measurement
...
awk(1) friendly is UNIX(tm) friendly.
2016-06-16 23:07:13 -07:00
2dcb591cd8
Warn when we're unable to fingerprint the CPU Mhz
2016-06-16 23:07:13 -07:00
b8e63411c0
Explicitly call `cpu.Counts()` to determine the CPU core count
...
Much safer than counting the number of InfoStat structs returned.
2016-06-16 23:07:13 -07:00
d17af396ca
Create config.DefaultConsulConfig()
2016-06-16 20:41:05 -07:00
fd18eb7fdb
Only register the Client services reaper when `consul.auto_advertise` is enabled
2016-06-16 18:24:58 -07:00
1ce2cc6141
`conf` -> `config`
2016-06-16 17:05:29 -07:00
015248a67f
Fix tests for NewServer() in client mode.
...
Pointy-hat: sean-
I'm positive I've done this before.
2016-06-16 16:34:22 -07:00
952b6ce7b5
Only auto-join clients if `client_auto_join` is true
2016-06-16 14:47:21 -07:00
ec77a1869e
Test for errors
2016-06-16 14:43:46 -07:00
af55b74114
Merge pull request #1276 from hashicorp/f-consul-server-autojoin
...
Teach Nomad servers how to fall back to Consul.
2016-06-16 14:40:45 -07:00
ed67f1a347
Merge pull request #1285 from hashicorp/fix-selinux-options
...
Added a client options for setting selinux options
2016-06-16 22:45:24 +02:00
266c417ac8
Changed the client options for docker volume selinux labels
2016-06-16 21:41:02 +01:00
fe588a2469
Guard against restoring a nil task in task_runner
2016-06-16 11:55:40 -07:00
008d75184b
Use the `%+q` verb in log messages (vs `%q`).
2016-06-16 11:03:51 -07:00
7375d828e1
remove trace
2016-06-15 15:47:59 -07:00
5e0ced2ae7
Shuffle all datacenters vs only the nearest N datacenters.
...
Per discussion, we want to be aggressive about fanning out vs possibly
fixating on only local DCs. With RPC forwarding in place, a random walk
may be less optimal from a network latency perspective, but it is guaranteed
to eventually result in a converged state because all DCs are candidates
during the bootstrapping process.
2016-06-15 12:40:51 -07:00
2123460cf0
Bump various Consul search limits
...
Client: Search limit increased from 4 random DCs to 8 random DCs, plus nearest.
Server: Search factor increased from 3 to 5 times the bootstrap_expect.
This should allow for faster convergence in large environments (e.g.
sub-5min for 10K Consul DCs).
2016-06-15 12:40:51 -07:00
cf99fc3173
Use Status.Peers instead of Status.Ping
2016-06-15 12:00:20 -07:00
fa216199ce
Added documentation
2016-06-15 02:42:15 +02:00
e08083acfe
Added a client options for setting selinux options
2016-06-15 02:33:09 +02:00
6e22b680ce
Disambiguate `auto_join` from `auto_register`, rename reg to `auto_advertise`.
...
Provide an option that describes the value to the user vs the
operation performed by the software. Momentarily introducing
`auto_join`
2016-06-14 12:11:38 -07:00
4b04e503f3
address comments
2016-06-13 17:32:18 -07:00
8bbf4a55e5
Fix IDs and domain scoping
2016-06-13 16:30:58 -07:00
d019d8ef8e
implemented reconciliation of unwanted services
2016-06-13 14:52:26 +02:00
232654cdee
register checks
2016-06-12 21:28:56 -07:00
a82c2bb058
Do not reconcile in client and cleanup executor a bit
2016-06-12 18:22:07 -07:00
8e231fa382
Rename ConsulService back to Service
2016-06-12 16:36:49 -07:00
e931b42473
unify cli output
2016-06-12 13:16:07 -07:00
6ef4bfd6bf
skip docker test if no docker found
2016-06-12 11:28:43 -07:00
2628827b7c
Merge pull request #1262 from hashicorp/remove-artifact-check
...
Removing artifact check for java and qemu drivers
2016-06-12 11:21:18 -07:00
c4a819528a
Merge pull request #1260 from hashicorp/f-alloc-stats-struct
...
Allocation resources returned in a struct
2016-06-12 11:18:57 -07:00
b671cd4134
Test fixes
2016-06-12 11:14:17 -07:00
fdda90229f
only support latest and remove ring buffer
2016-06-12 09:32:38 -07:00
34f85baab0
Fix the calculation of total ticks for docker and exec
2016-06-12 18:08:35 +02:00
beb362e202
Setting a flag to indicate whether fs isolation is indeed happening
2016-06-12 15:43:24 +02:00
641cf50682
Not converting the abs path relative to task dir for drivers which enforce FS isolation only in linux
2016-06-12 13:54:30 +02:00
e952540f6f
Allocation resources returned in a struct
2016-06-11 21:04:10 -07:00
a5e81ebc3a
Removing un-used code
2016-06-12 01:23:49 +02:00
86e4f295da
Fixed the calculation of the host node ticks
2016-06-12 01:14:51 +02:00
2f036231e5
Merge pull request #1201 from hashicorp/f-dyn-server-list
...
Dynamic Server Lists/Client Bootstrapping via consul.
2016-06-11 18:58:25 -04:00
92e2cfb0ad
Walk the DCs from nearest to most remote.
2016-06-11 18:52:21 -04:00
2968545201
Walk the DCs from nearest to most remote, no limit on the search.
2016-06-11 18:23:06 -04:00
917766a3df
Prefer `%+q` over `%q` in log messages.
2016-06-11 18:17:20 -04:00
445783889b
Remove default values and use nil for the executor. Much better.
2016-06-11 17:52:09 -04:00
0fad17a1a9
Merge pull request #1258 from hashicorp/fix-statsd-metric-type
...
Emitting client resource usage metrics as guages instead of k/v pairs
2016-06-11 13:18:52 -07:00
fd60cfd585
Emitting client resource usage metrics as guages instead of k/v pairs
2016-06-11 22:17:32 +02:00
19f4adbcf1
Using a different client for collecting stats and waiting on containers
2016-06-11 20:37:29 +02:00
7fb507e810
Moving the clkspeed code to helper
2016-06-11 17:31:49 +02:00
f891fa0ec8
Perform a nil-check for Executor's consulServices.
...
Executors can `Shutdown()` before calling `SyncServices()`.
2016-06-10 23:43:54 -04:00
bbd8dfa798
goling(1) compliance pass (e.g. Rpc* -> RPC)
2016-06-10 23:38:28 -04:00
bc771d35df
Query for the Nomad service across multiple Consul datacenters.
2016-06-10 23:05:14 -04:00
d433001f04
Expose rpcproxy's `ServerEndpoint()` constructor, `newServer()` as `NewServerEndpoint()`
2016-06-10 22:14:03 -04:00
59540c3e93
Extracted a method for getting clock speed
2016-06-11 02:07:28 +02:00
f94f89b6d7
Pruning out pids which are no longer present
2016-06-11 01:40:52 +02:00
0a9a3918d6
Not reset-ing the list of pids if they don't change
2016-06-11 01:19:50 +02:00
c38a6fb3c5
Implementing the total ticks per task for the docker driver
2016-06-10 23:33:25 +02:00
01054db4fa
Calculating total ticks consumed in the nomad client
2016-06-10 23:14:33 +02:00
5b0c2bf282
Restore old behavior and have AddPrimaryServer() return a pointer to the existing server (vs nil when the server already exists).
2016-06-10 16:46:49 -04:00
2d3798b076
Calculating the cpu ticks in nomad client
2016-06-10 22:22:32 +02:00
df896c6ef2
Prevent duplicate servers being added in AddPrimaryServer.
...
This logic was already present elsewhere and was missed in this one
place.
2016-06-10 15:55:27 -04:00
d99467ef5e
Always create a consul.Syncer. Use a default Consul Config if necessary.
2016-06-10 15:55:27 -04:00
f6a0459ae5
Always create a consul.Syncer. Use a default Consul Config if necessary.
2016-06-10 15:55:27 -04:00
03846fb754
Rename listLock to activatedListLock
2016-06-10 15:54:39 -04:00
4c9067310b
Nomad does not use Serf at the client level. Use a hard lock.
2016-06-10 15:54:39 -04:00
26b1e826d7
golint(1) police
2016-06-10 15:54:39 -04:00
974c9927c7
Formatting nit: remove brackets
2016-06-10 15:54:39 -04:00
1371ef85f5
Prefix all log entries in client/rpcproxy with client.rpcproxy
2016-06-10 15:54:39 -04:00
009495c18a
Style nit: remove `var` block
2016-06-10 15:54:39 -04:00
f139d0c68b
Properly guard consulPullHeartbeatDeadline behind heartbeatLock
2016-06-10 15:54:39 -04:00
8dc16ad5e3
Move RPCProxy.New() adjacent to its struct definition
2016-06-10 15:54:39 -04:00
cc6e8792e0
Create a consulContext using a client's consul config.
...
This is wrong and should be the Agent's Consul Config. This is a
step in the right direction, so committing to mark the necessary
future change.
2016-06-10 15:54:39 -04:00
ed29946f5e
Populate the RPC Proxy's server list if heartbeat did not include a leader.
...
It's possible that a Nomad Client is heartbeating with a Nomad server that
has become issolated from the quorum of Nomad Servers. When 3x the
heartbeatTTL has been exceeded, append the Consul server list to the primary
primary server list. When the next RPCProxy rebalance occurs, there is a
chance one of the servers discovered from Consul will be in the majority.
When client reattaches to a Nomad Server in the majority, it will include
a heartbeat and will reset the TTLs *AND* will clear the primary server list
to include only values from the heartbeat.
2016-06-10 15:54:39 -04:00
9a223936bb
Generate and sync Consul ServiceIDs consistently
2016-06-10 15:54:39 -04:00
3892a0433e
Move the start of the UniversalExecutor's consulSyncer to initialize once
...
This should be handled via a sync.Once primative, but I don't want to
unpack that atm.
2016-06-10 15:54:39 -04:00
7956eb0c80
Rename structs.Task's `Service` attribute to `ConsulService`
2016-06-10 15:54:39 -04:00
8c813630e6
Move package client/consul/sync to command/agent/consul.
...
This has been done to allow the Server and Client to reuse the same
Syncer because the Agent may be running Client, Server, or both
simultaneously and we only want one Syncer object alive in the agent.
2016-06-10 15:54:39 -04:00
d6ef97911b
Rename Syncer.SetServiceIdentifier to SetServiceRegPrefix()
...
This attribute isn't actually an identifier because it can represent
a collection of services. Rename `serviceIdentifier` to
`serviceRegPrefix which more accurately conveys the intention of this
Syncer attribute.
While here, also rename `SetServiceIdentifier()` to `SetServiceRegPrefix()`
and `GenerateServiceIdentifier()` to `GenerateServicePrefix()`.
2016-06-10 15:54:39 -04:00
6b126ce488
Change the API signature of Syncer.SyncServices().
...
SyncServices() immediately attempts to sync whatever information
the process has with Consul. Previously this method would take an
argument of the exclusive list of services that should exist,
however this is not condusive to having a Nomad Client and Nomad
Server share the same consul.Syncer.
2016-06-10 15:54:39 -04:00
fda03c5c9e
Change the signature of the PeriodicCallback to return an error
...
I *KNEW* I should have done this when I wrote it, but didn't want to
go back and audit the handlers to include the appropriate return
handling, but now that the code is taking shape, make this change.
2016-06-10 15:54:39 -04:00
4973ec32bb
Rename structs.Services to structs.ConsulServices
2016-06-10 15:54:39 -04:00
6430190d6a
Rename createCheck() to createDelegatedCheck() for clarity
2016-06-10 15:54:39 -04:00
555f4fe135
Change client/consul.NewSyncer() to accept a shutdown channel
...
In addition to the API changing, consul.Syncer can now be signaled
to shutdown via the Shutdown() method, which will call the Run()'ing
sync task to exit gracefully.
2016-06-10 15:54:39 -04:00
439baa0f8b
Remove named return parameters
2016-06-10 15:50:11 -04:00
ea0b35e303
Collapse server_endpoint_internal_test.go into server_endpoint_test.go
...
Requested by: @dadgar
2016-06-10 15:50:11 -04:00
6e71bbc26b
Collapse rpcproxy_internal_test.go into rpcproxy_test.go
...
Requested by: @dadgar
2016-06-10 15:50:11 -04:00
4b021b79b0
Bump the default Consul client timeout from 500ms to 5s.
...
Requsted by: @dadgar
2016-06-10 15:50:11 -04:00
747a794c77
Move `const` block to the top of the file.
...
Requested by: @dadgar
2016-06-10 15:50:11 -04:00
484816f5e0
Ensure that all accesses to Client.alloc are wrapped by allocLock.
2016-06-10 15:50:11 -04:00
08cab4fdfa
Use client.getAllocRunners() where appropriate.
2016-06-10 15:50:11 -04:00
f9d0b9da32
Line wrap long line.
2016-06-10 15:50:11 -04:00
0d201631a3
Rename rpcproxy.UpdateFromNodeUpdateResponse to RefreshServerLists
...
While breaking the API within this PR, break out the individual
arguments to RefreshServerLists. The servers parameter is reusing
`structs.NodeServerInfo` for the time being, but this can be revisited
if the needs of the strucutre diverge in the future.
2016-06-10 15:50:11 -04:00
0997fb1669
Fix up the comments
...
Pointed out by: @dadgar
2016-06-10 15:50:11 -04:00
aaa7d6bf40
Make the locking protocol more explicit in client.NewClient
...
With an over abundance of caution, preevnt future copy/pasta by
using the right locks when bootstrapping a Client. Strictly speaking
this is not necessary, but it makes explicit the locking semantics
and guards against future concurrent or parallel initialization.
2016-06-10 15:50:11 -04:00
525554c008
Use the client configCopy and lock appropriately.
2016-06-10 15:50:11 -04:00
3060d6b33c
Flesh out the comment re: the client.rpcproxy.Run() task.
...
Requested by: Alex
2016-06-10 15:50:11 -04:00
a6a4345f27
Clean up various comments
2016-06-10 15:50:11 -04:00
56a9981a13
Nuke the last of the explicit types in favor of using language idioms
2016-06-10 15:50:11 -04:00
b1ee131db8
Rename `backupServerDeadline` to `consulPullHeartbeatDeadline`
...
Suggested by: @alex
2016-06-10 15:50:11 -04:00
a8d2af692c
Don't clobber the default consul config in tests
2016-06-10 15:50:11 -04:00
b9adfcecf5
Remove unused variable
2016-06-10 15:50:11 -04:00
f15eeb8f27
Clean up some docs and comments to be more accurate
2016-06-10 15:50:11 -04:00
c78b0a6567
Remove unused constants
2016-06-10 15:50:11 -04:00
bcbec34937
Only actively test Consul when env `CONSUL_HTTP_ADDR` is set
2016-06-10 15:50:11 -04:00
04c697c610
Update godoc for newServer to reflect DNS and IP-based inputs
...
Requested by: alex
2016-06-10 15:50:11 -04:00
27413076fb
Pick the right `DefaultConfig` from the right package.
...
Overly zealous search && replace at work here.
2016-06-10 15:50:11 -04:00
7167b7a357
Add a quick set of client/rpcproxy.ServerEndpoint equality tests
2016-06-10 15:50:11 -04:00
837b387dcb
Fix building tests that used `DefaultConfig()` but didn't pickup the package move.
2016-06-10 15:50:11 -04:00
3b5db4e390
Fix the client/rpcproxy unit tests.
2016-06-10 15:50:11 -04:00
39fb0f2469
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
6fdf9135cb
Provide a default ConsulConfig for client/config.DefaultConfig()
...
Change the unit test to only test if the consul link exists, not the
value of the link. The old test was hostname specific and therefore
would always be different based on the environment running the tests.
2016-06-10 15:50:11 -04:00
cb80e93a6b
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
d87085e040
Fix a comment to be more correct
2016-06-10 15:50:11 -04:00
c7e1879c4d
Unused code wasn't as unused as I thought. Restore.
2016-06-10 15:50:11 -04:00
bff57a0dce
Reconcile, clean up, and centralize API version numbers (major and minor).
...
Reduce future confusion by introducing a minor version that is gossiped out
via the `mvn` Serf tag (Minor Version Number, `vsn` is already being used for
to communicate `Major Version Number`).
Background: hashicorp/consul/issues/1346#issuecomment-151663152
2016-06-10 15:50:11 -04:00
b3fd455b1f
Register the serf service with the Nomad server service.
...
This will be unused in this PR.
2016-06-10 15:50:11 -04:00
82d537fbd9
Update the `nomad_server_service` default from `nomad-server` to just `nomad`.
2016-06-10 15:50:11 -04:00
6d9ec364e5
Change the constants used to match the struct definitions
2016-06-10 15:50:11 -04:00
c013957d49
When clearing the backup servers, set the length to zero.
2016-06-10 15:50:11 -04:00
36340c654d
Improve language re: fingerprinting
2016-06-10 15:50:11 -04:00
bff82e4890
Remove unused function.
2016-06-10 15:50:11 -04:00
498f21cdec
Clear the backup server list when a Nomad heartbeat arives with servers
...
If Nomad is heartbeating during a transition from using backup servers
to Nomad servers, make Nomad the canonical source of servers and flush
the list of servers populated from Consul.
2016-06-10 15:50:11 -04:00
1fe979a5e4
Remove types.ShutdownChannel and replace with `chan struct{}`
2016-06-10 15:50:11 -04:00
2395aa481c
Fix unit tests
2016-06-10 15:50:11 -04:00
438becb28b
Pass the datacenter name in the heartbeat
...
Servers that are part of a different datacenter are added as backup
servers instead of primary servers.
2016-06-10 15:50:11 -04:00
d914f262f9
Consolidate all consul sync periodic go routines to handlers.
...
Only one pump and periodic loop now.
2016-06-10 15:50:11 -04:00
9fb0104def
Teach Client to reuse an Agent's consulSyncer.
...
"There can be only one."
2016-06-10 15:50:11 -04:00
47891fb559
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
d2f9848348
Bump the cluster test minimums to 10min.
...
These ranges aren't too useful with the default 600s rebalance, but
will be useful if that default ever changes in the future.
2016-06-10 15:50:11 -04:00
861f900225
s/RpcVersion/RPCVersion/g
2016-06-10 15:50:11 -04:00
bd0588ffa8
Bump shuffle interval per suggestion from Alex
2016-06-10 15:50:11 -04:00
9f8d6c9f67
Move struct member to reduce diff context
2016-06-10 15:50:11 -04:00
5570aa98e9
Fix package name in comments
2016-06-10 15:50:11 -04:00
410d85cc78
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
be679c161c
Rename manager_test.go to rpc_proxy_test.go
2016-06-10 15:50:11 -04:00
677f149b16
Rename RpcProxy's internal filename to match
2016-06-10 15:50:11 -04:00
11d53fda00
Remove unused code
2016-06-10 15:50:11 -04:00
10d1b6ba9b
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
0dbd16aa5d
Rebalance Nomad client RPCs among different Nomad servers.
...
Implement client/rpc_proxy.RpcProxy.
2016-06-10 15:50:11 -04:00
a13cbe73c3
Rename ConsulConfig to ConsulAgentConfig
2016-06-10 15:50:11 -04:00
e727fd8c3c
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
af96cb23a5
Rename `mergedNomadMap` to `mergedPrimaryMap`. Gratuitous, but more correct.
2016-06-10 15:50:11 -04:00
9d5cdf4e68
Correct a mismerge
...
Somewhere along the lines when rebasing I mis-merged a patch.
2016-06-10 15:50:11 -04:00
d58632e93f
Rename RpcProxy's internal filename to match
2016-06-10 15:50:11 -04:00
108d2ca981
index on f-dyn-server-list: bd38cb4 Remove unused code
2016-06-10 15:50:11 -04:00
cbe77754df
Remove unused code
2016-06-10 15:50:11 -04:00
ec7c78f533
Only poll Consul for servers when Nomad heartbeats begin to fail
...
When a deadline timer of 2x Server's last requested TTL expires,
begin polling Consul for Nomad Servers.
2016-06-10 15:50:11 -04:00
a4b32c62e2
s/availble/runChecks/g
2016-06-10 15:50:11 -04:00
d1442dc317
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
e60580b279
Define a type for the PeriodicCallback handlers and ShutdownChannel
2016-06-10 15:50:11 -04:00
17116fc5a7
Rebalance Nomad client RPCs among different Nomad servers.
...
Implement client/rpc_proxy.RpcProxy.
2016-06-10 15:50:11 -04:00
88f3422d7c
Rename NewConsulService to NewSyncer
2016-06-10 15:49:37 -04:00
b9789e0cf7
Rename client/consul/sync.PeriodicSync to Run
2016-06-10 15:49:37 -04:00
768aab015d
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
bfa4711df5
Rename ConsulConfig to ConsulAgentConfig
2016-06-10 15:48:36 -04:00
73e173673e
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
e97652bbfb
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
e36686a17d
Use consul/lib's RandomStagger
...
Removes four redundant copies of the method in the process.
2016-06-10 15:48:36 -04:00
26c9110e82
fix types
2016-06-10 11:52:15 -07:00
a3d41f2312
use time.Second instead of our own const
2016-06-10 11:38:59 -07:00
3cf74e7fd8
Alloc-status only shows measured statistics and fixes to CPU calculations
2016-06-10 10:38:29 -07:00
287e0eff22
Fixed merge conflicts
2016-06-10 04:47:34 +01:00
a69307cff2
Using named variables
2016-06-10 04:45:16 +01:00
9056be6d86
Fixed calculation of cpu usage percent in user and sys mode for pids
2016-06-10 04:06:32 +01:00
98d7547014
Annotate what is measured
2016-06-09 19:45:41 -07:00
b7e3a45fef
fix channel being nil on restore
2016-06-07 15:03:08 -07:00
6bf38bb213
Fixed the svc id generation scheme while pruning services
2016-06-07 08:14:11 -07:00
4027ff56f0
Returning an error if stats collection hasn't started yet for a new docker container
2016-06-06 18:52:54 -07:00
c21d606ebb
Getting inodes used percent back
2016-06-06 16:10:34 -07:00
d928d02d85
Removing inode percent since it doesn't work in some cases
2016-06-06 16:10:34 -07:00
ba1a92eb8c
Handle errors during stats collection
2016-06-03 14:23:18 -07:00
667b478f3f
Merge pull request #1226 from hashicorp/f-push-stats
...
Push Resource Usage stats to remote sinks
2016-06-02 23:14:59 +02:00
35e31c1b81
Enqueing metrics only if they are not nil
2016-06-02 17:14:15 -04:00
7efde782fa
Sending metrics for tasks as well
2016-06-01 16:42:16 +02:00
4e15611339
fix wait result being nil and some panics in the cli
2016-05-31 23:09:05 +00:00
7f172f314f
Pushing host stats
2016-05-31 04:05:47 +02:00
f95b1d00c3
Renamed error message in alloc endpoint
2016-05-28 20:03:52 -07:00
ae87177eed
Added a test to make sure task runner is collecting stats
2016-05-28 19:59:20 -07:00
11d1dd113b
Added a test for docker
2016-05-28 19:59:20 -07:00
c0dc6cfbf2
Changing the api of the stats endpoints
2016-05-28 19:59:20 -07:00
fa9b0dd7e8
Implemented the resource usage ts since a time
2016-05-28 19:59:20 -07:00
02ceb6c697
Initializing the ring buffer with no cells
2016-05-28 19:59:20 -07:00
77ac2dd624
Initializing the ring buffer with no cells
2016-05-28 19:59:20 -07:00
a0c279f3b2
comments
2016-05-28 19:59:20 -07:00
4c85f02072
Stopping the metrics collector timers using defer and starting to collect host stats right away
2016-05-28 19:59:20 -07:00
40e60ce920
Making the call to Stats on a go-routine
2016-05-28 19:59:20 -07:00
c8f5527158
Added a test to validate we are collecting stats
2016-05-28 19:59:20 -07:00
b2e8495971
Fixing the alloc runner tests
2016-05-28 19:59:20 -07:00
a64062d6a6
Fixed the compilation on linux
2016-05-28 19:59:20 -07:00
2b37f08d49
creating the host cpu percent calculator lazily
2016-05-28 19:59:20 -07:00
2ff43788a0
simplified the stats method in basic executor
2016-05-28 19:59:20 -07:00
097bab52a9
Fixed the logic of scanpids
2016-05-28 19:59:20 -07:00
f93820f40c
Added comments
2016-05-28 19:59:20 -07:00
c2da19bf11
Refactored the api for NewHostStatsCollector
2016-05-28 19:59:20 -07:00
0b0d0764e4
Changed signature of Allocation Stats Reporter
2016-05-28 19:59:20 -07:00
75c7f84490
Simplified the docker stats collection
2016-05-28 19:59:20 -07:00
98016ec066
Incorporated review comments for executor
2016-05-28 19:59:20 -07:00
c46400597e
Making the stats collection interval and number of data points to keep in memory configurable
2016-05-28 19:59:20 -07:00
b6e5227e7a
Renamed monitorUsage method
2016-05-28 19:59:20 -07:00
d2021e2953
Changed the signature of ResourceUsageTS
2016-05-28 19:59:20 -07:00
666b419dba
Acquiring locks before iterating allocations and tasks
2016-05-28 19:59:20 -07:00
05c221186b
Added disk usage to node status
2016-05-28 19:59:20 -07:00
cf247c1309
Added uptime to node stats
2016-05-28 19:59:20 -07:00
73fa700a88
Showing host resource usage stats
2016-05-28 19:59:20 -07:00
313c61b9db
Added pidstats in task resource usage struct
2016-05-28 19:59:20 -07:00
cfd3016747
Renamed CpuUsage to CpuStats
2016-05-28 19:59:20 -07:00
77357ccf80
Added a test for calculating cpu stats
2016-05-28 19:59:20 -07:00
84cd943c48
Stopping stats collection of tasks which has been destroyed
2016-05-28 19:59:20 -07:00
193bbc10f8
Fixed the percentage calculation for cgroups
2016-05-28 19:59:20 -07:00
7744a41358
Added some docs
2016-05-28 19:59:03 -07:00
b884253d39
Added locks to RingBuf
2016-05-28 19:59:03 -07:00
22c3f6fee0
Implemented nomad cpu percentage calculator
2016-05-28 19:59:03 -07:00
e37a108b4c
Implemented cpu stats
2016-05-28 19:51:22 -07:00
1789dbd1ff
Fixed implementation of the docker stats
2016-05-28 19:51:22 -07:00
9790516a22
Added the PidStats method on the executor
2016-05-28 19:42:34 -07:00
63166d0e46
Adding a query param to return time series of stats
2016-05-28 19:42:34 -07:00
c347b27e6a
Implemented stats for raw_exec
2016-05-28 19:42:34 -07:00
9a96dddc07
Added some docs to resource stats endpoint
2016-05-28 19:42:34 -07:00
b9feae89ce
Making the conversion to Stats simpler
2016-05-28 19:42:34 -07:00
f84f93c817
Returning nil if peek is called before any value is enqueued
2016-05-28 19:42:34 -07:00
Alex Dadgar