mirrors/etcd
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #14286 from VladSaioc/bugfix-goroutine-leak

Browse Source 
Fixed goroutine leak in server/etcdserver/raft_test.go
This commit is contained in:
Benjamin Wang
2022-08-03 06:02:54 +08:00
committed by GitHub
parent 4f0e92d94c 6cded3d94c
commit ae36a577d7
1 changed files with 12 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
server/etcdserver/raft_test.go
View File

@ -168,12 +168,8 @@ func TestStopRaftWhenWaitingForApplyDone(t *testing.T) {
srv := &EtcdServer{lgMu: new(sync.RWMutex), lg: zaptest.NewLogger(t), r: *r} srv := &EtcdServer{lgMu: new(sync.RWMutex), lg: zaptest.NewLogger(t), r: *r}
srv.r.start(nil) srv.r.start(nil)
n.readyc <- raft.Ready{} n.readyc <- raft.Ready{}
select {
case <-srv.r.applyc:
case <-time.After(time.Second):
t.Fatalf("failed to receive toApply struct")
}
stop := func() {
srv.r.stopped <- struct{}{} srv.r.stopped <- struct{}{}
select { select {
case <-srv.r.done: case <-srv.r.done:
@ -182,6 +178,16 @@ func TestStopRaftWhenWaitingForApplyDone(t *testing.T) {
} }
} }
select {
case <-srv.r.applyc:
case <-time.After(time.Second):
stop()
t.Fatalf("failed to receive toApply struct")
}
stop()
}
// TestConfigChangeBlocksApply ensures toApply blocks if committed entries contain config-change. // TestConfigChangeBlocksApply ensures toApply blocks if committed entries contain config-change.
func TestConfigChangeBlocksApply(t *testing.T) { func TestConfigChangeBlocksApply(t *testing.T) {
n := newNopReadyNode() n := newNopReadyNode()