0c7f3e21d7
Merge pull request #199 from achanda/double_call
...
Fix two issues where settings were not taking effect
2015-10-02 10:52:41 -07:00
3751b46673
Make sure createHostConfig is called only once
...
The second call discards any mods to port binding or
network type
Fixes #185 and #196
2015-10-02 10:43:37 -07:00
f35ebe14ad
Merge branch 'master' into dev/net-fingerprint
2015-10-02 09:38:35 +02:00
36daef1625
Renamed all instances of `Iface` to `NetworkInterface`.
2015-10-02 09:29:18 +02:00
191ea91cdd
Merge pull request #184 from achanda/docker_net
...
Enable setting networking mode for docker
2015-10-01 19:32:48 -07:00
0cb649bd5f
Enable setting networking mode for docker
...
This patch enables setting networking mode for the docker
driver. This does not handle the `container` mode.
Closes #175
2015-10-01 18:52:41 -07:00
3a4b304a53
Refactored code.
2015-10-01 21:16:39 +02:00
2e1488fb04
Comment some undocumented code.
2015-10-01 20:39:10 +02:00
836fd8a015
Merge pull request #153 from aldergren/master
...
Prevent df on linux from adding line breaks to output
2015-10-01 11:21:02 -07:00
b01912abdc
Forgot some error checking.
2015-10-01 17:33:40 +02:00
70d34da1bc
Client config param added to specify net iface to use for fingerprinting. Added a Golang-native method for determining the interface IP address.
2015-10-01 17:31:47 +02:00
443d2deb32
Update obsolete comments
2015-09-29 20:33:11 +00:00
d844997661
Fix "ifconfig not found" warning
2015-09-29 20:06:37 +00:00
9145d8ffb9
Prevent df on linux from adding line breaks to output
2015-09-29 13:23:41 +02:00
4ecf7a0f74
Improve link speed fingerprint error reporting
...
With disconnected eth0 log output now looks like:
[WARN] fingerprint.network: Unable to parse IP in output of '/bin/ifconfig eth0'
[WARN] fingerprint.network: Unable to parse Speed in output of '/usr/sbin/ethtool eth0'
In a virtual machine:
[WARN] fingerprint.network: Unable to parse Speed in output of '/sbin/ethtool eth0'
[WARN] fingerprint.network: Unable to read link speed from /sys/class/net/eth0/speed
2015-09-28 23:34:25 +00:00
690634d245
client: fix windows build errors
2015-09-27 23:53:25 -07:00
6ff19853ef
docker: check for missing unix socket
2015-09-27 17:49:58 -07:00
d314b514f8
Better Sprintf
2015-09-27 17:41:43 -07:00
f8e434aa1d
Add environment package
2015-09-27 17:37:25 -07:00
7ba9681a94
Fix args in test
2015-09-27 17:37:24 -07:00
a4a440da8e
ParseAndReplace args at the executor level
2015-09-27 17:37:24 -07:00
76dfa9bb0f
Check err
2015-09-27 17:37:24 -07:00
b95d349a3e
Set the allocdir correctly when using the linux executor
2015-09-27 17:37:24 -07:00
a45f9f2e71
Pull task environments into their own type to be reusable across drivers and executors
2015-09-27 17:37:24 -07:00
a96f6dfa6d
Remove cruft from rebase
2015-09-27 17:37:24 -07:00
a7eebcbd5b
merge fixes
2015-09-27 17:37:24 -07:00
162247ffbe
Correct implementation of config check for container and image cleanup; moved into Start and Open because handle does not have the config object
2015-09-27 13:59:38 -07:00
9455370d8e
Merge branch 'master' into f-docker-config-cleanup
2015-09-26 21:52:02 -07:00
5678859752
Add configuration option for whether Nomad will clean up containers and images when they are no longer used
2015-09-26 18:53:15 -07:00
79488baa4d
Add all containers when searching for images that are still in used, since the container using the image may be stopped
2015-09-26 18:51:36 -07:00
af314b0f4d
Log an info when an image can't be removed because it's still in use
2015-09-26 00:34:57 -07:00
5632a33036
Use env.Get, remove sha256 checks, and change from regexp to strconv to test for int
2015-09-25 23:55:01 -07:00
7021ac3ce8
Add docker 'command' to docs; cleanup some comments
2015-09-25 23:28:23 -07:00
23407c54af
Replace docker version and docker ps with native calls; no more exec!
2015-09-25 23:13:40 -07:00
72cd22347f
Docker kill now exits with an error, as expected
2015-09-25 22:43:19 -07:00
0c31a83783
Go native for docker API calls
2015-09-25 20:01:03 -07:00
198159c5be
Put that back!
2015-09-25 18:38:41 -07:00
a8c8fc2f96
Merge branch 'master' into b-docker-fixes
...
Conflicts:
client/driver/docker_test.go
client/driver/java_test.go
client/driver/qemu_test.go
2015-09-25 18:35:23 -07:00
efb7c409bb
Improve handling of tagged docker images
...
- Converted Start() to use docker native client throughout
- Better handling of latest vs. tagged images
- We can now support multiple versions of an image
- We will now not download a tag if we already have it
2015-09-25 18:22:10 -07:00
6ca7c6680d
Fix client init logging and test
2015-09-25 18:12:11 -07:00
70a1a37f84
Small test cleanup
2015-09-25 17:55:29 -07:00
d8e492d950
Added a failing test case for multiple docker tags
2015-09-25 17:38:07 -07:00
aa3019780d
Added docker test to spin up 3 containers at the same time
2015-09-25 17:35:33 -07:00
32d260281f
Added guards to tests so we can more gracefully degrade the test suite when thing are not installed
2015-09-25 16:49:26 -07:00
5a76693bc6
Fix comments
2015-09-25 16:49:19 -07:00
3cf6d014ef
Log the alloc and state directory on Client Init()
2015-09-25 16:49:19 -07:00
998a817a29
Use host file/dir permissions when embedding
2015-09-25 16:49:19 -07:00
3534839367
Destroy allocdirs in task runner tests
2015-09-25 16:49:19 -07:00
5928b950c5
Skip non-regular files in embedding and comment on the chrootEnv map
2015-09-25 16:49:19 -07:00
530e2d3c6d
Change allocdir variable name for clarity
2015-09-25 16:49:19 -07:00
8d7ededad7
Windows shouldn't do anything on unmount
2015-09-25 16:49:19 -07:00
eb2f01fd94
Update CPU limit to be an int
2015-09-25 16:49:18 -07:00
fc2e9754a3
Only unmount once
2015-09-25 16:49:18 -07:00
0f855e2088
Fix cgroup isolation
2015-09-25 16:49:18 -07:00
e594e6081b
Fix embed non-existent test
2015-09-25 16:49:18 -07:00
ac70832eb3
Added errNoResources to executor package; return this when Limit is called with nil argument
2015-09-25 16:49:18 -07:00
b9dd4c40c5
Added basic resources to exec/java tests so each test has cpu, ram, and network
2015-09-25 16:49:18 -07:00
3cea4288b9
Merge qemu test
2015-09-25 16:49:14 -07:00
6725cbb3f5
Mount shared alloc dir, modified API and tests
2015-09-25 16:46:41 -07:00
81ade0f5d3
Linux Embed and AllocDir unit tests
2015-09-25 16:46:41 -07:00
6879e59494
Fix function header
2015-09-25 16:46:41 -07:00
c9cffb93f6
Embed interface
2015-09-25 16:46:41 -07:00
72d892a518
Client init rebase
2015-09-25 16:46:41 -07:00
2e8395c458
Changed file names so it builds correctly
2015-09-25 16:46:41 -07:00
9d3e3c0704
AllocDirBuilder that creates the alloc directory structure
2015-09-25 16:46:41 -07:00
5bc26c3f9d
Merge pull request #101 from hashicorp/f-qemu-network-update
...
driver/qemu: Use Restricted Ports, additional port forwarding
2015-09-25 16:36:46 -07:00
f1ede2f555
Fix bad copy-paste from refactoring
2015-09-25 08:36:46 -05:00
6f15160f5c
client: support modifying the servers list
2015-09-24 20:16:47 -07:00
fce6a5f7c7
Merge pull request #108 from hashicorp/b-netmap-crash
...
Fix crash in task_runner tests
2015-09-24 16:27:54 -07:00
a589c056ea
All the TestTaskRunner* tests want this
2015-09-24 16:00:36 -07:00
e6ac055c6c
Initialize reserved ports
2015-09-24 15:55:41 -07:00
d2aa4fd53c
Merge pull request #104 from hashicorp/f-docker-static-ports
...
Add static (reserved) ports for docker
2015-09-24 15:44:41 -07:00
f032e311d2
Missed a set of parens
2015-09-24 15:40:32 -07:00
c9482e1188
Initialize reserved ports in task_runner
2015-09-24 15:37:43 -07:00
40ce6ece41
Get only one version of a docker container
2015-09-24 14:07:28 -07:00
4e6c795352
re-order the resources check and don't bail if no ports requested
2015-09-24 14:32:54 -05:00
3fd3c2a913
Add test case for PopulateEnvironment
2015-09-24 00:17:33 -07:00
f8e8084c71
Rename containerConfigForTask to createContainer to mirror the docker api call; other helper functions will follow this convention too
2015-09-24 00:00:46 -07:00
a071bb6d59
Rename containerConfig to hostConfig since there are two types of container configs
2015-09-23 23:57:04 -07:00
9ff0e88d33
Added static / reserved port allocations to docker
2015-09-23 23:45:34 -07:00
e67d892ea3
driver/qemu: Setup multiple port forwards
2015-09-23 23:15:28 -05:00
1978be24d0
Format as string instead of casting to string
2015-09-23 19:29:53 -07:00
e413c6f9d2
Support mapped ports and labelled ports for docker
2015-09-23 18:19:01 -07:00
1654d08fca
Add docker ports; change to uppercase examples and tests
2015-09-23 18:01:08 -07:00
8b2f8efe70
Merge branch 'master' into f-port-configs
2015-09-23 15:31:00 -07:00
b8fd345128
Docs and remove uppercase since it's checked at the config parse step
2015-09-23 15:28:58 -07:00
3bdae950c5
Merge pull request #97 from hashicorp/f-qemu-driver-docs
...
Basic Qemu docs
2015-09-23 14:37:56 -07:00
8aa2c292a0
Merge pull request #77 from hashicorp/f-network-fingerprint
...
Network Fingerprinting
2015-09-23 14:36:29 -07:00
15477ce433
Merge pull request #95 from hashicorp/f-java-driver-docs
...
Add some basic docs for the Java Driver
2015-09-23 15:59:33 -05:00
e2c1bfe19c
Basic Qemu docs
2015-09-23 14:44:49 -05:00
73c4c1f210
Changed fmt for CPU to integer
2015-09-23 12:19:46 -07:00
0db8ce12d4
Update Java docs on how Java is detected
2015-09-23 14:16:43 -05:00
491f2d927f
clean up some log formatting
2015-09-23 14:09:55 -05:00
b93518b509
start the Qemu docs
2015-09-23 13:58:42 -05:00
e2c324d098
Merge branch 'master' into f-port-configs
2015-09-23 11:57:12 -07:00
f4ad6e51dc
Replaced List with Map
2015-09-23 11:56:36 -07:00
b213462cb4
Change CPU from float64 to int
2015-09-23 11:14:32 -07:00
8c0542a9af
Refactor network fingerprinting to be generic, use build flags
2015-09-23 10:12:56 -05:00
61d695b7d4
prefix warn/error messages
2015-09-23 10:03:35 -05:00
e4a8565f00
fix casing for ERR logs
2015-09-23 10:00:06 -05:00
e26dbf4850
Fix some printf tokens
2015-09-22 23:43:05 -07:00
9067b2594f
Added environment variables to docker
2015-09-22 23:12:24 -07:00
8bf45688b6
Check for nils before accessing data
2015-09-22 23:11:55 -07:00
27376dc548
Added environment variables to Java
2015-09-22 22:36:10 -07:00
3e90379f05
Pass dynamic ports to the exec driver via environment variables
2015-09-22 22:33:29 -07:00
fe72c8ea59
client: reset response struct to avoid decode errors
2015-09-22 22:10:28 -07:00
b7f370ba07
client: create dir, handle not exist more gracefully
2015-09-22 22:00:24 -07:00
c84d51a9d1
don't re-convert mbits
2015-09-22 23:57:24 -05:00
f876ed6673
refactoring, docs
2015-09-22 23:51:56 -05:00
ef81b29d7a
client: fixing stats formating
2015-09-22 21:48:42 -07:00
088bc9e482
fix range error
2015-09-22 23:25:12 -05:00
f60bbbfd15
populate node network resource
2015-09-22 23:22:23 -05:00
e3c8ca8462
Update code for parsing IP address
2015-09-22 22:56:31 -05:00
09249d877c
Removed comment that's no longer relevant
2015-09-22 20:11:07 -07:00
c615c560d2
Move ec2InstanceSpeed to a package variable, convert to string:int map
2015-09-22 22:04:20 -05:00
b8e7d28a06
Update package import name
2015-09-22 18:48:42 -07:00
dd2f16123f
Fix qemu check and add debug lines when a driver is disabled
2015-09-22 17:36:44 -07:00
bbb3853dd8
Update Qemu Fingerprint check
2015-09-22 17:12:52 -07:00
e095664c49
Guard tests
2015-09-22 17:10:03 -07:00
3875e8a59a
Update exec_linux to assume it is running as root
2015-09-22 16:44:11 -07:00
dd0a76a9d7
Disable exec/java/qemu when non-root on non-windows OSes
2015-09-22 16:32:05 -07:00
5c749e1ffb
Consolidate the AWS fingerprinters
2015-09-22 16:56:04 -05:00
2bbf080666
Refactor some AWS things, removing fingerprint/network.go
...
- move isAWS to env, use in other places
- fingerprint/network.go is no empty; removed
2015-09-22 16:31:57 -05:00
b44c911996
change the naming
2015-09-22 16:01:29 -05:00
168c959497
Added named ports
2015-09-22 13:59:16 -07:00
a9cf7381ca
Refactor the Network Fingerprinters
2015-09-22 15:59:00 -05:00
f048326300
Rework client/fingerprint/fingerprint.go to use a slice and enforce ordering
2015-09-22 14:23:48 -05:00
ed2fc3a69f
client: persist the node ID
2015-09-22 10:31:47 -07:00
d11bd582f7
Basic network fingerprinting for Unix type, AWS systems
2015-09-22 11:44:53 -05:00
1b46cbff83
Fixed function comment
2015-09-21 09:08:57 -07:00
8d24e5e532
Tests skip based on cgroups, not root
2015-09-21 09:08:57 -07:00
e694688527
Update UniversalExecutor to have string identifiers
2015-09-21 09:08:57 -07:00
0e3f21b34f
Linux executor with cgroup isolation support
2015-09-21 09:08:57 -07:00
61948802a8
executor/linux: Add UUID for the name, return error on failure to apply
2015-09-21 09:08:57 -07:00
067e65bf12
exec/linux: move Limit to after Start
2015-09-21 09:08:57 -07:00
0c526ddb8e
spike on adding cgroups
2015-09-21 09:08:57 -07:00
807edc194d
Merge branch 'f-docs'
2015-09-20 19:25:25 -07:00
67fc3c9b87
client: optimize initial heartbeat time
2015-09-20 17:02:12 -07:00
d4948e2935
Windows does not support exec.Cmd.SysProcAttr.Credential call; this causes cross-compiltion to fail so it's behind a build flag now
2015-09-18 18:59:42 -07:00
c99e368461
Support running Linux exec as a non-root user
2015-09-15 20:17:23 -07:00
57e4f7c44f
Merge branch 'master' into f-executor
2015-09-15 19:03:52 -07:00
e5cb8852af
Overhaul the executor code so we use build flags instead of dynamic loading
2015-09-15 18:54:55 -07:00
d1c4abef33
Changed Default executor to use a factory
2015-09-15 16:40:40 -07:00
4cefbc3c22
Rename exec package to executor so it works better with goimports; fixes for Java driver
2015-09-15 14:03:03 -07:00
6a7b82f7ba
Update Java driver to use Executor
2015-09-15 13:45:48 -07:00
9db88f6013
Updated exec driver to use nomad/client/exec
2015-09-15 13:11:56 -07:00
06073b171d
Use Linux on Linux
2015-09-14 19:38:21 -07:00
6eb3d86528
Run as nobody if no user is specified
2015-09-14 19:04:29 -07:00
e4d3aad44e
Send signal 0 to check whether the process is alive
2015-09-14 16:16:56 -07:00
0425ae941c
Implemented Linux driver with RunAs functionality -- added errors to RunAs and Limit
2015-09-14 15:57:21 -07:00
2ff133c0e6
nomad: rename region1 to global. Fixes #41
2015-09-13 18:18:40 -07:00
d1f829e502
client: Use Alloc.TaskResouces to override Task.Resources
2015-09-13 17:35:56 -07:00
3d31230ac1
client: always create alloc dir if it is non-empty
2015-09-13 12:14:12 -07:00
58216245ac
client: skip init in dev mode
2015-09-12 13:16:27 -07:00
823276993c
client: init the alloc dir
2015-09-12 11:47:44 -07:00
1ff724ab25
client: alloc dirs tolerate missing directories
2015-09-11 20:32:55 -07:00
91194d9337
Update the interface, add UniversalExecutor, add stub for LinuxExecutor
2015-09-11 17:12:48 -07:00
f511eeac0e
Added stub / spec for executor interface
2015-09-11 12:35:03 -07:00
da93d4a30f
Change error to err to be consistent with other usage
2015-09-11 10:26:33 -07:00
4f83bc7090
Fix typos
2015-09-10 11:35:03 -07:00
2ccad3d6e8
Change panic to a more helpful message
2015-09-09 19:04:06 -07:00
237bf5f68e
Merge branch 'f-driver-config' into f-docker-resource-constraints
2015-09-09 18:47:35 -07:00
2a40673a3a
Relax Qemu version regexp to accomodate build identifier in the version command
2015-09-09 18:39:40 -07:00
cc4d361ee9
Updated Qemu and tests to use DriverContext
2015-09-09 18:38:52 -07:00
0281debee4
Merge branch 'master' into f-driver-config
...
Conflicts:
client/driver/driver.go
2015-09-09 18:19:19 -07:00
a695e311dc
Replace logging and config with DriverContext, which allows us to expand the dependency injection without changing the interface
2015-09-09 18:06:23 -07:00
1ff755f31a
Merge pull request #24 from hashicorp/qemu-driver
...
Basic Qemu driver implementation
2015-09-09 17:43:13 -07:00
9965d28a22
Add logger to the dockerHandle created by Open()
2015-09-09 13:43:28 -07:00
a731a84136
Cleanup based on PR feedback
...
- Add validation that Resources.MemoryMB and Resources.CPU have non-zero values
- Change log calls to use logger whenever possible
- Change log format to add colon after driver.docker
2015-09-09 13:35:10 -07:00
037ae6d6eb
driver/qemu+java: Code cleanups
2015-09-09 14:38:42 -05:00
bd0f92f977
driver/qemu: Actually use the requred Memory from the Task
2015-09-09 14:30:35 -05:00
2611523b3b
driver/qemu: Require a memory resource on the task
2015-09-09 14:28:16 -05:00
ac277c5765
Change SIGINT to SIGTERM
2015-09-09 01:52:58 -07:00
b70b852662
Added preliminary resource constraints for docker; CPU and Memory
2015-09-09 01:08:31 -07:00
98c53162d2
driver/qemu: add to builtin drivers
2015-09-08 16:25:36 -05:00
d2822a435d
driver/qemu: Basic lifecycle management of Qemu images
2015-09-08 16:08:49 -05:00
4eb8fc5188
Added config to drivers; needed for docker driver to get the socket endpoint
2015-09-08 12:43:02 -07:00
c1f982a1d0
Merge branch 'master' into qemu-driver
...
* master: (66 commits)
Use a single implementation of GenerateUUID
scheduler: use update strategy for rolling updates
nomad: adding helper structs
scheduler: Adding CreateEval to Planner
nomad: worker supports create eval
nomad: guard eval creation based on parent eval
nomad: adding Eval.Create endpoint
nomad: support time wait for evaluations
nomad: adding fields to cause an evaluation to 'wait'
scheduler: support in-place allocation updates
scheduler: util method to diff task groups
nomad: helper struct func
nomad: PopUpdate should minimize plan size
nomad: adding helper to manipulate plans
scheduler: share context and stack
scheduler: allow updating the base nodes
scheduler: allow StaticIterator to update base set
scheduler: pull node shuffle into util
nomad: adding node GC
nomad: using Raft StartAsLeader to make tests faster
...
2015-09-08 09:52:40 -05:00
bd06e4bad2
Merge pull request #19 from hashicorp/test-resources
...
Added example python and java apps for testing
2015-09-07 17:03:09 -07:00
ea0795995d
Use a single implementation of GenerateUUID
2015-09-07 15:23:03 -07:00
7d69aa78c1
nomad: using Raft StartAsLeader to make tests faster
2015-09-07 10:46:41 -07:00
8bedd3769c
nomad: unifying the state store API
2015-09-06 20:56:38 -07:00
1a5579384a
nomad: cleanup API descrepencies
2015-09-06 20:47:42 -07:00
0702f17989
Rename client endpoint to node endpoint
2015-09-06 20:31:32 -07:00
c7773feced
nomad: improve error messages at start for dev mode
2015-09-06 20:18:47 -07:00
f1da1226c1
driver/java: Add to builtin list
2015-09-04 13:09:11 -07:00
60ad3b7517
Merge remote-tracking branch 'upstream/master' into qemu-driver
...
* upstream/master:
Removed debug logging
Added tests for docker, improved logging, and fixed a few bugs
Added initial implementation for the docker driver; tests pending
2015-09-04 14:50:47 -05:00
aa3937f248
Added example python and java apps for testing
...
- Java example from @catsby
2015-09-04 11:13:24 -07:00
813f905a1c
Removed debug logging
2015-09-03 21:08:14 -07:00
c483036e16
Added tests for docker, improved logging, and fixed a few bugs
2015-09-03 21:00:16 -07:00
9cb1dc95a0
driver: Add README.md for docs
2015-09-03 17:01:43 -05:00
b9ceb69683
Added initial implementation for the docker driver; tests pending
2015-09-03 12:35:22 -07:00
2000d3657f
Merge pull request #15 from hashicorp/b-java-driver
...
Rough spike at adding Java driver
2015-09-03 14:31:49 -05:00
8c6128503f
driver/java: use filepath.Join instead of simple +
2015-09-03 10:25:09 -05:00
256d5c1286
driver/java: Don't error if Java isn't found; log if error parsing
2015-09-03 10:02:48 -05:00
1dd0b63cb4
clean up orphaned java processes
2015-09-03 09:49:39 -05:00
c774c67b6b
driver/java: update Fingerprint for Java driver
2015-09-02 11:41:25 -05:00
9d5c04ddbb
Spike at a Java driver, runs Java jars
2015-09-01 17:07:41 -05:00
9e79a15789
move test logger to shared file
2015-09-01 16:56:42 -05:00
7070b80167
Added test for config.Read and config.ReadDefault
2015-08-31 20:11:01 -07:00
Alex Dadgar