de57b16d99
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
5c77c59501
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
524981f367
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
1181aaee6a
local state: rename tests
2017-10-23 10:56:04 +02:00
1602ac56b5
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
7e3adc4549
agent: skip non-sensical TestCatalogRegister
...
It is not clear what this test is supposed to verify.
2017-10-23 10:56:04 +02:00
71c74e62c7
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
37b95ef98e
local state: fix test with updated error message
2017-10-23 10:56:04 +02:00
d2cc0e6e8a
local state: fix failing tests
2017-10-23 10:56:03 +02:00
b803bf3091
local state: tests compile
2017-10-23 10:56:03 +02:00
0a9ac9749e
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
6027a9e2a5
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
c00bbdb5e4
agent: simplify some loops
2017-10-23 10:56:03 +02:00
cbaf97bced
agent: refactor sync loop to linear flow of control
2017-10-23 10:56:03 +02:00
94ef1041a1
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
29e18c7494
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
2e7ed2fd86
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
5bfb2808f9
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
81917ee675
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
e5d5e6429b
Revert "config: add support for go-sockaddr templates for DNS recursors"
...
This reverts commit 72bee6284d
2017-10-23 10:08:35 +02:00
0e360cc3b5
Revert "config: do not allow an ANY address as DNS recursor"
...
This reverts commit 1db8d3cb00
2017-10-23 10:08:35 +02:00
58b0e153f9
Revert "agent: decouple anti-entropy from local state"
...
This reverts commit a842dc9c2b
2017-10-23 10:08:35 +02:00
b4e7d0b974
Revert "agent: cleanup StateSyncer"
...
This reverts commit b7136e100b
2017-10-23 10:08:35 +02:00
26a155eb41
Revert "agent: refactor sync loop to linear flow of control"
...
This reverts commit 7a2af206ea
2017-10-23 10:08:35 +02:00
91569a7ceb
Revert "agent: simplify some loops"
...
This reverts commit b5dbad910c
2017-10-23 10:08:34 +02:00
67a0689f71
Revert "local state: move to separate package"
...
This reverts commit d447e823c6
2017-10-23 10:08:34 +02:00
623e07760a
Revert "local state: replace multi-map state with structs"
...
This reverts commit ccbae7da5b
2017-10-23 10:08:34 +02:00
9ed4b2d631
Revert "local state: tests compile"
...
This reverts commit 1af52bf7be
2017-10-23 10:08:34 +02:00
b3bfeee100
Revert "local state: fix failing tests"
...
This reverts commit 76682da4a0
2017-10-23 10:08:34 +02:00
5ae4c52ca6
Revert "local state: fix test with updated error message"
...
This reverts commit e9149f64d9
2017-10-23 10:08:34 +02:00
67cdfc038e
Revert "local state: fix anti-entropy state tests"
...
This reverts commit f8e20cd996
2017-10-23 10:08:34 +02:00
fca0df59fb
Revert "agent: skip non-sensical TestCatalogRegister"
...
This reverts commit ce1f35373e
2017-10-23 10:08:34 +02:00
556bf3f85d
Revert "local state: drop retry loops from tests"
...
This reverts commit 2bdba8ab06
2017-10-23 10:08:34 +02:00
a3aa864d5b
Revert "local state: rename tests"
...
This reverts commit ff62eaf063
2017-10-23 10:08:34 +02:00
39615cb57b
Revert "local state: fix TestAgentAntiEntropy_EnableTagOverride"
...
This reverts commit 86f7ea6013
2017-10-23 10:08:34 +02:00
9fdea75d99
Revert "local state: refactor TestAgentAntiEntropy_EnableTagOverride"
...
This reverts commit c28e23eac8
2017-10-23 10:08:33 +02:00
46641e44d9
Revert "local state: address review comments"
...
This reverts commit 1d315075b1
2017-10-23 10:08:33 +02:00
abd83f2d28
Revert "local state: update comments"
...
This reverts commit 42188164f8
2017-10-23 10:08:33 +02:00
c6e441dd60
Revert "local state: update documentation of updateSyncState"
...
This reverts commit e86521e637
2017-10-23 10:08:33 +02:00
648b4da4f8
Revert "local state: move Metadata methods together"
...
This reverts commit 9bc8127728
2017-10-23 10:08:33 +02:00
fa45a6a547
Revert "local state: rename Add{Check,Service}State to Set{Check,Service}State"
...
This reverts commit 9280841a80
2017-10-23 10:08:33 +02:00
e95d22b9a8
Revert "ae: ensure that syncs are blocked when paused"
...
This reverts commit ffb265dd93
2017-10-23 10:08:33 +02:00
23a9ac9d56
Revert "ae: restore previous pause/resume behavior"
...
This reverts commit 126046be23
2017-10-23 10:08:33 +02:00
93d03595d1
Revert "ae: make stagger function pluggable for testing"
...
This reverts commit 066ad01c38
2017-10-23 10:08:33 +02:00
3d202b59bc
Revert "ae: add test for ifNotPausedRun"
...
This reverts commit f5177ef332
2017-10-23 10:08:33 +02:00
e0e96496f1
Revert "ae: add test for resume triggering SyncChanges"
...
This reverts commit cd0262744d
2017-10-23 10:08:32 +02:00
cab3b17292
Revert "ae: fix typo in constructor name"
...
This reverts commit e88f49e2cc
2017-10-23 10:08:32 +02:00
25ed78c8f7
Revert "ae: make control flow more explicit"
...
This reverts commit b9a8b53d52
2017-10-23 10:08:32 +02:00
65166cce8e
Revert "ae: add test that we run a full before a partial sync"
...
This reverts commit 8158cec829
2017-10-23 10:08:32 +02:00
e78520c3f9
Revert "ae: refactor StateSyncer to state machine for better testing"
...
This reverts commit 8a45365f68
2017-10-23 10:08:32 +02:00
Frank Schroeder