Commit graph

162 commits

Author SHA1 Message Date
Frank Schroeder 3396f11cfd
Replace monkey patch with code from https://github.com/hashicorp/hcl/pull/213 2017-09-26 12:42:03 +02:00
Frank Schröder 69a088ca85 New config parser, HCL support, multiple bind addrs (#3480)
* new config parser for agent

This patch implements a new config parser for the consul agent which
makes the following changes to the previous implementation:

 * add HCL support
 * all configuration fragments in tests and for default config are
   expressed as HCL fragments
 * HCL fragments can be provided on the command line so that they
   can eventually replace the command line flags.
 * HCL/JSON fragments are parsed into a temporary Config structure
   which can be merged using reflection (all values are pointers).
   The existing merge logic of overwrite for values and append
   for slices has been preserved.
 * A single builder process generates a typed runtime configuration
   for the agent.

The new implementation is more strict and fails in the builder process
if no valid runtime configuration can be generated. Therefore,
additional validations in other parts of the code should be removed.

The builder also pre-computes all required network addresses so that no
address/port magic should be required where the configuration is used
and should therefore be removed.

* Upgrade github.com/hashicorp/hcl to support int64

* improve error messages

* fix directory permission test

* Fix rtt test

* Fix ForceLeave test

* Skip performance test for now until we know what to do

* Update github.com/hashicorp/memberlist to update log prefix

* Make memberlist use the default logger

* improve config error handling

* do not fail on non-existing data-dir

* experiment with non-uniform timeouts to get a handle on stalled leader elections

* Run tests for packages separately to eliminate the spurious port conflicts

* refactor private address detection and unify approach for ipv4 and ipv6.

Fixes #2825

* do not allow unix sockets for DNS

* improve bind and advertise addr error handling

* go through builder using test coverage

* minimal update to the docs

* more coverage tests fixed

* more tests

* fix makefile

* cleanup

* fix port conflicts with external port server 'porter'

* stop test server on error

* do not run api test that change global ENV concurrently with the other tests

* Run remaining api tests concurrently

* no need for retry with the port number service

* monkey patch race condition in go-sockaddr until we understand why that fails

* monkey patch hcl decoder race condidtion until we understand why that fails

* monkey patch spurious errors in strings.EqualFold from here

* add test for hcl decoder race condition. Run with go test -parallel 128

* Increase timeout again

* cleanup

* don't log port allocations by default

* use base command arg parsing to format help output properly

* handle -dc deprecation case in Build

* switch autopilot.max_trailing_logs to int

* remove duplicate test case

* remove unused methods

* remove comments about flag/config value inconsistencies

* switch got and want around since the error message was misleading.

* Removes a stray debug log.

* Removes a stray newline in imports.

* Fixes TestACL_Version8.

* Runs go fmt.

* Adds a default case for unknown address types.

* Reoders and reformats some imports.

* Adds some comments and fixes typos.

* Reorders imports.

* add unix socket support for dns later

* drop all deprecated flags and arguments

* fix wrong field name

* remove stray node-id file

* drop unnecessary patch section in test

* drop duplicate test

* add test for LeaveOnTerm and SkipLeaveOnInt in client mode

* drop "bla" and add clarifying comment for the test

* split up tests to support enterprise/non-enterprise tests

* drop raft multiplier and derive values during build phase

* sanitize runtime config reflectively and add test

* detect invalid config fields

* fix tests with invalid config fields

* use different values for wan sanitiziation test

* drop recursor in favor of recursors

* allow dns_config.udp_answer_limit to be zero

* make sure tests run on machines with multiple ips

* Fix failing tests in a few more places by providing a bind address in the test

* Gets rid of skipped TestAgent_CheckPerformanceSettings and adds case for builder.

* Add porter to server_test.go to make tests there less flaky

* go fmt
2017-09-25 11:40:42 -07:00
Frank Schroeder 85f0f71eb1
Add support to discover public v4 and v6 addresses on AWS (#3471)
Update github.com/hashicorp/go-discover/provider/aws to support the
'addr_type' option which allows detection of private_v4, public_v4 and
public_v6 addresses.

Fixes #3471
2017-09-25 03:16:27 +02:00
Seth Vargo 97a4d36ec4
Update vendor to regroup by root commands 2017-09-06 10:20:25 -04:00
Preetha Appan aadaae1d2d Updating vendor directory for raft address provider interface changes 2017-08-30 09:57:48 -05:00
Preetha Appan 2514523920 Update raft library for windows snapshot fsync fixes. This fixes #3409 2017-08-24 16:44:05 -05:00
Frank Schroeder 509e667f94 vendor: upgrade github.com/hashicorp/go-discover
Pull in improved debug logging for AWS
2017-08-23 21:23:34 +02:00
Preetha Appan 040f8ae775 Update serf to pick up fixes for fsyncing snapshots and panic when coordinates are disabled 2017-08-17 16:35:06 -05:00
Preetha Appan 40d6e1fbc7 Update memberlist for a deadlock fix 2017-08-15 18:07:28 -05:00
Kyle Havlovitz 4daba5ddd5
vendor: update github.com/armon/go-metrics 2017-08-08 18:29:27 -07:00
Kyle Havlovitz 8c2e422074 Merge pull request #3369 from hashicorp/metrics-enhancements
Add support for labels/filters from go-metrics
2017-08-08 13:55:30 -07:00
Kyle Havlovitz 6fed5dc490
vendor: update github.com/armon/go-metrics 2017-08-08 12:33:47 -07:00
Kyle Havlovitz abcf13e3f4
vendor: update go-metrics 2017-08-08 01:19:30 -07:00
James Phillips 7fd45a6b67
Propagates a better error message from memberlist.
Fixes #3312.
2017-08-07 16:35:57 -07:00
Preetha Appan 5d15481d8a Pick up raft library change that fsyncs snapshot files correctly 2017-08-04 10:36:41 -05:00
Frank Schroeder 5f6b74d4ee
vendor: update hashicorp/go-discover to pull in hashicorp/go-discover#7 2017-08-03 21:00:37 +02:00
Frank Schroeder 5ddcdd41c2 vendor: add go-discover 2017-08-01 11:41:43 +02:00
Frank Schroeder d1c27705f3 vendor: drop unused deps for old discover code 2017-08-01 11:41:43 +02:00
Preetha Appan 7f47cc15c0 Govendor update go-memdb and go-immutable-radix to pick up changes for DeletePrefix 2017-07-25 17:28:43 -05:00
Frank Schroeder 1c6e1fe5d9 agent: add dependencies for docker on windows 2017-07-19 12:03:59 +02:00
Frank Schroeder 25aaf35522
vendor: drop unused dependencies 2017-07-18 20:24:21 +02:00
James Phillips 203ff04e67 Performs surgery on Docker deps so we can build on Solaris and Windows. (#3288) 2017-07-17 15:34:26 -07:00
James Phillips c82d84a1dd Updates memberlist to pick up Lifeguard research findings. (#3287)
See https://www.hashicorp.com/blog/making-gossip-more-robust-with-lifeguard/.
2017-07-17 12:54:17 -07:00
Frank Schroeder 3562048572 vendor: drop unused dependencies 2017-07-15 14:35:20 -07:00
Frank Schroeder d5d49b9b94
vendor: github.com/Sirupsen -> github.com/sirupsen 2017-07-14 13:07:44 -07:00
Frank Schroeder ac46399ab5
vendor: update github.com/fsouza/go-dockerclient
Update go-dockerclient and dependant dependencies
to add fix for go-dockerclient#622.

Fixes #3254
2017-07-14 13:07:44 -07:00
Preetha Appan 891558cd09 Update raft library to pick up cleanup of temporary snapshot files 2017-07-11 08:22:57 -05:00
Frank Schroeder 4843839cf5 Pull in vendor updates 2017-07-07 09:22:34 +02:00
James Phillips f7df065c39 memberlist: Monkey patch memberlist to fix port 0 behavior.
https://github.com/hashicorp/memberlist/pull/128
2017-07-07 09:22:34 +02:00
Frank Schroeder 4322b7217c serf: monkey patch data race in github.com/hashicorp/serf
https://github.com/hashicorp/serf/pull/476

This should be replaced when the patch is merged upstream
and the library is upgraded.
2017-07-07 09:22:34 +02:00
Preetha Appan bb0e0bdff9 Update serf to pull in disk space failure recovery changes 2017-07-06 08:58:42 -05:00
James Phillips 4d0aa9b82a Bumps Raft library. (#3201)
This picks up the fix for https://github.com/hashicorp/raft/issues/212,
which can cause out-of-date followers to get stuck in a loop trying to
sync because they don't discard old snapshot data.

There's some incidental reordering of the vendor.json since the last
update to that file was merged by hand.
2017-06-27 18:41:00 -07:00
James Phillips 59621dbccc Revert "discover: move instance discover code into separate package (#3144)" (#3180)
This reverts commit 26bfb2d00a30bf30ebdd85ba2e1e19f37355853f.
2017-06-23 01:38:55 -07:00
James Phillips 728971afdb Fixes broken HTTP header and method for health checks. (#3178)
* Fixes broken HTTP header and method for health checks.
* Adds a fuzz utility and test to make sure copy is complete.
2017-06-23 01:15:48 -07:00
Kyle Havlovitz e875cc30fa vendor: update github.com/hashicorp/memberlist (#3176) 2017-06-22 14:44:46 -07:00
Frank Schroeder 43c42b12ae
vendor: update github.com/hashicorp/go-discover 2017-06-22 12:46:23 +02:00
Frank Schröder 4bdff5fff4 discover: move instance discover code into separate package (#3144)
This patch moves the code that discovers instances from metadata
information to github.com/hashicorp/go-discover with
sub-packages for each provider.
2017-06-21 10:40:38 +02:00
Kyle Havlovitz 5e45aec642 Add an option to disable keyring file (#3145)
Also disables keyring file in dev mode.
2017-06-15 15:24:04 -07:00
Frank Schroeder 4783af5733
vendor: Update github.com/shirou/gopsutil
Pull in fix for data race on host.BootTime.
2017-06-02 07:51:08 +02:00
Frank Schroeder 0a2b982616
vendor: upgrade github.com/armon/go-metrics
Pull in changes to fix race condition for concurrent tests.
2017-06-01 23:52:26 +02:00
Frank Schroeder b66eb6b6ac
vendor: upgrade github.com/go-ole/go-ole
This replaces the monkey patch for github.com/go-ole/go-ole/pull/144

See #3097
2017-06-01 16:05:24 +02:00
Frank Schroeder 1d30241784
vendor: monkey patch github.com/go-ole/go-ole support for s390x
Remove this once https://github.com/go-ole/go-ole/pull/144 gets
merged.

Fixes #3097
2017-06-01 15:31:29 +02:00
Frank Schroeder 9ea307a90d
Revert "vendor: monkey patch github.com/go-ole/go-ole support for s390x"
This reverts commit 50fe2148a81a2d91c7b6f75246f16b452d811e0f.
2017-06-01 15:31:02 +02:00
Frank Schroeder 047b35bd92
vendor: monkey patch github.com/go-ole/go-ole support for s390x
Remove this once https://github.com/go-ole/go-ole/pull/144 gets
merged.
2017-06-01 15:29:47 +02:00
Frank Schroeder c38fbff292
vendor: patch github.com/mitchellh/cli until help output is fixed
We need to init the flagset that cli uses to generate the help
outside of the Run method since Run isn't called anymore for
printing help.
2017-05-31 00:29:29 +02:00
Frank Schroeder ee094a5bc6
vendor: fix data race in github.com/armon/go-metrics/start.go
96 -> 42 data races
2017-05-31 00:29:25 +02:00
Frank Schroeder bd0d4a79b2
vendor: update github.com/mitchellh/cli
This pulls in the patch that fixes the nil panic and the
data race in MockUi.
2017-05-31 00:29:25 +02:00
Kyle Havlovitz e196576c07 Add settings for upshifting to encrypted gossip (#3079) 2017-05-30 08:51:37 -07:00
James Phillips 3cce06fd38
Pulls in Serf logger fix. 2017-05-25 22:02:09 -07:00
James Phillips 0a8a78833e
Updates Serf to pick up small fixes and coordinate NaN/Inf defenses. 2017-05-25 16:16:37 -07:00