Commit Graph

915 Commits

Author SHA1 Message Date
Alex Dadgar a5e9e2068c Make NewRestartTracker private 2015-12-18 12:17:54 -08:00
Alex Dadgar 31c3e12957 merge 2015-12-18 12:17:13 -08:00
Diptanu Choudhury d8e51bb6b6 Moving the de-register once a task moves to DEAD state 2015-12-17 16:41:29 -08:00
Clint Shryock 77b5639160 Executors/Linux: Update Executor config struct 2015-12-17 10:25:42 -06:00
Diptanu Choudhury f6fb42835e Using cgo dependencies to look up users 2015-12-15 11:12:13 -08:00
Diptanu Choudhury b7f556fabc Changed some comments 2015-12-14 18:05:58 -08:00
Diptanu Choudhury 2eb03e1d23 Renamed serviceId to serviceID 2015-12-14 15:57:56 -08:00
Diptanu Choudhury 6b6d74e2eb Fixed tests 2015-12-14 15:47:01 -08:00
Diptanu Choudhury 76486d71e2 Making the allocs hold service ids 2015-12-14 15:08:35 -08:00
Diptanu Choudhury 0c4b76e0ef Changing the prefix of the service 2015-12-14 11:14:22 -08:00
Diptanu Choudhury 3c01a4de27 Fixed log printing logic 2015-12-11 15:45:49 -08:00
Alex Dadgar b943c6e278 Remove all calls to the default logger 2015-12-11 15:02:13 -08:00
Diptanu Choudhury f932c5f9df Refactored test and added some comments 2015-12-11 14:14:04 -08:00
Diptanu Choudhury e389674d34 Exctracted nomad- to a constant 2015-12-11 14:06:51 -08:00
Diptanu Choudhury 1b942c158d Removing extra lines 2015-12-11 14:06:51 -08:00
Diptanu Choudhury c7c0748cea Making a struct to hold consul service config 2015-12-11 14:06:51 -08:00
Diptanu Choudhury d9fc07fb08 Added a test for the filtering logic of service and clients 2015-12-11 14:06:51 -08:00
Diptanu Choudhury a53e035b49 Deregister services and checks which are managed by Nomad 2015-12-11 14:06:51 -08:00
Diptanu Choudhury dd6df187fb Merge pull request #567 from hashicorp/r-mute-consul-debug-messages
mute consul debug messages
2015-12-11 13:58:15 -08:00
Diptanu Choudhury 7bbf3b6497 Renaming constants 2015-12-11 13:47:35 -08:00
Diptanu Choudhury 6b43aa6753 Renaming constants 2015-12-11 13:18:04 -08:00
Diptanu Choudhury 8e97e7d85f Not continuing sync if we couldn't get services and checks from consul 2015-12-11 13:10:20 -08:00
Chris Hines 5f5f91717d Avoid leaking a time.Ticker. 2015-12-11 15:30:53 -05:00
Diptanu Choudhury 7094ea53d6 Printing most of the consul messages only when the agent is available 2015-12-11 09:22:47 -08:00
Diptanu Choudhury 7d6a687b95 Changed the log line in consul fingerprinter 2015-12-11 09:10:21 -08:00
Diptanu Choudhury 49d9d04025 Print consul debug messages only when the consul agent is available 2015-12-11 09:06:03 -08:00
Diptanu Choudhury d54ccfb0ec Muted the consul debug messages 2015-12-11 09:06:03 -08:00
Diptanu Choudhury 4a6e09218e Merge pull request #561 from hashicorp/b-consul-sync
Generate check names, check id and service id on the server side
2015-12-10 16:48:01 -08:00
Diptanu Choudhury 4395438400 Changing naming and debug message schemes 2015-12-10 16:47:43 -08:00
Alex Dadgar 0a950a4070 Merge pull request #556 from hashicorp/b-cache-docker-client
Do.Once docker client initialization
2015-12-10 16:19:06 -08:00
Diptanu Choudhury b3c161a7d5 Generate check names, check id and service id on the server side 2015-12-10 16:07:17 -08:00
Chris Bednarski 23c7012707 Merge pull request #558 from hashicorp/b-raw-exec-dev
Enable raw exec in dev mode
2015-12-10 15:29:17 -08:00
Chris Bednarski 545f0ff120 Move raw_exec enabled into the DevMode config block 2015-12-10 15:24:21 -08:00
Charlie Drage bbae520a38 Fix minor spelling error 2015-12-10 18:09:14 -05:00
Chris Bednarski 36e828ea9a Use ReadBoolDefault 2015-12-10 15:03:25 -08:00
Chris Bednarski 65d4aa889b Enable raw exec in dev mode 2015-12-10 14:48:06 -08:00
Alex Dadgar 5eeec26102 Do Once docker client initialization 2015-12-10 13:49:29 -08:00
Chris Bednarski 241d7d93bd Merge pull request #519 from ChrisHines/windows-storage
client/fingerprint: Use GetDiskFreeSpaceEx instead of parsing output of fsutil on Windows.
2015-12-10 10:13:20 -08:00
Diptanu Choudhury 0bd552edb9 Added some extra log lines 2015-12-10 06:05:07 -08:00
Chris Hines 53ecc03022 Improve error messages. 2015-12-09 16:34:18 -05:00
Diptanu Choudhury de06482506 Sending the user process sigint during shutdown on linux 2015-12-08 08:14:13 -08:00
Diptanu Choudhury a2ef63a67d Fixing some log lines 2015-12-07 06:25:00 -08:00
Chris Bednarski 9292a97062 Merge branch 'user-lookup-nocgo' of https://github.com/carlosdp/nomad into b-user-lookup 2015-12-01 13:44:56 -08:00
Carlos Diaz-Padron 55e49506f0 Refactor out userLookup to helper package
Also replaces user.Lookup in exec driver
2015-12-01 11:59:55 -08:00
Alex Dadgar b039f963f0 Merge pull request #514 from kaskavalci/master
Fixed git vet error on formatting
2015-12-01 08:58:19 -08:00
Chris Hines 6697980331 Use GetDiskFreeSpaceEx instead of parsing output of fsutil on Windows. 2015-11-30 16:43:25 -05:00
Halil Kaskavalci 8957a47ec4 Fixed git vet error on formatting 2015-11-30 10:27:26 +00:00
Bryant Luk 22e9711852 Verify Consul SSL by default
- Matches documentation default value and clarifies config
2015-11-28 19:58:09 -06:00
Diptanu Choudhury e25c260694 Merge pull request #509 from hashicorp/f-service-name
Implemented interpolation of Job, Task group and Task Names in Service Name
2015-11-26 23:28:13 -08:00
Diptanu Choudhury 29915ddd16 Moving the args to helper 2015-11-26 14:13:19 -08:00
Diptanu Choudhury 9862c476e9 Merge pull request #504 from hashicorp/b-checks
This simplifies the logic of tracking services and checks
2015-11-26 13:59:38 -08:00
Diptanu Choudhury fbe3bd0724 Fixed some docs 2015-11-26 13:47:02 -08:00
Diptanu Choudhury 7bab4d191a Added more docs 2015-11-26 11:25:09 -08:00
Diptanu Choudhury 86a45b5b39 Added a mock consul api client 2015-11-26 01:03:16 -08:00
Diptanu Choudhury f71a664faa Fixed a few tests 2015-11-26 00:26:10 -08:00
Diptanu Choudhury 01ca982f92 Added a test for modifying check 2015-11-25 18:37:51 -08:00
Diptanu Choudhury db8c4170b3 Fixed merge conflicts 2015-11-25 18:32:37 -08:00
Diptanu Choudhury 634e856c1f Added some comments 2015-11-25 18:31:11 -08:00
Diptanu Choudhury 5eb8a26376 Fixed tests 2015-11-25 18:23:47 -08:00
Diptanu Choudhury 9cf10d64a5 making the service checks in service pointers 2015-11-25 17:44:57 -08:00
Alex Dadgar 40b73758c9 Merge pull request #502 from ChrisHines/portable-driver-tests
Portable client/driver tests.
2015-11-25 17:36:40 -08:00
Diptanu Choudhury 32f0a80701 Made the logic to track checks simpler 2015-11-25 17:28:44 -08:00
Diptanu Choudhury f66069a08d Using the service id in check hash 2015-11-25 15:17:27 -08:00
Diptanu Choudhury c4fef7e91d Fixed the alloc runner test 2015-11-25 14:54:52 -08:00
Diptanu Choudhury f26d301702 Fixed the build 2015-11-25 14:45:28 -08:00
Diptanu Choudhury 3f82deff60 Added options for adding more consul configuration 2015-11-25 13:39:16 -08:00
Diptanu Choudhury b35819f10a Merge pull request #498 from hashicorp/b-consul-check
Handle updates of Service and Check definitions
2015-11-25 13:17:26 -08:00
Chris Hines 37745f66c9 Speed up tests by allowing parallel execution. 2015-11-25 15:56:55 -05:00
Chris Hines 5b2168bb12 Use package testtask and httptest.Server to make client/driver tests OS independent. 2015-11-25 15:56:20 -05:00
Chris Hines e569fb4787 Use package testtask in client/driver/spawn tests. 2015-11-25 15:34:55 -05:00
Chris Hines 46e848c8ec Eliminate special case in production code for embedding test binary into chroot. 2015-11-25 15:31:29 -05:00
Diptanu Choudhury 95942b4179 Improved tests 2015-11-25 12:06:14 -08:00
Diptanu Choudhury 576a6f402e Added a test to make sure we are adding a check to a service 2015-11-25 11:20:36 -08:00
Diptanu Choudhury 5480a2bd0f Saving the host and port in tracked service 2015-11-24 18:58:53 -08:00
Diptanu Choudhury 6353dde236 Fixing comment and syntax 2015-11-24 18:43:23 -08:00
Diptanu Choudhury 28a21061ce Implemented syncing of checks 2015-11-24 18:39:38 -08:00
Chris Hines d7ebe099c1 Factor portable test task out of client/driver/executor. 2015-11-24 20:59:42 -05:00
Diptanu Choudhury f72027277d Dried the tests 2015-11-24 17:33:04 -08:00
Diptanu Choudhury 2c0822284b Tracking the tasks too 2015-11-24 17:26:30 -08:00
Alex Dadgar c7cd7abe22 Inject the current binary into the chroot in test mode 2015-11-24 16:30:53 -08:00
Chris Hines ea5a60629a Fix Executor_Open_Invalid test for Windows. 2015-11-24 16:30:53 -08:00
Chris Hines cb262d787f Include Executor_Open_Invalid in test suite. 2015-11-24 16:30:53 -08:00
Chris Hines 769415dbd2 Improve names and documentation in test code. 2015-11-24 16:30:53 -08:00
Chris Hines ec7e78680d Use TestMain to provide portable echo, sleep, and write commands. 2015-11-24 16:30:53 -08:00
Diptanu Choudhury 919f763ca8 Added a test to re-sync services 2015-11-24 14:37:14 -08:00
Diptanu Choudhury 135006699b Renamed consul client to service 2015-11-24 12:34:26 -08:00
Alex Dadgar 5d0a257d6a Merge branch 'master' of https://github.com/hashicorp/nomad 2015-11-24 11:06:56 -08:00
Alex Dadgar b2daa5e2e6 Standardize log messages in fingerprinters to DEBUG 2015-11-24 11:06:51 -08:00
Diptanu Choudhury a3d5b266a0 Registering Checks independently 2015-11-24 10:02:33 -08:00
Diptanu Choudhury c1a16eefaa Removing a hot debug line 2015-11-24 10:02:33 -08:00
max 953ed6ac76 Client config option "fingerprint.whitelist" 2015-11-24 16:18:49 +01:00
Diptanu Choudhury ff01b1dbd7 Updated changelog 2015-11-23 11:01:41 -08:00
Diptanu Choudhury 3d002b716d removing redundant fail() 2015-11-23 10:59:07 -08:00
Diptanu Choudhury b8c5268d88 Making the restart tracker aware of the exit codes 2015-11-23 10:56:38 -08:00
Diptanu Choudhury 4d2fe73dfb Not restarting if a task exited properly 2015-11-22 23:47:15 -08:00
Alex Dadgar 6e59527a97 Clear consul attributes if consul couldn't be fingerprinted 2015-11-22 13:51:10 -08:00
Alex Dadgar 77d86d5bb0 Fingerprinter only creates one consul client 2015-11-22 13:42:06 -08:00
Chris Bednarski 3ed8cb5b8b Merge pull request #481 from hashicorp/b-vet
Fix some issues caught by go vet
2015-11-20 16:31:47 -08:00
Chris Bednarski e6daf57b10 Merge pull request #480 from hashicorp/f-docker-tls-config
Added docker.tls config file options and docs
2015-11-20 16:31:41 -08:00
Chris Bednarski 655a4bf334 Fix some issues caught by go vet 2015-11-20 16:01:27 -08:00
Chris Bednarski 719c345164 Change println to printf 2015-11-20 16:00:58 -08:00
Chris Bednarski 8169c8e185 Don't show endpoint when we're not using it 2015-11-20 15:53:38 -08:00
Chris Bednarski 4063b6583e Added docker.tls config file options and docs 2015-11-20 15:47:03 -08:00
Diptanu Choudhury f4efcf9678 Merge pull request #479 from hashicorp/r-consul-check
Using the service name in the service id so that it's unique
2015-11-20 15:33:57 -08:00
Alex Dadgar 34b2f62c0b Merge pull request #442 from ChrisHines/windows-spawn
Fix tests for nomad/client/driver/spawn package to work on Windows.
2015-11-20 14:49:54 -08:00
Chris Bednarski 16291b2d4f Merge pull request #476 from hashicorp/b-docker-expose
Fixed some issues with expose, port mapping, and environment variables
2015-11-20 14:24:25 -08:00
Alex Dadgar 835343f47d Renamed whitelisted to skipped and update debug line 2015-11-20 14:07:35 -08:00
Chris Bednarski 10bb550ad8 Added client checks back to the tests that can't use dockerSetup() 2015-11-20 13:50:47 -08:00
Diptanu Choudhury aaca44c512 Using the service name in the service id so that it's uniq 2015-11-20 10:35:04 -08:00
Chris Bednarski dd8c9c28f8 Added nil to network.MapLabelToValues call 2015-11-19 22:18:19 -08:00
Chris Bednarski cf4bb4cfd0 Squash []map[string]type for port_map and labels into map[string]type 2015-11-19 21:29:37 -08:00
Chris Bednarski 275550dcd3 Fixed some issues with expose, port mapping, and environment variables
- Port mapping now works for reserved ports as well as dynamic ports
- Environment variables were being set twice in two different ways; now they are only set once
- Comprehensive tests for exposed ports, forwarded ports, and environment variables
- Cleaned up / DRYed up a lot of test code
2015-11-19 19:08:21 -08:00
Alex Dadgar f64605968f Tests 2015-11-19 16:43:08 -08:00
Alex Dadgar c78f69bdee Implement the driver whitelist 2015-11-19 16:39:21 -08:00
Chris Bednarski b9b786732e Export DockerHandle and change tests to use DockerHandle.ContainerID() 2015-11-19 14:20:41 -08:00
Chris Bednarski 6253b1d0aa Add ContainerID() method to get the containerID from a handle 2015-11-19 13:57:18 -08:00
Chris Bednarski 96f4522a93 Merge pull request #466 from fernandezvara/fix-docker-port-mappings
docker port allocation not mapping correctly
2015-11-19 10:34:54 -08:00
Antonio Fernández 581245f881 fix docker port allocation? 2015-11-19 19:15:25 +01:00
Alex Dadgar a352c0fc69 Fix network fingerprint test 2015-11-19 09:22:32 -08:00
Diptanu Choudhury d60db5db1c Merge pull request #464 from hashicorp/f-consul-check
Changing the code comment
2015-11-18 19:35:15 -08:00
Diptanu Choudhury 3eb291faef Changing the code comment 2015-11-18 19:34:50 -08:00
Alex Dadgar 5faa2fd1d9 Merge pull request #463 from hashicorp/f-consul-check
Nuking the service and registering it so that checks are cleaned up
2015-11-18 19:34:20 -08:00
Diptanu Choudhury be4b981aef Nuking the service and registering it so that checks are cleaned up 2015-11-18 19:31:29 -08:00
Alex Dadgar f5623a736d Merge pull request #460 from hashicorp/f-consul-check
Making sure we sync the real state of services of a Task with Consul
2015-11-18 19:03:53 -08:00
Alex Dadgar cf4a44352f Allow no interfaces in network fingerprinter 2015-11-18 19:01:39 -08:00
Diptanu Choudhury ece7877a15 Triggering the next sync after we have finished the current one 2015-11-18 18:47:12 -08:00
Diptanu Choudhury 33472fd594 Making sure we sync the real state of services of a Task with Consul 2015-11-18 18:35:22 -08:00
Chris Hines 3a77952d59 Handle additional edge cases when parsing environment variables. 2015-11-18 21:21:07 -05:00
Diptanu Choudhury 65bac7f4db Updating checks and services when allocs are refreshed 2015-11-18 17:33:29 -08:00
Diptanu Choudhury f525d86958 Added a test to ensure invalid services are not registered 2015-11-18 17:29:12 -08:00
Alex Dadgar 4d817f5cbc Revert "Revert "Make drivers take arguments as a list and not as a string"" 2015-11-18 15:16:42 -08:00
Diptanu Choudhury d65d1bdfac Merge pull request #455 from hashicorp/f-consul-check
Refactor consul check
2015-11-18 14:33:34 -08:00
Diptanu Choudhury 9592fd3912 Added a check for accpeting protocol information in consul check 2015-11-18 14:29:55 -08:00
Diptanu Choudhury c9ca03afa5 Added a test to check check creation 2015-11-18 14:29:55 -08:00
Diptanu Choudhury 5608531143 Added a test to check check creation 2015-11-18 14:29:55 -08:00
Diptanu Choudhury bb7f29f023 Changed the http field to path 2015-11-18 14:29:55 -08:00
Alex Dadgar 0e51375285 Revert "Make drivers take arguments as a list and not as a string" 2015-11-18 13:46:43 -08:00
Alex Dadgar 6574fd27e3 Remove returning the error 2015-11-18 12:40:34 -08:00
Alex Dadgar 282509eb9b More test fixes 2015-11-18 12:30:42 -08:00
Alex Dadgar 5a678548fa Rebase 2015-11-18 12:30:35 -08:00
Alex Dadgar c04e2b8b8e Fix executor tests 2015-11-18 12:29:04 -08:00
Alex Dadgar 54ddf4d3c1 Rebase 2015-11-18 12:29:04 -08:00
Alex Dadgar 7b918ee1e7 Update ParseAndReplace to take a list of args and remove shell style parsing 2015-11-18 12:29:04 -08:00
Chris Hines 713d63e467 Move test code to *_test.go file. 2015-11-18 14:46:56 -05:00
Chris Bednarski fc69721cc7 Added missing %s to error format string 2015-11-18 11:29:49 -08:00
Chris Bednarski e17f5984ef Revert "Added missing %s to error format string"
This reverts commit f4acdfd035c2ffa196035cc574d8b40a1795abb3.
2015-11-18 11:28:38 -08:00
Chris Bednarski 7a077a29b5 Added missing %s to error format string 2015-11-18 11:28:07 -08:00
Diptanu Choudhury 6c141e253e Merge pull request #446 from hashicorp/f-consul-client
Register services with Consul
2015-11-18 10:39:58 -08:00
Diptanu Choudhury 2deed3a2eb Added a log line to indicate we are registering a service with Consul 2015-11-18 10:32:31 -08:00
Chris Bednarski b9fcdc400a Merge branch 'master' into f-docker-dns-config 2015-11-18 10:31:06 -08:00
Diptanu Choudhury 41a1e6d74b Added a lock around modification of tracked services map 2015-11-18 09:36:37 -08:00
Diptanu Choudhury 93d0dbc974 Added some docs 2015-11-18 05:49:40 -08:00
Diptanu Choudhury 2f1f3d3898 Removed a debug log 2015-11-18 05:20:57 -08:00
Diptanu Choudhury 2ee71ffb59 Added the option to configure consul address 2015-11-18 05:15:52 -08:00
Diptanu Choudhury e83387191e Shutting down consul an not trying to de-register the consul service 2015-11-18 04:59:57 -08:00
Diptanu Choudhury cc26cb9a7b Added the logic to retry services which needs to be tracked if consul doesn't respond 2015-11-18 04:34:23 -08:00
Diptanu Choudhury 962e10b102 Registering the checks with consul 2015-11-18 03:08:53 -08:00
Diptanu Choudhury b8c2cc81f0 Defering calling the de-register from consul call when a service is not running 2015-11-18 02:37:34 -08:00
Diptanu Choudhury cb34f34c12 Added a logger to consul client 2015-11-18 02:14:07 -08:00
Carlos Diaz-Padron 4a6c3d773d Nest Docker driver auth under object 2015-11-18 01:37:42 -08:00
Diptanu Choudhury a447b1ea3c DRYed the code 2015-11-18 01:20:53 -08:00
Diptanu Choudhury d6da6372cd Moving the logic to find port and host inside consul client 2015-11-18 01:18:29 -08:00
Diptanu Choudhury 404810043a Added the implementation of consul client 2015-11-18 00:50:45 -08:00
Carlos Diaz-Padron de6c06d332 De-nest docker registry auth and reformat related doc 2015-11-17 23:32:57 -08:00
Chris Bednarski f4344092fb Change DNS and DNSSearch to use lists; added a test 2015-11-17 22:02:23 -08:00
Chris Bednarski c80cf651e8 Merge branch 'master' into f-docker-dns-config 2015-11-17 21:43:04 -08:00
Chris Bednarski 7b25c9b4d9 Change dns_servers and dns_search_domains from comma-delimited strings to lists 2015-11-17 21:41:00 -08:00
Chris Bednarski 6c1df52342 Merge pull request #439 from hashicorp/b-docker-ports-len
Fix docker port tests and empty port_map
2015-11-17 21:37:48 -08:00
Chris Bednarski c851ae67c7 Change error check to contains instead of == 2015-11-17 21:36:23 -08:00
Chris Bednarski 563e1aff56 Renamed some things so it's more apparent that reserved and dynamic port mapping have very similar code 2015-11-17 21:34:07 -08:00
Chris Bednarski 8705ea07a4 Remove \n since this is added by the logger 2015-11-17 21:17:51 -08:00
Alex Dadgar 2a8bd98fdc Qemu driver takes a port_map to configure host to guest port forwarding 2015-11-17 20:54:53 -08:00
Chris Bednarski 5ac6664c46 Purge existing container during Start() 2015-11-17 20:50:14 -08:00
Chris Hines af2c47460b Speed up tests by allowing parallel execution. 2015-11-17 23:43:20 -05:00
Chris Hines 2120e9e10a Move defer f.Close after error check. 2015-11-17 23:43:20 -05:00
Chris Hines 8e8eccee20 Use TestMain to provide portable echo and sleep commands. 2015-11-17 23:43:19 -05:00
Chris Hines 071018569d Extract code to acquire temp file name and make sure the file is closed so os.Remove works on Windows. 2015-11-17 23:43:18 -05:00
Chris Bednarski 0e1fe2373a Log container name and labels 2015-11-17 20:04:10 -08:00
Chris Bednarski 640af994ca Added a randomized alloc id for tests so container names don't collide 2015-11-17 19:45:33 -08:00
Chris Bednarski 9a7adb9eb3 Fix guards for docker port mapping and change dummy dynamic ports to real ports (0 is not a valid port) 2015-11-17 19:21:36 -08:00
Alex Dadgar 45bb0d349c Update API docs 2015-11-17 19:12:19 -08:00
Chris Bednarski d098acef90 Fix guard for port maps not being specified 2015-11-17 18:16:01 -08:00
Chris Bednarski 122220a424 Merge branch 'master' into f-docker-any-network 2015-11-17 17:22:13 -08:00
Chris Bednarski 9cad290b18 Merge pull request #436 from hashicorp/f-docker-cleanup
Cleanup docker driver
2015-11-17 17:13:17 -08:00
Chris Bednarski b22b5eb3aa Inline err assignment 2015-11-17 17:12:45 -08:00
Chris Bednarski a2f4188246 Streamline reading boolean values from the driver / job config 2015-11-17 16:58:23 -08:00
Chris Bednarski 67ee502acb Added missing linebreaks for log.Printf calls 2015-11-17 16:49:01 -08:00
Chris Bednarski 43aaf94383 Do Itoa once so line items are simpler 2015-11-17 16:31:47 -08:00
Chris Bednarski ffd3f114dd Merge branch 'docker-allow-to-add-labels' of https://github.com/fernandezvara/nomad into f-docker-labels 2015-11-17 16:02:42 -08:00
Chris Bednarski 3b7c252090 Improve phrasing in log messages 2015-11-17 15:17:44 -08:00
Alex Dadgar 7551a263c5 Merge pull request #389 from achanda/name
Set a name for the container
2015-11-17 15:07:23 -08:00
Chris Bednarski 629cdd6baa Clean up extraneous variables 2015-11-17 14:51:38 -08:00
Chris Bednarski 7f117b3b55 That's not a declaration 2015-11-17 14:27:58 -08:00
Chris Bednarski 89c6f56059 Remove restrictions from docker networking mode; we assume users know what they are doing 2015-11-17 14:25:10 -08:00
Chris Bednarski f2e8357e4a Merge branch 'master' into f-docker-cleanup 2015-11-17 14:20:29 -08:00
Alex Dadgar 171a23cb74 Merge branch 'master' of https://github.com/hashicorp/nomad 2015-11-17 12:04:10 -08:00
Alex Dadgar 11b43f8e1f Avoid calling destroy twice 2015-11-17 12:03:59 -08:00
Antonio Fernández f7f83ee81c allow to set labels on docker containers 2015-11-17 14:12:49 +01:00
Carlos Diaz-Padron 77923255b4 Add hostname parameter to Docker driver 2015-11-16 22:44:44 -08:00
Chris Bednarski bac9bd60dc Improve logging and DRY some of the port mapping code 2015-11-16 19:55:49 -08:00
Chris Bednarski e9bc0905d1 Add missing param and error in the missing case so default will work as expected 2015-11-16 19:55:08 -08:00
Chris Bednarski bd4c6b371d Added config reader for booleans 2015-11-16 19:30:37 -08:00
Diptanu Choudhury 03847dd65a Addressed some review comments 2015-11-16 22:29:06 -05:00
Chris Bednarski d00c700318 go fmt 2015-11-16 16:23:03 -08:00
Chris Bednarski 714e1b52d1 Change logging port as %d to logging port.Value 2015-11-16 16:05:28 -08:00
Chris Bednarski 9f40143684 Merge branch 'master' into f-port-labels 2015-11-16 16:02:38 -08:00
Alex Dadgar ea0edd8c2f Change SetExitMessage from taking a string to an error 2015-11-16 15:14:21 -08:00
Alex Dadgar e76a613974 Use loop not recursion 2015-11-16 15:14:21 -08:00
Alex Dadgar b649039448 Fix the capacity 2015-11-16 15:14:21 -08:00
Alex Dadgar 82f51601db Track Task State in the client and capture Wait results 2015-11-16 15:14:21 -08:00
Diptanu Choudhury c5102975e3 Made the code more DRY 2015-11-16 13:10:57 -08:00
Diptanu Choudhury e40229aed6 Fixed the docker auth config 2015-11-16 13:10:57 -08:00
Diptanu Choudhury 7d44725370 Adding comments to fields in the docker driver config 2015-11-16 13:10:57 -08:00
Alex Dadgar fa60d86fe5 mapstructure close quotes 2015-11-16 13:10:57 -08:00
Diptanu Choudhury 5e876e9c86 Fixed the java driver config 2015-11-16 13:10:57 -08:00
Diptanu Choudhury 9d76572831 Making sure that there is only one port_map block in the docker driver config 2015-11-16 13:10:57 -08:00
Diptanu Choudhury 3b3907e367 Fixed the exec driver config 2015-11-16 13:10:57 -08:00
Diptanu Choudhury ba9f101660 Fixed the test related to setting env variables in tasks 2015-11-16 13:10:57 -08:00
Diptanu Choudhury ad4248e087 Fixed the allocdir tests 2015-11-16 13:10:57 -08:00
Diptanu Choudhury 0673b832fb Fixed compilation issues with driver tests 2015-11-16 13:10:57 -08:00
Diptanu Choudhury 69efc89436 Fixed the client tests 2015-11-16 13:10:57 -08:00
Diptanu Choudhury 78a0f82bc5 Making the config for drivers public 2015-11-16 13:10:57 -08:00
Diptanu Choudhury 4e05b27111 Implemented port labeling and driver configs 2015-11-16 13:10:57 -08:00
Carlos Diaz-Padron ffe67d8910 Remove CGO dependency for user lookup in allocdir
os/user's user.Lookup requires that the artifact be compiled with CGO
support enabled. This change instead reads /etc/passwd directly.

