From ffa29d2cc303e0ed2211ff1690bf650c1aa68d4d Mon Sep 17 00:00:00 2001 From: Jack Pearkes Date: Mon, 1 Jul 2019 11:38:53 -0700 Subject: [PATCH 1/3] website: fix link to raft paper (#6046) --- website/source/docs/internals/consensus.html.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/website/source/docs/internals/consensus.html.md b/website/source/docs/internals/consensus.html.md index 48a49f9e2..0a1fdd882 100644 --- a/website/source/docs/internals/consensus.html.md +++ b/website/source/docs/internals/consensus.html.md @@ -11,7 +11,7 @@ description: |- Consul uses a [consensus protocol](https://en.wikipedia.org/wiki/Consensus_(computer_science)) to provide [Consistency (as defined by CAP)](https://en.wikipedia.org/wiki/CAP_theorem). The consensus protocol is based on -["Raft: In search of an Understandable Consensus Algorithm"](https://ramcloud.stanford.edu/wiki/download/attachments/11370504/raft.pdf). +["Raft: In search of an Understandable Consensus Algorithm"](https://raft.github.io/raft.pdf). For a visual explanation of Raft, see [The Secret Lives of Data](http://thesecretlivesofdata.com/raft). ## Raft Protocol Overview @@ -51,7 +51,7 @@ and managing when an entry is considered committed. Raft is a complex protocol and will not be covered here in detail (for those who desire a more comprehensive treatment, the full specification is available in this -[paper](https://ramcloud.stanford.edu/wiki/download/attachments/11370504/raft.pdf)). +[paper](https://raft.github.io/raft.pdf)). We will, however, attempt to provide a high level description which may be useful for building a mental model. From 2e9370ba11946451e9368d4d876e65e9861c56a9 Mon Sep 17 00:00:00 2001 From: Pierre Souchay Date: Tue, 2 Jul 2019 01:02:00 +0200 Subject: [PATCH 2/3] Bump timeout in TestManager_BasicLifecycle (#6030) --- agent/proxycfg/manager_test.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/agent/proxycfg/manager_test.go b/agent/proxycfg/manager_test.go index 7a69bbadf..5fba10f34 100644 --- a/agent/proxycfg/manager_test.go +++ b/agent/proxycfg/manager_test.go @@ -215,7 +215,7 @@ func assertWatchChanRecvs(t *testing.T, ch <-chan *ConfigSnapshot, expect *Confi if expect == nil { require.False(t, ok, "watch chan should be closed") } - case <-time.After(50*time.Millisecond + coalesceTimeout): + case <-time.After(100*time.Millisecond + coalesceTimeout): t.Fatal("recv timeout") } } From 63e6a7410f315f09e766f996ac8c422dad18d8dd Mon Sep 17 00:00:00 2001 From: Freddy Date: Tue, 2 Jul 2019 11:26:26 -0600 Subject: [PATCH 3/3] Fix Envoy 1.10 support note (#6045) --- website/source/docs/connect/proxies/envoy.md | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/website/source/docs/connect/proxies/envoy.md b/website/source/docs/connect/proxies/envoy.md index 5095b695c..44ff6682d 100644 --- a/website/source/docs/connect/proxies/envoy.md +++ b/website/source/docs/connect/proxies/envoy.md @@ -132,8 +132,7 @@ configuration entry](/docs/agent/config_entries.html#proxy-defaults-proxy-defaul available interfaces or a pod IP address. -> **Note:** Envoy versions prior to 1.10 do not export timing histograms - using the internal Prometheus endpoint. Consul 1.5.0 [doesn't yet support - Envoy 1.10](#supported-versions) although support will soon be added. + using the internal Prometheus endpoint. - `envoy_stats_tags` - Specifies one or more static tags that will be added to all metrics produced by the proxy.