Frank Schroeder
cc51b39eed
watch: convert TestServicesWatch to use channels
2017-10-24 20:35:35 +02:00
Frank Schroeder
7a470d377d
watch: convert TestServiceWatch to use channels
2017-10-24 20:35:35 +02:00
Frank Schroeder
813660507a
watch: convert TestNodesWatch to use channels
2017-10-24 20:35:35 +02:00
Frank Schroeder
8e5662ddd0
watch: use test agent instead of external Consul instance
2017-10-24 11:59:44 +02:00
James Phillips
cf0336228b
Update CHANGELOG.md
2017-10-23 22:54:37 -07:00
James Phillips
d82cfc3b81
Update CHANGELOG.md
2017-10-23 22:53:29 -07:00
Alex Dadgar
98863b9694
Merge pull request #3609 from hashicorp/f-freeport-testing
...
Make freeport testing friendly
2017-10-23 16:34:27 -07:00
Alex Dadgar
791738a3a7
format vendor
2017-10-23 16:31:44 -07:00
Alex Dadgar
af09d86892
Make freeport testing friendly
...
This PR allows the caller to decide if they would like to have the
calling test fail, have the caller panic on error, or handle the errors
themselves.
2017-10-23 16:28:02 -07:00
James Phillips
d8bb6074e4
Update CHANGELOG.md
2017-10-23 08:58:49 -07:00
Frank Schroeder
9d733d8860
Update CHANGELOG.md
2017-10-23 16:44:32 +02:00
Frank Schroeder
b72c8f5526
Update README.md
...
Mention vendorfmt in the `Vendoring` section.
2017-10-23 12:42:00 +02:00
James Phillips
3b170cf258
Changes "ip" to "IP".
2017-10-23 12:34:43 +02:00
Frank Schroeder
62f612de11
Merge pull request #3391 from hashicorp/refactor-local-state-2
...
This patch decouples the local state and the anti-entropy code from the
agent and from each other to have cleaner separation of concerns and to
ensure that data structures are properly locked.
2017-10-23 10:59:55 +02:00
Frank Schroeder
1d2ae14719
local state: fix go vet issue
2017-10-23 10:56:05 +02:00
Frank Schroeder
a818414bb6
local state: remove stale comment
2017-10-23 10:56:05 +02:00
Frank Schroeder
329fdc40a8
local state: make test more robust
2017-10-23 10:56:05 +02:00
Frank Schroeder
f5a3d73b27
local state: clone check to avoid side effect
2017-10-23 10:56:05 +02:00
Frank Schroeder
b36613e7ff
local state: use synchronized access to internal maps
2017-10-23 10:56:05 +02:00
Frank Schroeder
e5318061d1
ae: do not trigger on Resume while holding the lock
2017-10-23 10:56:05 +02:00
Frank Schroeder
7d5dfa9c53
ae: add remaining test cases
2017-10-23 10:56:05 +02:00
Frank Schroeder
ae7269458c
ae: refactor StateSyncer to state machine for better testing
2017-10-23 10:56:05 +02:00
Frank Schroeder
a72b68c562
ae: add test that we run a full before a partial sync
2017-10-23 10:56:05 +02:00
Frank Schroeder
27bc11f005
ae: make control flow more explicit
2017-10-23 10:56:05 +02:00
Frank Schroeder
29435004f6
ae: fix typo in constructor name
2017-10-23 10:56:05 +02:00
Frank Schroeder
1bb1a6787e
ae: add test for resume triggering SyncChanges
2017-10-23 10:56:05 +02:00
Frank Schroeder
6de645a8b8
ae: add test for ifNotPausedRun
2017-10-23 10:56:05 +02:00
Frank Schroeder
4f79ee3188
ae: make stagger function pluggable for testing
2017-10-23 10:56:05 +02:00
Frank Schroeder
5d6089b6fa
ae: restore previous pause/resume behavior
2017-10-23 10:56:04 +02:00
Frank Schroeder
6064a2a764
ae: ensure that syncs are blocked when paused
2017-10-23 10:56:04 +02:00
Frank Schroeder
f187c37c27
local state: rename Add{Check,Service}State to Set{Check,Service}State
2017-10-23 10:56:04 +02:00
Frank Schroeder
209e67b2f9
local state: move Metadata methods together
2017-10-23 10:56:04 +02:00
Frank Schroeder
9513a042be
local state: update documentation of updateSyncState
2017-10-23 10:56:04 +02:00
Frank Schroeder
2e3b72d2c3
local state: update comments
2017-10-23 10:56:04 +02:00
Frank Schroeder
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
Frank Schroeder
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
Frank Schroeder
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
Frank Schroeder
b3195006b1
local state: rename tests
2017-10-23 10:56:04 +02:00
Frank Schroeder
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
Frank Schroeder
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
Frank Schroeder
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
Frank Schroeder
6b966e48ce
local state: fix test with updated error message
2017-10-23 10:56:04 +02:00
Frank Schroeder
632c43e575
local state: fix failing tests
2017-10-23 10:56:03 +02:00
Frank Schroeder
ea92ee308a
local state: tests compile
2017-10-23 10:56:03 +02:00
Frank Schroeder
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
Frank Schroeder
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
Frank Schroeder
b363586813
agent: simplify some loops
2017-10-23 10:56:03 +02:00
Frank Schroeder
218cd4d501
agent: refactor sync loop to linear flow of control
2017-10-23 10:56:03 +02:00
Frank Schroeder
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
Frank Schroeder
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
