Mirroristas/etcd
2
0
Fork 0
mirror of https://github.com/etcd-io/etcd.git synced 2024-09-27 06:25:44 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #7756 from heyitsanthony/weaken-v3elect-test

Browse Source 
integration: permit dropping intermediate leader values on observe
This commit is contained in:
Anthony Romano 2017-04-22 12:13:51 -07:00 committed by GitHub
commit 94f6a11bbf
2 changed files with 14 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
clientv3/concurrency/election.go
View File

@ -148,9 +148,13 @@ func (e *Election) Leader(ctx context.Context) (*v3.GetResponse, error) {
return resp, nil
}
// Observe returns a channel that observes all leader proposal values as
// GetResponse values on the current leader key. The channel closes when
// the context is cancelled or the underlying watcher is otherwise disrupted.
// Observe returns a channel that reliably observes ordered leader proposals
// as GetResponse values on every current elected leader key. It will not
// necessarily fetch all historical leader updates, but will always post the
// most recent leader value.
//
// The channel closes when the context is canceled or the underlying watcher
// is otherwise disrupted.
func (e *Election) Observe(ctx context.Context) <-chan v3.GetResponse {
retc := make(chan v3.GetResponse)
go e.observe(ctx, retc)

10
integration/v3election_grpc_test.go
View File

@ -96,7 +96,7 @@ func TestV3ElectionObserve(t *testing.T) {
lc := epb.NewElectionClient(clus.Client(0).ActiveConnection())
// observe 10 leadership events
// observe leadership events
observec := make(chan struct{})
go func() {
defer close(observec)
@ -110,9 +110,13 @@ func TestV3ElectionObserve(t *testing.T) {
if rerr != nil {
t.Fatal(rerr)
}
if string(resp.Kv.Value) != fmt.Sprintf("%d", i) {
t.Fatalf(`got observe value %q, expected "%d"`, string(resp.Kv.Value), i)
respV := 0
fmt.Sscanf(string(resp.Kv.Value), "%d", &respV)
// leader transitions should not go backwards
if respV < i {
t.Fatalf(`got observe value %q, expected >= "%d"`, string(resp.Kv.Value), i)
}
i = respV
}
}()