7103 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
Frank Schroeder	b803bf3091	local state: tests compile	2017-10-23 10:56:03 +02:00
Frank Schroeder	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
Frank Schroeder	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
Frank Schroeder	c00bbdb5e4	agent: simplify some loops	2017-10-23 10:56:03 +02:00
Frank Schroeder	cbaf97bced	agent: refactor sync loop to linear flow of control	2017-10-23 10:56:03 +02:00
Frank Schroeder	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
Frank Schroeder	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
Frank Schroeder	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
Frank Schroeder	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
Frank Schroeder	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
Frank Schroeder	e5d5e6429b	Revert "config: add support for go-sockaddr templates for DNS recursors" ... This reverts commit 72bee6284d44e0ed3e18e6819188f1d32528478c.	2017-10-23 10:08:35 +02:00
Frank Schroeder	0ca94055c4	Revert "doc: update docs for dns recursor go-sockaddr templates" ... This reverts commit 6d4a57aedc55a4664537033c0c69edea20fd919b.	2017-10-23 10:08:35 +02:00
Frank Schroeder	0e360cc3b5	Revert "config: do not allow an ANY address as DNS recursor" ... This reverts commit 1db8d3cb00bec980480d525571cea76c6c49c3e7.	2017-10-23 10:08:35 +02:00
Frank Schroeder	42563dc73f	Revert "doc: address review comment" ... This reverts commit 6ba9690e812089ba3dbda43f17e6b862201d16a8.	2017-10-23 10:08:35 +02:00
Frank Schroeder	703be5a219	Revert "Changes "ip" to "IP"." ... This reverts commit dca5dcb68c573373536bdb4891d000eac0ece95b.	2017-10-23 10:08:35 +02:00
Frank Schroeder	58b0e153f9	Revert "agent: decouple anti-entropy from local state" ... This reverts commit a842dc9c2bf00855ef93211232da36b2d91eab5b.	2017-10-23 10:08:35 +02:00
Frank Schroeder	b4e7d0b974	Revert "agent: cleanup StateSyncer" ... This reverts commit b7136e100bef727144c202ae55f81152ac6a8b5f.	2017-10-23 10:08:35 +02:00
Frank Schroeder	26a155eb41	Revert "agent: refactor sync loop to linear flow of control" ... This reverts commit 7a2af206ea964fc0846f9b80c10ea9d91cb3c99e.	2017-10-23 10:08:35 +02:00
Frank Schroeder	91569a7ceb	Revert "agent: simplify some loops" ... This reverts commit b5dbad910c63b29dadf10731808d6891067a2bfa.	2017-10-23 10:08:34 +02:00
Frank Schroeder	67a0689f71	Revert "local state: move to separate package" ... This reverts commit d447e823c63720c74bb02459a985724f035f023e.	2017-10-23 10:08:34 +02:00
Frank Schroeder	623e07760a	Revert "local state: replace multi-map state with structs" ... This reverts commit ccbae7da5bceeb2328ab7993a8badbf2e72a4597.	2017-10-23 10:08:34 +02:00
Frank Schroeder	9ed4b2d631	Revert "local state: tests compile" ... This reverts commit 1af52bf7be02d952e16e14209899a9715451f7ba.	2017-10-23 10:08:34 +02:00
Frank Schroeder	b3bfeee100	Revert "local state: fix failing tests" ... This reverts commit 76682da4a048b623a1c201eb56710639437a9ed9.	2017-10-23 10:08:34 +02:00
Frank Schroeder	5ae4c52ca6	Revert "local state: fix test with updated error message" ... This reverts commit e9149f64d9afb38246f9432edd806321c1eefb83.	2017-10-23 10:08:34 +02:00
Frank Schroeder	67cdfc038e	Revert "local state: fix anti-entropy state tests" ... This reverts commit f8e20cd9960e19bbe61e258c445250723870816f.	2017-10-23 10:08:34 +02:00
Frank Schroeder	fca0df59fb	Revert "agent: skip non-sensical TestCatalogRegister" ... This reverts commit ce1f35373e6ad1486cb83398fce70f5c54f910d3.	2017-10-23 10:08:34 +02:00
Frank Schroeder	556bf3f85d	Revert "local state: drop retry loops from tests" ... This reverts commit 2bdba8ab06d1c9dd99d5e7cf8370c94b4f7adfaa.	2017-10-23 10:08:34 +02:00
Frank Schroeder	a3aa864d5b	Revert "local state: rename tests" ... This reverts commit ff62eaf0634a4c09377c53d4623685437f217b49.	2017-10-23 10:08:34 +02:00
Frank Schroeder	39615cb57b	Revert "local state: fix TestAgentAntiEntropy_EnableTagOverride" ... This reverts commit 86f7ea601342d6f3ceb9d0dc74bd5b33dae0b8d8.	2017-10-23 10:08:34 +02:00
Frank Schroeder	9fdea75d99	Revert "local state: refactor TestAgentAntiEntropy_EnableTagOverride" ... This reverts commit c28e23eac8ada7a668b13e9a4a3d8066457488ef.	2017-10-23 10:08:33 +02:00
Frank Schroeder	46641e44d9	Revert "local state: address review comments" ... This reverts commit 1d315075b15647db7fcd42986c9c5673cbb77a77.	2017-10-23 10:08:33 +02:00
Frank Schroeder	abd83f2d28	Revert "local state: update comments" ... This reverts commit 42188164f885188e3bc8cff70ea5aeb47d633b83.	2017-10-23 10:08:33 +02:00
Frank Schroeder	c6e441dd60	Revert "local state: update documentation of updateSyncState" ... This reverts commit e86521e637d742bce1e460b6b960037cef3578ed.	2017-10-23 10:08:33 +02:00
Frank Schroeder	648b4da4f8	Revert "local state: move Metadata methods together" ... This reverts commit 9bc8127728a62beb94b28849070b6ac35c181404.	2017-10-23 10:08:33 +02:00
Frank Schroeder	fa45a6a547	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
Frank Schroeder	e95d22b9a8	Revert "ae: ensure that syncs are blocked when paused" ... This reverts commit ffb265dd939cefd7e865d624d0a4ba81f88e4505.	2017-10-23 10:08:33 +02:00
Frank Schroeder	23a9ac9d56	Revert "ae: restore previous pause/resume behavior" ... This reverts commit 126046be2366afde97fdf01d0dceece2977dd6d6.	2017-10-23 10:08:33 +02:00
Frank Schroeder	93d03595d1	Revert "ae: make stagger function pluggable for testing" ... This reverts commit 066ad01c3804a39161c4d46147aa2eb86e48cd67.	2017-10-23 10:08:33 +02:00
Frank Schroeder	3d202b59bc	Revert "ae: add test for ifNotPausedRun" ... This reverts commit f5177ef332b8396aea368b7dea18a976e029a54f.	2017-10-23 10:08:33 +02:00
Frank Schroeder	e0e96496f1	Revert "ae: add test for resume triggering SyncChanges" ... This reverts commit cd0262744deab9294af17e4039ed2e2a27818cde.	2017-10-23 10:08:32 +02:00
Frank Schroeder	cab3b17292	Revert "ae: fix typo in constructor name" ... This reverts commit e88f49e2ccc79f77b5395de28d8fbdfc6eeb36f6.	2017-10-23 10:08:32 +02:00
Frank Schroeder	25ed78c8f7	Revert "ae: make control flow more explicit" ... This reverts commit b9a8b53d5257d679c427422c324e6f124664db60.	2017-10-23 10:08:32 +02:00
Frank Schroeder	65166cce8e	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
Frank Schroeder	e78520c3f9	Revert "ae: refactor StateSyncer to state machine for better testing" ... This reverts commit 8a45365f68147dd13c1232bc574bd54e4a12e478.	2017-10-23 10:08:32 +02:00
Frank Schroeder	4121cafed7	Revert "ae: add remaining test cases" ... This reverts commit c32915bb4ff28b1670e88edaf0bbb9779dc6e2bc.	2017-10-23 10:08:32 +02:00
Frank Schroeder	f8202f300f	Revert "ae: do not trigger on Resume while holding the lock" ... This reverts commit bd00814301bbf5db037e739e91a0b66ebb564821.	2017-10-23 10:08:32 +02:00
Frank Schroeder	d6f52d9ed1	Revert "local state: use synchronized access to internal maps" ... This reverts commit 39a2d8d25e629823e183e384e8414171edcf4164.	2017-10-23 10:08:32 +02:00
Frank Schroeder	4e862d126d	Revert "local state: clone check to avoid side effect" ... This reverts commit af1243c7251fe6291145bbe4f4dacd374779c425.	2017-10-23 10:08:32 +02:00
Frank Schroeder	42af4cdc70	Revert "local state: make test more robust" ... This reverts commit f9267380dbcdb2746393eee5067e5037dff2b184.	2017-10-23 10:08:32 +02:00
Frank Schroeder	4ae8317fbf	Revert "local state: remove stale comment" ... This reverts commit 35f4acdddc38f0371543e12b0d2ccb27a0a64869.	2017-10-23 10:08:32 +02:00