lychiyu/bbgo_origin
1
0
Fork 0
mirror of https://github.com/c9s/bbgo.git synced 2024-11-21 14:33:53 +00:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

all: handle AllAuthedC timeout from the caller
Some checks are pending
Go / build (1.21, 6.2) (push) Waiting to run
Details
golang-lint / lint (push) Waiting to run
Details

Browse Source
This commit is contained in:
c9s 2024-11-15 02:03:22 +08:00
parent e5c57bf8ba
commit e379e4c97d
No known key found for this signature in database
GPG Key ID: 7385E7E464CB0A54
4 changed files with 16 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
pkg/strategy/xdepthmaker/strategy.go
View File

@ -620,7 +620,9 @@ func (s *Strategy) CrossRun(
select {
case <-ctx.Done():
return
case <-connGroup.AllAuthedC(ctx, time.Minute):
case <-time.After(3 * time.Minute):
log.Panicf("authentication timeout, exiting...")
case <-connGroup.AllAuthedC(ctx):
}
log.Infof("user data stream authenticated, start placing orders...")

6
pkg/strategy/xmaker/strategy.go
View File

@ -1844,7 +1844,11 @@ func (s *Strategy) CrossRun(
s.logger.Infof("waiting for authentication connections to be ready...")
select {
case <-ctx.Done():
case <-s.connectivityGroup.AllAuthedC(ctx, 3*time.Minute):
case <-time.After(3 * time.Minute):
s.logger.Panicf("authentication timeout, exiting...")
case <-s.connectivityGroup.AllAuthedC(ctx):
}
s.logger.Infof("all user data streams are connected, starting workers...")

10
pkg/types/connectivitygroup.go
View File

@ -194,16 +194,12 @@ func (g *ConnectivityGroup) AnyDisconnected(ctx context.Context) bool {
return false
}
func (g *ConnectivityGroup) waitAllAuthed(ctx context.Context, c chan struct{}, allTimeoutDuration time.Duration) {
allTimeout := time.After(allTimeoutDuration)
func (g *ConnectivityGroup) waitAllAuthed(ctx context.Context, c chan struct{}) {
for {
select {
case <-ctx.Done():
return
case <-allTimeout:
return
default:
state := g.GetState()
if state == ConnectivityStateAuthed {
@ -219,8 +215,8 @@ func (g *ConnectivityGroup) waitAllAuthed(ctx context.Context, c chan struct{},
// AllAuthedC returns a channel that will be closed when all connections are authenticated
// the returned channel will be closed when all connections are authenticated
// and the channel can only be used once (because we can't close a channel twice)
func (g *ConnectivityGroup) AllAuthedC(ctx context.Context, timeout time.Duration) <-chan struct{} {
func (g *ConnectivityGroup) AllAuthedC(ctx context.Context) <-chan struct{} {
c := make(chan struct{})
go g.waitAllAuthed(ctx, c, timeout)
go g.waitAllAuthed(ctx, c)
return c
}

10
pkg/types/connectivitygroup_test.go
View File

@ -16,7 +16,7 @@ func TestConnectivityGroupAuthC(t *testing.T) {
conn1 := NewConnectivity()
conn2 := NewConnectivity()
group := NewConnectivityGroup(conn1, conn2)
allAuthedC := group.AllAuthedC(ctx, time.Second)
allAuthedC := group.AllAuthedC(ctx)
time.Sleep(delay)
conn1.setConnect()
@ -124,10 +124,10 @@ func TestConnectivityGroup(t *testing.T) {
}()
authed1 := false
authedC1 := group.AllAuthedC(ctx, 3*time.Second)
authedC1 := group.AllAuthedC(ctx)
authed2 := false
authedC2 := group.AllAuthedC(ctx, 3*time.Second)
authedC2 := group.AllAuthedC(ctx)
select {
case <-authedC1:
@ -185,10 +185,10 @@ func TestConnectivityGroup(t *testing.T) {
}()
authed1 := false
authedC1 := group1.AllAuthedC(ctx, 3*time.Second)
authedC1 := group1.AllAuthedC(ctx)
authed2 := false
authedC2 := group2.AllAuthedC(ctx, 3*time.Second)
authedC2 := group2.AllAuthedC(ctx)
select {
case <-authedC1: