a4c3a3433c
Updates web assets to latest.
2018-01-22 14:46:07 -08:00
c4528a6110
Merge pull request #3821 from hashicorp/persist-file-handling
...
Add graceful handling of malformed persisted service/check files.
2018-01-22 12:31:33 -08:00
bb068b4c93
Merge pull request #3820 from hashicorp/serfwan-port-fix
...
Enforce a valid port for the Serf WAN since it can't be disabled.
2018-01-19 15:40:56 -08:00
77ab587ae1
Moves the coordinate fetch after the ACL check.
2018-01-19 15:25:22 -08:00
b651253cb2
Don't remove the files, just log an error
2018-01-19 14:25:51 -08:00
f191eb2df3
Enforce a valid port for the Serf WAN since it can't be disabled.
...
Fixes #3817
2018-01-19 14:22:23 -08:00
17ec4a9394
Add graceful handling of malformed persisted service/check files.
...
Previously a change was made to make the file writing atomic,
but that wasn't enough to cover something like an OS crash so we
needed something here to handle the situation more gracefully.
Fixes #1221 .
2018-01-19 14:07:36 -08:00
81d0ffc959
Resolve symlinks in config directory
...
Docker/Openshift/Kubernetes mount the config file as a symbolic link and
IsDir returns true if the file is a symlink. Before calling IsDir, the
symlink should be resolved to determine if it points at a file or
directory.
Fixes #3753
2018-01-12 15:43:38 -05:00
ca43623734
Adds the NodeID field back to the /v1/agent/self Config block.
...
Fixes #3778
2018-01-10 15:17:54 -08:00
ff2aae98f4
Adds more info about how to fix the private IP error.
...
Closes #3790
2018-01-10 09:53:41 -08:00
e282e9285c
Fixes crash where body was optional for PQ endpoint (it is not).
...
Fixes #3791
2018-01-10 09:33:49 -08:00
a45f6ad740
Add gRPC health-check #3073
2018-01-04 16:42:30 -05:00
f597d66392
Using labels
2017-12-21 20:30:29 -08:00
ac50568a1a
Added telemetry around Catalog APIs
2017-12-21 16:35:12 -08:00
1cd94dec8a
Updates the checked in web assets.
2017-12-20 19:51:04 -08:00
bfce81d721
Updates the built-in web assets.
2017-12-20 17:48:51 -08:00
8fd94a2e7c
Wraps HTTP mux to ban all non-printable characters from paths.
2017-12-20 15:47:53 -08:00
6f09cf48db
Updates the built-in web UI assets.
2017-12-20 13:43:52 -08:00
62e97a6602
Fixes a `go fmt` cleanup.
2017-12-20 13:43:38 -08:00
74b0c58831
Fix vet error
2017-12-18 18:04:42 -08:00
dfc165a47b
Move autopilot initializing to oss file
2017-12-18 18:02:44 -08:00
044c38aa7b
Move autopilot setup to a separate file
2017-12-18 16:55:51 -08:00
9e1ba6fb4e
Make some final tweaks to autopilot package
2017-12-18 12:26:47 -08:00
6b58df5898
Merge pull request #3737 from hashicorp/autopilot-refactor
...
Move autopilot to a standalone package
2017-12-15 14:09:40 -08:00
262cbbd9ca
Merge pull request #3728 from weiwei04/fix_globalRPC_goroutine_leak
...
fix globalRPC goroutine leak
2017-12-14 17:54:19 -08:00
518ab954bc
Merge pull request #3642 from yfouquet/master
...
[Fix] Service tags not added to health checks
2017-12-14 13:59:39 -08:00
47cd775b3d
Works around mapstructure behavior to enable sessions with no checks.
...
Fixes #3732
2017-12-14 09:07:56 -08:00
798aca92c5
Expose IsPotentialVoter for advanced autopilot logic
2017-12-13 17:53:51 -08:00
68c94a5047
Changes maps to merge vs. overwrite when processing configs.
...
Fixes #3716
2017-12-13 16:06:01 -08:00
a4ac148077
Merge branch 'master' into autopilot-refactor
2017-12-13 11:54:32 -08:00
6c985132de
A few last autopilot adjustments
2017-12-13 11:19:17 -08:00
77d92bf15c
More autopilot reorganizing
2017-12-13 10:57:37 -08:00
984de6e2e0
Adds TODOs referencing #3744 .
2017-12-13 10:52:06 -08:00
63011dd393
Copies the autopilot settings from the runtime config.
...
Fixes #3730
2017-12-13 10:32:05 -08:00
f347c8a531
More refactoring to make autopilot consul-agnostic
2017-12-12 17:46:28 -08:00
f4f7db0059
[Fix] Service tags not added to health checks
...
Since commit 9685bdcd0ba4b4b3adb04f9c1dd67d637ca7894e, service tags are added to the health checks.
Otherwise, when adding a service, tags are not added to its check.
In updateSyncState, we compare the checks of the local agent with the checks of the catalog.
It appears that the service tags are different (missing in one case), and so the check is synchronized.
That increase the ModifyIndex periodically when nothing changes.
Fixed it by adding serviceTags to the check.
Note that the issue appeared in version 0.8.2.
Looks related to #3259 .
2017-12-12 13:39:37 +01:00
8546a1d3c6
Move autopilot to a standalone package
2017-12-11 16:45:33 -08:00
32b64575d1
Moves Serf helper into lib to fix import cycle in consul-enterprise.
2017-12-07 16:57:58 -08:00
c16cce80bb
Turns of intent queue warnings and enables dynamic queue sizing.
2017-12-07 16:27:06 -08:00
04531ff0fb
fix globalRPC goroutine leak
...
Signed-off-by: Wei Wei <weiwei.inf@gmail.com>
2017-12-05 11:53:30 +08:00
c4bc89a187
Creates a registration mechanism for snapshot and restore.
2017-11-29 18:36:53 -08:00
8571555703
Begins split out of snapshots from the main FSM class.
2017-11-29 18:36:53 -08:00
4eaee8e0ba
Creates a registration mechanism for FSM commands.
2017-11-29 18:36:53 -08:00
3e7ea1931c
Moves the FSM into its own package.
...
This will help make it clearer what happens when we add some registration
plumbing for the different operations and snapshots.
2017-11-29 18:36:53 -08:00
7f3783f4be
Resolves an FSM snapshot TODO.
...
This adds checks for sink write calls before we continue the refactor, which
will resolve the other TODO comment we deleted as part of this change.
2017-11-29 18:36:53 -08:00
5a24d37ac0
Creates a registration mechanism for schemas.
...
This also splits out the registration into the table-specific source
files.
2017-11-29 18:36:52 -08:00
36bb30e67a
Creates a registration mechanism for RPC endpoints.
2017-11-29 18:36:52 -08:00
8f802411c4
Creates HTTP endpoint registry.
2017-11-29 18:36:52 -08:00
8da7f0ff7e
Moves coordinate disabled logic down into endpoints.
...
Similar rationale to the previous change for ACLs.
2017-11-29 18:36:52 -08:00
cf30d409c9
Moves ACL disabled response logic down into endpoints.
...
This lets us make the registration of endpoints less fancy, on the
road to adding a registration mechanism.
2017-11-29 18:36:52 -08:00
6234f0bd46
Renames "segments" to "segment" to be consistent with other files.
2017-11-29 18:36:52 -08:00
ba56669ea8
Renames stubs to be more consistent.
2017-11-29 18:36:52 -08:00
56552095c9
Sheds monotonic time info so tombstone GC bins work properly.
2017-11-29 10:34:24 -08:00
8656b7a3e9
Gives back the lock before writing to the expire channel.
...
The lock isn't needed after we clean up the expire bin, and as seen
in #3700 we can get into a deadlock waiting to place the expire index
into the channel while holding this lock.
Fixes #3700
2017-11-19 16:24:16 -08:00
ae85cc4070
Skips files with unknown extensions when not forcing a format.
...
Fixes #3685
2017-11-10 18:06:07 -08:00
d5bf4e9c6e
Adds a snapshot agent stub to the config structure.
...
Fixes #3678
2017-11-10 13:50:45 -08:00
50cdff36e5
Cleans up check logging.
...
There were places where we still didn't have the script vs. args sorted
correctly so changed all the logging to be just based on check IDs and
also made everything uniform.
Also removed some annoying debug logging, and moved some of the large output
logging to TRACE level.
Closes #3602
2017-11-10 12:48:44 -08:00
8210523b1b
Moves the LAN event handler after the router is created.
...
Fixes #3680
2017-11-10 12:26:48 -08:00
bfbbfb62ca
Revert "Adds a small sleep to make sure we are in the next GC bucket."
2017-11-08 22:18:37 -08:00
d6328a5bf8
Adds a sleep to make sure we are in the next GC bucket, ups time.
...
Fixes #3670
2017-11-08 22:02:40 -08:00
91824375be
Skips the tombstone GC test in Travis for now.
...
Related to #3670
2017-11-08 20:14:20 -08:00
c060df20de
Adds missing os import.
2017-11-08 20:02:22 -08:00
b94ba8aeb4
Removes bogus getPort() in favor of freeport.
2017-11-08 19:55:50 -08:00
04a7907a7e
Skips IPv6 test in Travis.
2017-11-08 18:28:45 -08:00
c52824bab7
Adds a longer retry period for the AE deferred output test.
...
There's some justification in the comments about this and a TODO to
improve this later.
Fixes #3668
2017-11-08 18:10:13 -08:00
444a345a3a
Tightens timing up and reorders GC test to be less flaky.
2017-11-08 15:09:29 -08:00
e00624425b
Doubles the GC timing.
2017-11-08 15:01:11 -08:00
8eb91777d9
Opens up test timing a little more.
2017-11-08 14:01:19 -08:00
d45c2a01f1
Shifts off a gran boundary to help make test less flaky.
2017-11-08 13:57:17 -08:00
757e353334
Opens up the tombstone GC test timing.
2017-11-08 13:43:39 -08:00
532cafe0af
Adds enable_agent_tls_for_checks configuration option which allows ( #3661 )
...
HTTP health checks for services requiring 2-way TLS to be checked
using the agent's credentials.
2017-11-07 18:22:09 -08:00
9de2d8921f
Saves the cycled server list after a failed ping when rebalancing. ( #3662 )
...
Fixes #3463
2017-11-07 18:13:23 -08:00
d938493671
Double-books the HTTP metrics w/ and w/o the "consul" prefix.
...
Fixes #3654
2017-11-07 16:32:45 -08:00
8709f65afd
Adds HTTP/2 support to Consul's HTTPS server. ( #3657 )
...
* Refactors the HTTP listen path to create servers in the same spot.
* Adds HTTP/2 support to Consul's HTTPS server.
* Vendors Go HTTP/2 library and associated deps.
2017-11-07 15:06:59 -08:00
021373d72e
Makes the metrics ACL test call the right endpoint.
...
This also required setting up a proper in-mem sink so we don't get
metrics-related errors.
Fixes #3655
2017-11-06 21:50:04 -08:00
ae9e204b3a
Sets tty in docker client back to true, as a potential fix for docker exec weirdness
2017-11-05 09:44:55 -06:00
068ca11eb8
Move check definition to a sub-struct
2017-11-01 14:54:46 -07:00
bc3ba5f873
Merge branch 'master' into esm-changes
2017-11-01 11:37:48 -07:00
83524f44c4
Merge pull request #3622 from hashicorp/coordinate-node-endpoint
...
agent: add /v1/coordianate/node/:node endpoint
2017-11-01 11:35:50 -07:00
3542d7fcb6
Remove redundant lines from coordinate test
2017-11-01 11:25:33 -07:00
9909b661ac
Fill out the tests around coordinate/node functionality
2017-10-31 15:36:44 -07:00
3cb1cd3723
config: add -config-format option ( #3626 )
...
* config: refactor ReadPath(s) methods without side-effects
Return the sources instead of modifying the state.
* config: clean data dir before every test
* config: add tests for config-file and config-dir
* config: add -config-format option
Starting with Consul 1.0 all config files must have a '.json' or '.hcl'
extension to make it unambigous how the data should be parsed. Some
automation tools generate temporary files by appending a random string
to the generated file which obfuscates the extension and prevents the
file type detection.
This patch adds a -config-format option which can be used to override
the auto-detection behavior by forcing all config files or all files
within a config directory independent of their extension to be
interpreted as of this format.
Fixes #3620
2017-10-31 17:30:01 -05:00
56561523cf
vendor: update go-discover ( #3634 )
...
* vendor: update go-discover
Pull in providers:
* Aliyun (Alibaba Cloud)
* Digital Ocean
* OpenStack (os)
* Scaleway
* doc: use ... instead of xxx
* doc: strip trailing whitespace
* doc: add docs for aliyun, digitalocean, os and scaleway
* agent: fix test
2017-10-31 17:03:54 -05:00
fd4d9f1c16
Factor out registerNodes function
2017-10-31 13:34:49 -07:00
c6e0366c02
Relaxes Autopilot promotion logic. ( #3623 )
...
* Relaxes Autopilot promotion logic.
When we defaulted the Raft protocol version to 3 in #3477 we made
the numPeers() routine more strict to only count voters (this is
more conservative and more correct). This had the side effect of
breaking rolling updates because it's at odds with the Autopilot
non-voter promotion logic.
That logic used to wait to only promote to maintain an odd quorum
of servers. During a rolling update (add one new server, wait, and
then kill an old server) the dead server cleanup would still count
the old server as a peer, which is conservative and the right thing
to do, and no longer count the non-voter. This would wait to promote,
so you could get into a stalemate. It is safer to promote early than
remove early, so by promoting as soon as possible we have chosen
that as the solution here.
Fixes #3611
* Gets rid of unnecessary extra not-a-voter check.
2017-10-31 15:16:56 -05:00
82a52d3b50
docker: fix failing test
2017-10-31 09:26:34 +01:00
ed1b1b54cd
docker: render errors with %v since they can be nil
2017-10-31 09:19:20 +01:00
2c7f7799bb
Add tests around coordinate update endpoint
2017-10-26 20:12:54 -07:00
496dd7ab5b
Merge branch 'coordinate-node-endpoint' of github.com:hashicorp/consul into esm-changes
2017-10-26 19:20:24 -07:00
f80e70271d
Added Coordinate.Node rpc endpoint and client api method
2017-10-26 19:16:40 -07:00
87206133be
agent: add /v1/coordianate/node/:node endpoint
...
This patch adds a /v1/coordinate/node/:node endpoint to get the network
coordinates for a single node in the network.
Since Consul Enterprise supports network segments it is still possible
to receive mutiple entries for a single node - one per segment.
2017-10-26 14:24:42 +02:00
712447026f
docker: add comment about "connection reset by peer" error
2017-10-26 12:14:19 +02:00
7d05e55734
docker: stop previous check on replace
2017-10-26 12:03:07 +02:00
bf98779d84
docker: close idle connections on stop
2017-10-26 12:02:39 +02:00
0a9d2a367e
docker: do not alloc a tty since this is not interactive
2017-10-26 11:56:54 +02:00
b1a5a6b64d
docker: make sure to log the error when we fall through
2017-10-26 11:56:36 +02:00
b907c4611d
docker: ignore "connection reset by peer"
...
The Docker agent closes the connection during read after we have
read the body. This causes a "connection reset by peer" even though
the command was successful.
We ignore that error here since we got the correct status code
and a response body.
2017-10-26 11:56:08 +02:00
16908be034
Add deregister critical service field and refactor duration parsing
2017-10-25 19:17:41 -07:00
ab3dac2379
Added coordinate update http endpoint
2017-10-25 19:37:30 +02:00
7d82ece118
Added remaining HTTP health check fields to structs
2017-10-25 19:37:30 +02:00
84a07ea113
Expose SkipNodeUpdate field and some health check info in the http api
2017-10-25 19:37:30 +02:00
2719194b6d
fix go vet issue
2017-10-25 19:30:35 +02:00
1eb3d0e0d4
replace custom unique id with a UUID
2017-10-25 19:30:35 +02:00
1dab004335
Decouple the code that executes checks from the agent
2017-10-25 11:18:07 +02:00
1d2ae14719
local state: fix go vet issue
2017-10-23 10:56:05 +02:00
a818414bb6
local state: remove stale comment
2017-10-23 10:56:05 +02:00
329fdc40a8
local state: make test more robust
2017-10-23 10:56:05 +02:00
f5a3d73b27
local state: clone check to avoid side effect
2017-10-23 10:56:05 +02:00
b36613e7ff
local state: use synchronized access to internal maps
2017-10-23 10:56:05 +02:00
e5318061d1
ae: do not trigger on Resume while holding the lock
2017-10-23 10:56:05 +02:00
7d5dfa9c53
ae: add remaining test cases
2017-10-23 10:56:05 +02:00
ae7269458c
ae: refactor StateSyncer to state machine for better testing
2017-10-23 10:56:05 +02:00
a72b68c562
ae: add test that we run a full before a partial sync
2017-10-23 10:56:05 +02:00
27bc11f005
ae: make control flow more explicit
2017-10-23 10:56:05 +02:00
29435004f6
ae: fix typo in constructor name
2017-10-23 10:56:05 +02:00
1bb1a6787e
ae: add test for resume triggering SyncChanges
2017-10-23 10:56:05 +02:00
6de645a8b8
ae: add test for ifNotPausedRun
2017-10-23 10:56:05 +02:00
4f79ee3188
ae: make stagger function pluggable for testing
2017-10-23 10:56:05 +02:00
5d6089b6fa
ae: restore previous pause/resume behavior
2017-10-23 10:56:04 +02:00
6064a2a764
ae: ensure that syncs are blocked when paused
2017-10-23 10:56:04 +02:00
f187c37c27
local state: rename Add{Check,Service}State to Set{Check,Service}State
2017-10-23 10:56:04 +02:00
209e67b2f9
local state: move Metadata methods together
2017-10-23 10:56:04 +02:00
9513a042be
local state: update documentation of updateSyncState
2017-10-23 10:56:04 +02:00
2e3b72d2c3
local state: update comments
2017-10-23 10:56:04 +02:00
da604495a0
local state: address review comments
...
* move non-blocking notification mechanism into ae.Trigger
* move Pause/Resume into separate type
2017-10-23 10:56:04 +02:00
c39bc770b3
local state: refactor TestAgentAntiEntropy_EnableTagOverride
...
Make intent clearer by being more explicit and adding some comments.
Use verify.Values to compare service entries.
2017-10-23 10:56:04 +02:00
e1358a541d
local state: fix TestAgentAntiEntropy_EnableTagOverride
...
The test had a race condition where it relied on the first service to be
synced to the remote catalog which sometimes failed.
2017-10-23 10:56:04 +02:00
b3195006b1
local state: rename tests
2017-10-23 10:56:04 +02:00
d9a4b440a8
local state: drop retry loops from tests
...
Since the tests are now using synchronous calls for state syncing
we no longer need to use retry loops to wait for the changes to
propagate.
2017-10-23 10:56:04 +02:00
462de8b2cb
agent: skip non-sensical TestCatalogRegister
...
It is not clear what this test is supposed to verify.
2017-10-23 10:56:04 +02:00
32c2d1b217
local state: fix anti-entropy state tests
...
The anti-entropy tests relied on the side-effect of the StartSync()
method to perform a full sync instead of a partial sync. This lead to
multiple anti-entropy go routines being started unnecessary retry loops.
This change changes the behavior to perform synchronous full syncs when
necessary removing the need for all of the time.Sleep and most of the
retry loops.
2017-10-23 10:56:04 +02:00
6b966e48ce
local state: fix test with updated error message
2017-10-23 10:56:04 +02:00
632c43e575
local state: fix failing tests
2017-10-23 10:56:03 +02:00
ea92ee308a
local state: tests compile
2017-10-23 10:56:03 +02:00
7289576988
local state: replace multi-map state with structs
...
The state of the service and health check records was spread out over
multiple maps guarded by a single lock. Access to the maps has to happen
in a coordinated effort and the tests often violated this which made
them brittle and racy.
This patch replaces the multiple maps with a single one for both checks
and services to make the code less fragile.
This is also necessary since moving the local state into its own package
creates circular dependencies for the tests. To avoid this the tests can
no longer access internal data structures which they should not be doing
in the first place.
The tests still don't compile but this is a ncessary step in that
direction.
2017-10-23 10:56:03 +02:00
bc7571cccf
local state: move to separate package
...
This patch moves the local state to a separate package to further
decouple it from the agent code.
The code compiles but the tests do not yet.
2017-10-23 10:56:03 +02:00
b363586813
agent: simplify some loops
2017-10-23 10:56:03 +02:00
218cd4d501
agent: refactor sync loop to linear flow of control
2017-10-23 10:56:03 +02:00
8cc4ee886d
agent: cleanup StateSyncer
...
This patch cleans up the state syncer code by renaming fields, adding
helpers and documentation.
2017-10-23 10:56:03 +02:00
e7051da8d1
agent: decouple anti-entropy from local state
...
The anti-entropy code manages background synchronizations of the local
state on a regular basis or on demand when either the state has changed
or a new consul server has been added.
This patch moves the anti-entropy code into its own package and
decouples it from the local state code since they are performing
two different functions.
To simplify code-review this revision does not make any optimizations,
renames or refactorings. This will happen in subsequent commits.
2017-10-23 10:56:03 +02:00
c2a3f5e007
Merge pull request #3585 from hashicorp/document-runtime-config
...
Moving the previous `agent/config.go` documentation to
`agent/config/runtime.go`.
2017-10-23 10:51:22 +02:00
f3ecef290c
Merge pull request #3598 from hashicorp/issue-3397-error-with-extra-flags
...
The `consul agent` command was ignoring extra command line arguments
which can lead to confusion when the user has for example forgotten to
add a dash in front of an argument or is not using an `=` when setting
boolean flags to `true`. `-bootstrap true` is not the same as
`-bootstrap=true`, for example.
Since all command line flags are known and we don't expect unparsed
arguments we can return an error. However, this may make it slightly
more difficult in the future if we ever wanted to have these kinds of
arguments.
Fixes #3397
2017-10-23 10:47:04 +02:00
6517d7720a
Merge pull request #3600 from hashicorp/support-go-sockaddr-for-dns-recursors
...
DNS recursors can be added through go-sockaddr templates. Entries
are deduplicated while the order is maintained.
Originally proposed by @taylorchu
See #2932
2017-10-23 10:45:36 +02:00
0ec82b0445
Revert "config: add support for go-sockaddr templates for DNS recursors"
...
This reverts commit 72bee6284d44e0ed3e18e6819188f1d32528478c.
2017-10-23 10:08:35 +02:00
39d1ceffb5
Revert "config: do not allow an ANY address as DNS recursor"
...
This reverts commit 1db8d3cb00bec980480d525571cea76c6c49c3e7.
2017-10-23 10:08:35 +02:00
759350b61f
Revert "agent: decouple anti-entropy from local state"
...
This reverts commit a842dc9c2bf00855ef93211232da36b2d91eab5b.
2017-10-23 10:08:35 +02:00
0d0233acd7
Revert "agent: cleanup StateSyncer"
...
This reverts commit b7136e100bef727144c202ae55f81152ac6a8b5f.
2017-10-23 10:08:35 +02:00
113ba546e7
Revert "agent: refactor sync loop to linear flow of control"
...
This reverts commit 7a2af206ea964fc0846f9b80c10ea9d91cb3c99e.
2017-10-23 10:08:35 +02:00
a96798f441
Revert "agent: simplify some loops"
...
This reverts commit b5dbad910c63b29dadf10731808d6891067a2bfa.
2017-10-23 10:08:34 +02:00
443fe8e4db
Revert "local state: move to separate package"
...
This reverts commit d447e823c63720c74bb02459a985724f035f023e.
2017-10-23 10:08:34 +02:00
435b442c8b
Revert "local state: replace multi-map state with structs"
...
This reverts commit ccbae7da5bceeb2328ab7993a8badbf2e72a4597.
2017-10-23 10:08:34 +02:00
138aa25280
Revert "local state: tests compile"
...
This reverts commit 1af52bf7be02d952e16e14209899a9715451f7ba.
2017-10-23 10:08:34 +02:00
571637cf7d
Revert "local state: fix failing tests"
...
This reverts commit 76682da4a048b623a1c201eb56710639437a9ed9.
2017-10-23 10:08:34 +02:00
80d9df69e4
Revert "local state: fix test with updated error message"
...
This reverts commit e9149f64d9afb38246f9432edd806321c1eefb83.
2017-10-23 10:08:34 +02:00
ded6f79b6a
Revert "local state: fix anti-entropy state tests"
...
This reverts commit f8e20cd9960e19bbe61e258c445250723870816f.
2017-10-23 10:08:34 +02:00
9b40a3cde6
Revert "agent: skip non-sensical TestCatalogRegister"
...
This reverts commit ce1f35373e6ad1486cb83398fce70f5c54f910d3.
2017-10-23 10:08:34 +02:00
5aa77fb9e4
Revert "local state: drop retry loops from tests"
...
This reverts commit 2bdba8ab06d1c9dd99d5e7cf8370c94b4f7adfaa.
2017-10-23 10:08:34 +02:00
d7bb81a940
Revert "local state: rename tests"
...
This reverts commit ff62eaf0634a4c09377c53d4623685437f217b49.
2017-10-23 10:08:34 +02:00
3d67ce9000
Revert "local state: fix TestAgentAntiEntropy_EnableTagOverride"
...
This reverts commit 86f7ea601342d6f3ceb9d0dc74bd5b33dae0b8d8.
2017-10-23 10:08:34 +02:00
1bd73d2a6e
Revert "local state: refactor TestAgentAntiEntropy_EnableTagOverride"
...
This reverts commit c28e23eac8ada7a668b13e9a4a3d8066457488ef.
2017-10-23 10:08:33 +02:00
c72d21813b
Revert "local state: address review comments"
...
This reverts commit 1d315075b15647db7fcd42986c9c5673cbb77a77.
2017-10-23 10:08:33 +02:00
4177bad4f3
Revert "local state: update comments"
...
This reverts commit 42188164f885188e3bc8cff70ea5aeb47d633b83.
2017-10-23 10:08:33 +02:00
d1e514cedc
Revert "local state: update documentation of updateSyncState"
...
This reverts commit e86521e637d742bce1e460b6b960037cef3578ed.
2017-10-23 10:08:33 +02:00
133b23fb77
Revert "local state: move Metadata methods together"
...
This reverts commit 9bc8127728a62beb94b28849070b6ac35c181404.
2017-10-23 10:08:33 +02:00
67135cc33e
Revert "local state: rename Add{Check,Service}State to Set{Check,Service}State"
...
This reverts commit 9280841a80d98b253a8f23967875e45e5e37e093.
2017-10-23 10:08:33 +02:00
79405b7ce3
Revert "ae: ensure that syncs are blocked when paused"
...
This reverts commit ffb265dd939cefd7e865d624d0a4ba81f88e4505.
2017-10-23 10:08:33 +02:00
cb28151210
Revert "ae: restore previous pause/resume behavior"
...
This reverts commit 126046be2366afde97fdf01d0dceece2977dd6d6.
2017-10-23 10:08:33 +02:00
ec186ca7ba
Revert "ae: make stagger function pluggable for testing"
...
This reverts commit 066ad01c3804a39161c4d46147aa2eb86e48cd67.
2017-10-23 10:08:33 +02:00
272b729ad9
Revert "ae: add test for ifNotPausedRun"
...
This reverts commit f5177ef332b8396aea368b7dea18a976e029a54f.
2017-10-23 10:08:33 +02:00
54cebeda74
Revert "ae: add test for resume triggering SyncChanges"
...
This reverts commit cd0262744deab9294af17e4039ed2e2a27818cde.
2017-10-23 10:08:32 +02:00
7a92839663
Revert "ae: fix typo in constructor name"
...
This reverts commit e88f49e2ccc79f77b5395de28d8fbdfc6eeb36f6.
2017-10-23 10:08:32 +02:00
4bdf161d5c
Revert "ae: make control flow more explicit"
...
This reverts commit b9a8b53d5257d679c427422c324e6f124664db60.
2017-10-23 10:08:32 +02:00
6eae18ac63
Revert "ae: add test that we run a full before a partial sync"
...
This reverts commit 8158cec82969a1262de793ee46e13f63cc2954e6.
2017-10-23 10:08:32 +02:00
701ed61230
Revert "ae: refactor StateSyncer to state machine for better testing"
...
This reverts commit 8a45365f68147dd13c1232bc574bd54e4a12e478.
2017-10-23 10:08:32 +02:00
27b8e55dc4
Revert "ae: add remaining test cases"
...
This reverts commit c32915bb4ff28b1670e88edaf0bbb9779dc6e2bc.
2017-10-23 10:08:32 +02:00
c27a2f1c66
Revert "ae: do not trigger on Resume while holding the lock"
...
This reverts commit bd00814301bbf5db037e739e91a0b66ebb564821.
2017-10-23 10:08:32 +02:00
655a24e383
Revert "local state: use synchronized access to internal maps"
...
This reverts commit 39a2d8d25e629823e183e384e8414171edcf4164.
2017-10-23 10:08:32 +02:00
fe0f7c961d
Revert "local state: clone check to avoid side effect"
...
This reverts commit af1243c7251fe6291145bbe4f4dacd374779c425.
2017-10-23 10:08:32 +02:00
a6e55af1e0
Revert "local state: make test more robust"
...
This reverts commit f9267380dbcdb2746393eee5067e5037dff2b184.
2017-10-23 10:08:32 +02:00
64d9529d94
Revert "local state: remove stale comment"
...
This reverts commit 35f4acdddc38f0371543e12b0d2ccb27a0a64869.
2017-10-23 10:08:32 +02:00
aaf6e376e2
Revert "config: document telemetry options"
...
This reverts commit 7fede4472d4db87b4652253510556906821ac756.
2017-10-23 10:08:31 +02:00
dcb70f7def
Revert "config: document http options"
...
This reverts commit 5f598574483e59af377ae447857d40872563ac87.
2017-10-23 10:08:31 +02:00
1ce9c1ba45
Revert "config: document dns options"
...
This reverts commit 5e57e9273ea6e27eb79ed531189fd3c69e19c7b2.
2017-10-23 10:08:31 +02:00
3638b2932d
Revert "config: document autopilot options"
...
This reverts commit 7685ef409c9340227e3969a86e0bfa627eafdd0f.
2017-10-23 10:08:31 +02:00
32c8d7e0db
Revert "config: document acl options"
...
This reverts commit 7396bd31fd1c35347d0c88284ea358bfbd9ca948.
2017-10-23 10:08:31 +02:00
83bfe0d223
Revert "config: document config options"
...
This reverts commit a38c69d7844a4e4a9d54051470977c7446fc8e57.
2017-10-23 10:08:31 +02:00
ff42a00ef1
Revert "config: document more acl options"
...
This reverts commit 2682ce0b825528f379487cbd11c2c2a321fd94e8.
2017-10-23 10:08:31 +02:00
6ae5c0594a
Revert "config: document more config options"
...
This reverts commit bf81cdea6eb90ae099201c545910780ccd020540.
2017-10-23 10:08:31 +02:00
2d96f700c0
Revert "config: document more config options"
...
This reverts commit 9864609201f333cd90af9535e2e4d4c7c1e65c4a.
2017-10-23 10:08:31 +02:00
bd72f3676d
Revert "config: document remaining config options"
...
This reverts commit 0ed4561f12cf52a44ab1f1887d4f4bfd27df77f4.
2017-10-23 10:08:31 +02:00
64ac9f4f42
Revert "config: address review comments"
...
This reverts commit f6e9ad99ec6d230c1eb7f655d2a83e5a4e33807d.
2017-10-23 10:08:31 +02:00
c5c586c7f1
Revert "fix go vet issue"
...
This reverts commit 078e50b635846920a17a3b06c678b2b63b40677a.
2017-10-23 10:00:26 +02:00
b580f7a533
Revert "config: rename test struct field to args"
...
This reverts commit f2a291a4704c9954c441567860ca740ac0f58308.
2017-10-23 09:58:37 +02:00
0f0b510f37
Revert "config: return error on extra command line arguments ( #3397 )"
...
This reverts commit ce935cef55f7298e85843b3ca17ad13415e40e0b.
2017-10-23 09:58:37 +02:00
ef3108abc3
fix go vet issue
2017-10-23 08:13:52 +02:00
24689c4f5e
config: return error on extra command line arguments ( #3397 )
...
The `consul agent` command was ignoring extra command line arguments
which can lead to confusion when the user has for example forgotten to
add a dash in front of an argument or is not using an `=` when setting
boolean flags to `true`. `-bootstrap true` is not the same as
`-bootstrap=true`, for example.
Since all command line flags are known and we don't expect unparsed
arguments we can return an error. However, this may make it slightly
more difficult in the future if we ever wanted to have these kinds of
arguments.
Fixes #3397
2017-10-23 08:08:09 +02:00
c8ed3044de
config: rename test struct field to args
2017-10-23 08:08:09 +02:00
c624c72d5c
config: return error on extra command line arguments ( #3397 )
...
The `consul agent` command was ignoring extra command line arguments
which can lead to confusion when the user has for example forgotten to
add a dash in front of an argument or is not using an `=` when setting
boolean flags to `true`. `-bootstrap true` is not the same as
`-bootstrap=true`, for example.
Since all command line flags are known and we don't expect unparsed
arguments we can return an error. However, this may make it slightly
more difficult in the future if we ever wanted to have these kinds of
arguments.
Fixes #3397
2017-10-23 08:07:48 +02:00
c1d249c681
config: rename test struct field to args
2017-10-23 08:07:48 +02:00
88a1f3aa53
config: address review comments
2017-10-23 08:06:26 +02:00
97277de196
config: document remaining config options
2017-10-23 08:06:26 +02:00
638bc0e0ac
config: document more config options
2017-10-23 08:06:26 +02:00
f326eae23e
config: document more config options
2017-10-23 08:06:26 +02:00
6332f4d6a7
config: document more acl options
2017-10-23 08:06:26 +02:00
61c8ee564a
config: document config options
2017-10-23 08:06:26 +02:00
71112a6510
config: document acl options
2017-10-23 08:06:26 +02:00
e00869647c
config: document autopilot options
2017-10-23 08:06:26 +02:00
05c1038d58
config: document dns options
2017-10-23 08:06:26 +02:00
a17d711b39
config: document http options
2017-10-23 08:06:26 +02:00
f95b8f5060
config: document telemetry options
2017-10-23 08:06:26 +02:00
44cc334fc4
config: address review comments
2017-10-23 08:05:47 +02:00
28083cb330
config: document remaining config options
2017-10-23 08:04:03 +02:00
b2c2386d75
config: document more config options
2017-10-23 08:04:03 +02:00
7b1f4d5838
config: document more config options
2017-10-23 08:04:03 +02:00
b01702f129
config: document more acl options
2017-10-23 08:04:03 +02:00
32ed645df5
config: document config options
2017-10-23 08:04:03 +02:00
3d68185206
config: document acl options
2017-10-23 08:04:03 +02:00
4fc973a256
config: document autopilot options
2017-10-23 08:04:03 +02:00
66e1b9fb64
config: document dns options
2017-10-23 08:04:03 +02:00
dc4e90e6c0
config: document http options
2017-10-23 08:04:03 +02:00
018b8d66d6
config: document telemetry options
2017-10-23 08:04:03 +02:00
39dddd433e
local state: remove stale comment
2017-10-23 08:03:18 +02:00
779bf04aa3
local state: make test more robust
2017-10-23 08:03:18 +02:00
e16c8f3982
local state: clone check to avoid side effect
2017-10-23 08:03:18 +02:00
f1028d2486
local state: use synchronized access to internal maps
2017-10-23 08:03:18 +02:00
606e13a569
ae: do not trigger on Resume while holding the lock
2017-10-23 08:03:18 +02:00
82e9494f7f
ae: add remaining test cases
2017-10-23 08:03:18 +02:00
cf6e6c72ac
ae: refactor StateSyncer to state machine for better testing
2017-10-23 08:03:18 +02:00
ba8cb5e3d0
ae: add test that we run a full before a partial sync
2017-10-23 08:03:18 +02:00
0d73333c8e
ae: make control flow more explicit
2017-10-23 08:03:18 +02:00
0cfe0a42f1
ae: fix typo in constructor name
2017-10-23 08:03:18 +02:00
25ee03e165
ae: add test for resume triggering SyncChanges
2017-10-23 08:03:18 +02:00
f61ad4efcd
ae: add test for ifNotPausedRun
2017-10-23 08:03:18 +02:00
c2ab582d47
ae: make stagger function pluggable for testing
2017-10-23 08:03:18 +02:00
f352952fb3
ae: restore previous pause/resume behavior
2017-10-23 08:03:18 +02:00
c1badf1034
ae: ensure that syncs are blocked when paused
2017-10-23 08:03:18 +02:00
a4d03797ae
local state: rename Add{Check,Service}State to Set{Check,Service}State
2017-10-23 08:03:18 +02:00
7414fe0a2a
local state: move Metadata methods together
2017-10-23 08:03:18 +02:00
3e953f67da
local state: update documentation of updateSyncState
2017-10-23 08:03:18 +02:00
ecea35d955
local state: update comments
2017-10-23 08:03:18 +02:00
40e17f9f01
local state: address review comments
...
* move non-blocking notification mechanism into ae.Trigger
* move Pause/Resume into separate type
2017-10-23 08:03:18 +02:00
cfc8bd092f
local state: refactor TestAgentAntiEntropy_EnableTagOverride
...
Make intent clearer by being more explicit and adding some comments.
Use verify.Values to compare service entries.
2017-10-23 08:03:18 +02:00
b288c1eb9b
local state: fix TestAgentAntiEntropy_EnableTagOverride
...
The test had a race condition where it relied on the first service to be
synced to the remote catalog which sometimes failed.
2017-10-23 08:03:18 +02:00
71e4d7cd1c
local state: rename tests
2017-10-23 08:03:18 +02:00
f43972fdc2
local state: drop retry loops from tests
...
Since the tests are now using synchronous calls for state syncing
we no longer need to use retry loops to wait for the changes to
propagate.
2017-10-23 08:03:18 +02:00
3d10312cd6
agent: skip non-sensical TestCatalogRegister
...
It is not clear what this test is supposed to verify.
2017-10-23 08:03:18 +02:00
2bef1d4d51
local state: fix anti-entropy state tests
...
The anti-entropy tests relied on the side-effect of the StartSync()
method to perform a full sync instead of a partial sync. This lead to
multiple anti-entropy go routines being started unnecessary retry loops.
This change changes the behavior to perform synchronous full syncs when
necessary removing the need for all of the time.Sleep and most of the
retry loops.
2017-10-23 08:03:18 +02:00
36677bc90d
local state: fix test with updated error message
2017-10-23 08:03:18 +02:00
37c8492e5e
local state: fix failing tests
2017-10-23 08:03:18 +02:00
884f98f8aa
local state: tests compile
2017-10-23 08:03:18 +02:00
James Phillips