status-im/consul
2
0
Fork 0
mirror of https://github.com/status-im/consul.git synced 2025-02-02 00:46:43 +00:00
Code Issues Projects Releases Wiki Activity

Merge Consul OSS branch 'master' at commit a58d8e91ac258c04174afca3818cbdae23aa8d3f

Browse Source
This commit is contained in:
hashicorp-ci 2019-07-03 02:00:31 +00:00
commit 7a32c5a618
3 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
agent/proxycfg/manager_test.go
View File

@ -269,7 +269,7 @@ func assertWatchChanRecvs(t *testing.T, ch <-chan *ConfigSnapshot, expect *Confi
if expect == nil { if expect == nil {
require.False(t, ok, "watch chan should be closed") 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") t.Fatal("recv timeout")
} }
} }

3
website/source/docs/connect/proxies/envoy.md
View File

@ -132,8 +132,7 @@ configuration entry](/docs/agent/config_entries.html#proxy-defaults-proxy-defaul
available interfaces or a pod IP address. available interfaces or a pod IP address.
-> **Note:** Envoy versions prior to 1.10 do not export timing histograms -> **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 using the internal Prometheus endpoint.
Envoy 1.10](#supported-versions) although support will soon be added.
- `envoy_stats_tags` - Specifies one or more static tags that will be added to - `envoy_stats_tags` - Specifies one or more static tags that will be added to
all metrics produced by the proxy. all metrics produced by the proxy.

4
website/source/docs/internals/consensus.html.md
View File

@ -11,7 +11,7 @@ description: |-
Consul uses a [consensus protocol](https://en.wikipedia.org/wiki/Consensus_(computer_science)) 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). to provide [Consistency (as defined by CAP)](https://en.wikipedia.org/wiki/CAP_theorem).
The consensus protocol is based on 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). For a visual explanation of Raft, see [The Secret Lives of Data](http://thesecretlivesofdata.com/raft).
## Raft Protocol Overview ## 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 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 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 We will, however, attempt to provide a high level description which may be useful
for building a mental model. for building a mental model.