Commit Graph

3210 Commits

Author SHA1 Message Date
Erik Evenson
5859c95df8 Merge branch 'master' into study/aws-ecr-1 2016-03-06 18:18:20 -06:00
Alex Dadgar
3fac6fe992 Merge pull request #886 from hashicorp/f-configurable-heartbeat
agent: Configurable heartbeat grace
2016-03-04 18:11:45 -08:00
Alex Dadgar
aeb38b5116 Merge pull request #887 from hashicorp/b-nack-timeout
Fix bug introduced with paused nack timers
2016-03-04 18:10:21 -08:00
Alex Dadgar
5cc91ecd79 Remove outstanding reset from plan applier 2016-03-04 17:25:37 -08:00
Alex Dadgar
022b6dd528 Fix bug introduced with paused nack timers 2016-03-04 16:17:14 -08:00
Alex Dadgar
88c590dede agent: Configurable heartbeat 2016-03-04 15:44:12 -08:00
Alex Dadgar
13a2bff7f8 Merge branch 'master' of github.com:hashicorp/nomad 2016-03-04 15:20:57 -08:00
Alex Dadgar
6b67d6ba1c changelog 2016-03-04 15:20:51 -08:00
Alex Dadgar
8d5c90900e Merge pull request #884 from hashicorp/f-nack-timeout-pausing
core: Pause/Resume Nack timeout while eval is in plan queue
2016-03-04 12:59:59 -08:00
Alex Dadgar
72901a9ac1 core: Pause NackTimeout while in the plan_queue as progress is being made 2016-03-04 12:59:35 -08:00
Alex Dadgar
482118fbc0 Merge pull request #880 from achanda/docker_update
Test against latest stable docker
2016-03-04 10:52:37 -08:00
Alex Dadgar
44f5d75315 Remove documentation about assigning node-id 2016-03-04 10:36:30 -08:00
Abhishek Chanda
1f77aa5dfe Always use the new package config if there is a conflict 2016-03-03 20:40:34 -08:00
Abhishek Chanda
2b48bfb3a3 Test against latest stable docker 2016-03-03 20:40:34 -08:00
Jake Champlin
0e1ca4b2ce Merge pull request #879 from hashicorp/f-add-allocation-output-node-status
Include number of allocations in node-status
2016-03-03 15:37:00 -05:00
Jake Champlin
97e0c9795d Add -allocs to help output 2016-03-03 14:46:24 -05:00
Jake Champlin
859a556982 Only fetch running allocs, use args, add docs
Only fetch running allocations, not total allocated ids, add
documentation, and cleanup things.
2016-03-03 14:09:07 -05:00
Jake Champlin
1e7e9fb860 Include number of allocations in node-status
We recently ran into an issue on a small percentage of nomad-clients
where the nomad-client was running successfully, but due to a race
condition, could not correctly bind to the docker socket. This caused
all of our nomad jobs to be allocated to a single nomad-client instead
of being spread evenly across our clients. The only way to discover this
was to run `nomad node-status <node>` and count each job allocation per
node.

This can lead to a fairly long debugging process if there are several
nomad-clients. Including the number of allocations for each node in the
`node-status` command would save a large amount of debug time.

```
jake@biscuits [12:08:41] [~]
-> % nomad node-status
ID        Datacenter  Name      Class   Drain  Status  Allocations
2b0aabc5  dc1         biscuits  <none>  false  ready   0
```

