Commitfbabb43

authored

fix: ignore spurious node updates while waiting for errors (#10175)

1 parentb0d2828 commitfbabb43Copy full SHA for fbabb43

File tree

+14

-6

lines changed

+14

-6

lines changed

Lines changed: 14 additions & 6 deletions

Original file line number	Diff line number	Diff line change
`@@ -645,12 +645,20 @@ func (c testConn) recvNodes(ctx context.Context, t testing.T) []*agpl.Node {`
`645`	`645`
`646`	`646`	`func (ctestConn)recvErr(ctx context.Context,ttesting.T)error {`
`647`	`647`	`t.Helper()`
`648`		`-select {`
`649`		`-case<-ctx.Done():`
`650`		`-t.Fatal("timeout receiving error")`
`651`		`-returnctx.Err()`
`652`		`-caseerr:=<-c.errChan:`
`653`		`-returnerr`
	`648`	`+// pgCoord works on eventual consistency, so it sometimes sends extra node`
	`649`	`+// updates, and these block errors if not read from the nodes channel.`
	`650`	`+for {`
	`651`	`+select {`
	`652`	`+casenodes:=<-c.nodeChan:`
	`653`	`+t.Logf("ignoring nodes update while waiting for error; id=%s, nodes=%+v",`
	`654`	`+c.id.String(),nodes)`
	`655`	`+continue`
	`656`	`+case<-ctx.Done():`
	`657`	`+t.Fatal("timeout receiving error")`
	`658`	`+returnctx.Err()`
	`659`	`+caseerr:=<-c.errChan:`
	`660`	`+returnerr`
	`661`	`+}`
`654`	`662`	`}`
`655`	`663`	`}`
`656`	`664`

Comments

(0)