Commit Graph

5884 Commits

Author SHA1 Message Date
James Phillips 73b8d6d3b1 Merge pull request #3123 from hashicorp/upgrade-warn
Changes FSM catalog info messages into warnings.
2017-06-07 20:47:06 -07:00
James Phillips f7ec641c96
Changes FSM catalog info messages into warnings. 2017-06-07 20:46:39 -07:00
James Phillips e7cf67b31b Update CHANGELOG.md 2017-06-07 10:42:55 -07:00
James Phillips a09eed585e Merge pull request #3121 from hashicorp/increase-graceful-timeout
agent: increase graceful shutdown timeout
2017-06-07 10:42:19 -07:00
James Phillips 8ffa0e730f Merge pull request #3118 from katiebayes/master
Add enterprise badges and update middleman version
2017-06-07 10:41:57 -07:00
James Phillips 24ebe5cc30 Merge pull request #3120 from hashicorp/better-shutdown-logs
agent: log different shutdown stages
2017-06-07 10:41:37 -07:00
James Phillips 98423f3def Merge pull request #3119 from hashicorp/contrib-cluster-test-script
test: add script for starting a multi-node cluster
2017-06-07 10:41:02 -07:00
James Phillips a8ec191290 Update CHANGELOG.md 2017-06-07 10:39:51 -07:00
Frank Schroeder fe69de3bba
agent: increase graceful shutdown timeout
When triggering a leave through an INT/TERM signal the hard-coded
timeout of 5 seconds is too short to complete the leave successfully.
Therefore, the agent always times out.

This value should probably configurable.
2017-06-07 13:12:34 +02:00
Frank Schroeder 46c055d57b
agent: log differnt shutdown stages
Log the different code paths during shutdown.
2017-06-07 13:11:04 +02:00
Frank Schroeder bab941e76f
test: add script for starting a multi-node cluster 2017-06-07 13:08:19 +02:00
Frank Schroeder 9224daf585
Update CHANGELOG.md 2017-06-07 09:53:11 +02:00
Katie Bayes ec1f0fd0e0 update middleman version from 25 to 26 2017-06-06 20:12:32 -04:00
Frank Schröder 825f72f5ef agent: support custom header and method for http checks (#3106)
This patch adds support for custom headers and
method for HTTP checks.

Fixes #2474
Fixes #2657
Fixes #3106
2017-06-07 01:11:56 +02:00
Katie Bayes e82884e983 Merge branch 'master' of https://github.com/katiebayes/consul 2017-06-06 16:02:32 -04:00
Katie Bayes fb2b4776c5 update middleman version 2017-06-06 16:00:11 -04:00
James Phillips 2b4f31dfc0 Merge pull request #3116 from hashicorp/reup-certs
Updates unit test certs for another year.
2017-06-05 19:23:04 -07:00
James Phillips 6f7ff554d0
Updates unit test certs for another year. 2017-06-05 19:22:20 -07:00
James Phillips 2424e31fa9 Merge pull request #3114 from hashicorp/minor_readme_fixes
update README to mention using CONSUL_DEV
2017-06-05 17:34:52 -07:00
Preetha Appan 5f140b1690 update README to mention using CONSUL_DEV 2017-06-05 15:49:50 -07:00
Frank Schroeder 94b39557e8 test: refactor TestDecodeConfig test
This patch refactors the multiple tests for
DecodeConfig into a single table-driven test
that tests most fields individually.
2017-06-04 23:55:12 +02:00
Frank Schroeder 325f82972a test: Fix TestAgent_Reload
This test was still referring to cmd.agent which has been removed.
2017-06-04 22:45:40 +02:00
Katie Bayes 5648e5e5a8 add enterprise badge style alert boxes, change guides/areas.html.md to erb file 2017-06-04 01:30:21 -04:00
James Phillips 240413f5d6 Merge pull request #3105 from hashicorp/test-stability
Tweaks things for better test stability.
2017-06-03 10:09:12 -07:00
Frank Schroeder 51e0e158f1 agent: fix graceful http server shutdown 2017-06-03 19:08:50 +02:00
Frank Schroeder ae711c3b04 agent: cleanup run method 2017-06-03 19:08:50 +02:00
Frank Schroeder b203ffab29 agent: move registerWatches out of the run method 2017-06-03 19:08:50 +02:00
Frank Schroeder 11245e53a7 agent: move telemetry out of the run method 2017-06-03 19:08:50 +02:00
Frank Schroeder 84f5e8c3ab agent: move update check out of the run method 2017-06-03 19:08:50 +02:00
Frank Schroeder 96d8035adc agent: simplify signal handling 2017-06-03 19:08:50 +02:00
Frank Schroeder 34fd31b7b1 agent: move config reloading into the agent 2017-06-03 19:08:50 +02:00
Frank Schroeder aa1519c9f7 agent: move parseMetaPair to config and export 2017-06-03 19:08:50 +02:00
Frank Schroeder cb98754cd6 agent: remove agent from command
Decouple command and agent a bit more.
2017-06-03 19:08:50 +02:00
Frank Schroeder d977aa1fe7 agent: move retry join into agent 2017-06-03 19:08:50 +02:00
Frank Schroeder 55a513da2e agent: add GossipEncrypted function
Remove dead code and expose a GossipEncrypted() method
on the agent instead of accessing the internal delegate.
2017-06-03 19:08:50 +02:00
James Phillips 65bbad0975 Update CHANGELOG.md 2017-06-02 21:45:14 -07:00
James Phillips cbedf92157 Update CHANGELOG.md 2017-06-02 21:45:03 -07:00
James Phillips 3baa703d02 Merge pull request #3077 from jwasinger/issue-2850
Prevent Session.Destroy from leaving open TCP connections
2017-06-02 21:43:55 -07:00
James Phillips b0b5df579f
Cleans up an unrelated vet error. 2017-06-02 21:07:15 -07:00
James Phillips b4b5036dfb
Adds back the port shuffle on agent start retries. 2017-06-02 20:53:20 -07:00
James Phillips 9c8f656a29
Takes parallel away from some currently flaky tests. 2017-06-02 18:07:27 -07:00
James Phillips 86003d91a2 Merge pull request #3104 from hashicorp/bad-shutdown
Cleans up incorrect router shutdown.
2017-06-02 16:38:08 -07:00
James Phillips 798120d0c4
Cleans up incorrect router shutdown.
Fixes #3102.
2017-06-02 16:33:48 -07:00
James Phillips da9ab5985f Merge pull request #3103 from hashicorp/fail-for-sure
Makes test target fail based on return code from go test.
2017-06-02 15:10:45 -07:00
James Phillips e9ee136baf
Makes test target fail based on return code from go test. 2017-06-02 15:09:07 -07:00
James Phillips d9fb90be6a Update CHANGELOG.md 2017-06-02 09:33:58 -07:00
James Phillips 555cc9b44a Update CHANGELOG.md 2017-06-02 09:07:31 -07:00
James Phillips 5f9776ac89 Merge pull request #2621 from alicebob/devwatch
reset watch's lastIndex on error
2017-06-02 09:06:02 -07:00
Frank Schroeder 68cac3d40c
Revert "test: run all tests together again"
This reverts commit e48df7b572.
2017-06-02 07:52:21 +02:00
Frank Schroeder 4403db0d63
vendor: Update github.com/shirou/gopsutil
Pull in fix for data race on host.BootTime.
2017-06-02 07:51:08 +02:00