```
jake@biscuits [12:08:55] [~]
-> % nomad node-status
ID        Datacenter  Name      Class   Drain  Status  Allocations
2b0aabc5  dc1         biscuits  <none>  false  ready   1
```
2016-03-03 12:19:56 -05:00
Diptanu Choudhury
225ed95446 Merge pull request #768 from achanda/b-rkt
A number of rkt fixes
2016-03-02 21:29:48 -08:00
Alex Dadgar
b9ccd432c8 changelog 2016-03-02 17:00:40 -08:00
Alex Dadgar
4a243e78d3 Add /sbin and /usr/sbin/ to chroot 2016-03-02 16:32:31 -08:00
Alex Dadgar
f51a95994b Merge pull request #874 from hashicorp/b-consul-concurrent-map-access
Remove a concurrent map access
2016-03-02 16:30:42 -08:00
Alex Dadgar
9a23bc4c1e Merge branch 'master' of github.com:hashicorp/nomad 2016-03-02 16:27:11 -08:00
Alex Dadgar
76856961af Killing a docker container that is dead is not an error 2016-03-02 16:27:01 -08:00
Diptanu Choudhury
7e674f5922 Merge branch 'master' of github.com:hashicorp/nomad 2016-03-02 15:04:21 -08:00
Diptanu Choudhury
833d9500f4 Updated changelog to contain libcontainer fix 2016-03-02 15:03:58 -08:00
Alex Dadgar
5aa612c34a Changelog 2016-03-02 15:00:53 -08:00
Abhishek Chanda
d8d62aaddf Fix location of volume mount
Also add a test for mounting alloc dirs
2016-03-02 14:04:14 -08:00
Abhishek Chanda
253f32e541 Use NewWaitResult in the wait channel 2016-03-02 14:04:14 -08:00
Abhishek Chanda
54b9727317 Set allocDir in handle 2016-03-02 14:04:14 -08:00
Abhishek Chanda
b92546a9c5 Run rkt interactively 2016-03-02 14:04:14 -08:00
Abhishek Chanda
5419603bb4 Cleanup if the plugin executor crashes. 2016-03-02 14:04:14 -08:00
Abhishek Chanda
aa288c91d0 A number of cleanups
- Removed some unused variables.
2016-03-02 14:04:14 -08:00
Abhishek Chanda
45b8670829 Disable ipmasq in the default ptp network 2016-03-02 14:04:14 -08:00
Abhishek Chanda
0f4472d94f Change name of the stdout file 2016-03-02 14:04:14 -08:00
Abhishek Chanda
65524d90e5 Do not hard-code binary location 2016-03-02 14:04:14 -08:00
Abhishek Chanda
fb2607bcec Use the plugin mechanism in the rkt driver 2016-03-02 14:04:14 -08:00
Abhishek Chanda
877dd7de61 Defer cleanup 2016-03-02 14:04:14 -08:00
Abhishek Chanda
07d4152017 Change how a result is returned form wait 2016-03-02 14:04:14 -08:00
Abhishek Chanda
1a9438cdd1 Use less resources for containers 2016-03-02 14:04:14 -08:00
Abhishek Chanda
f2a1218881 Print rkt and docker versions after installing 2016-03-02 14:04:14 -08:00
Abhishek Chanda
db549c68fb Put docker version in the script 2016-03-02 14:04:14 -08:00
Abhishek Chanda
e7413a57f5 Add a shebang to docker update script 2016-03-02 14:04:14 -08:00
Abhishek Chanda
0905dccb1c Enable running rkt tests in travis
- Introduces a travis target in Makefile to update docker and
  install rkt
2016-03-02 14:04:14 -08:00
Abhishek Chanda
adf0c0677f A number of rkt fixes
- Reorder rkt arguments to make it work
- Change a few things in test
2016-03-02 14:04:14 -08:00
Abhishek Chanda
848404a48d Use a host volume to mount alloc and task dirs
host volumes are the preferred way to share data.
2016-03-02 14:04:14 -08:00
Abhishek Chanda
8a9f5c26c8 Create the task and alloc dirs before proceeding 2016-03-02 14:04:14 -08:00
Alex Dadgar
652bd72c5f Merge pull request #869 from hashicorp/f-alloc-id-env
Add Alloc ID/Name and Task Name to environment variables
2016-03-02 13:58:47 -08:00
Alex Dadgar
98d3a92a12 Remove a concurrent map access 2016-03-02 13:57:08 -08:00
Diptanu Choudhury
75bedf8356 Merge pull request #855 from hashicorp/cgroups-pid
Updated logic for creation of cgroup
2016-03-02 12:57:25 -08:00