The code was acquired from docker/docker#1096
2015-11-15 21:26:34 -08:00
Chris Bednarski fc1c28357b Merge pull request #412 from hashicorp/f-docker-expose
Expose provisioned ports for docker containers
2015-11-13 11:41:13 -08:00
Guillaume Jacquet 4a3e709eef Fix AWS metadata url
Fix URL. It was printing an error message on startup:
```
2015/11/13 15:49:21 [ERR] fingerprint.env_aws: Error querying AWS Metadata URL, skipping
```

By the way is it safe to use latest? Is there a chance that Amazon decides to change the format of the metadata? It could be safer to use something like `http://169.254.169.254/2014-11-05/meta-data`
2015-11-13 11:03:05 -05:00
Chris Bednarski ef00ab3198 Change this to a valid IP address so docker can bind to it 2015-11-12 21:46:59 -08:00
Chris Bednarski 2f05a15aa5 Expose mapped ports 2015-11-12 17:23:04 -08:00
Diptanu Choudhury 3b4cb6dbc9 Saving state of the Task Runner while it's trying to update it 2015-11-12 15:53:42 -08:00
Alex Dadgar d3e2455459 Merge pull request #408 from hashicorp/f-client-restore
Client Restore State Fixes
2015-11-11 12:32:11 -08:00
Chris Bednarski 7fb75525b0 Merge pull request #407 from hashicorp/f-docker-host-env
Change Docker ENV behavior
2015-11-10 19:30:11 -08:00
Alex Dadgar 6119f42d65 Check for previous embeds at entry level not folder level 2015-11-10 18:10:02 -08:00
Chris Bednarski b637ca7f60 Added some comments to the test to explain why we're doing stuff this way 2015-11-10 17:48:06 -08:00
Chris Bednarski c5682fc751 Change dockerIs* to accept *testing.T for logging 2015-11-10 17:43:08 -08:00
Alex Dadgar 7c6b80a8fd Merge pull request #400 from nak3/fingerprint-test
Update fingerprint test codes
2015-11-10 17:06:16 -08:00
Alex Dadgar 787164044d Enable Open tests for Exec/Java 2015-11-10 16:59:52 -08:00
Alex Dadgar 594cc6b9a8 Enable AllocRunner_SaveRestoreState test 2015-11-10 16:53:59 -08:00
Alex Dadgar 1861d8312b Update test 2015-11-10 16:49:38 -08:00
Alex Dadgar e6a8a23544 Increase time out 2015-11-10 16:37:17 -08:00
Alex Dadgar 90336a160e Guard mounting dev/ and proc/ and TaskRunner_RestoreState test 2015-11-10 16:35:33 -08:00
Chris Bednarski 7f3a2595af Change Docker fingerprinter to INFO and not error when the connection to the daemon fails; we simply assume docker isn't there. 2015-11-10 16:18:52 -08:00
Alex Dadgar 933498e388 Client Restore test 2015-11-10 16:03:18 -08:00
Chris Bednarski e5688620e4 Changed behavior for Docker ENV
- Docker ENV variables now work the same way in production, dev, and test
- Docker ENV variables are *ignored* if docker.endpoint is present in the Nomad config file
- Remote tests now work correctly
2015-11-10 15:54:31 -08:00
Alex Dadgar 2c7da463b8 Fix alloc_dir mounting through task restarts 2015-11-10 14:12:30 -08:00
Diptanu Choudhury 210f744503 Returning back if alloc runner isn't saved 2015-11-09 17:04:53 -08:00
Diptanu Choudhury 4ba5434898 Exctracted a method to save the alloc runner state 2015-11-09 16:59:02 -08:00
Diptanu Choudhury c618d7ed58 Inlining error check 2015-11-09 16:45:42 -08:00
Diptanu Choudhury 38a047ec6d Refactored Save State of Alloc runner 2015-11-09 16:15:11 -08:00
Alex Dadgar 19d0c97da7 Client restores state properly 2015-11-09 15:55:31 -08:00
Diptanu Choudhury 5ef34f7560 Returning once we have an error while saving a task that doesn't exist 2015-11-09 12:44:14 -08:00