Skip to content

Commit

Permalink
make test coordination sleepless, fix nits
Browse files Browse the repository at this point in the history
  • Loading branch information
@vyzo
vyzo committed Jan 12, 2022
1 parent 335bb1f commit ce94fad
Show file tree
Hide file tree
Showing 3 changed files with 83 additions and 55 deletions.
23 changes: 16 additions & 7 deletions itest/echo.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ var (
type Echo struct {
Host host.Host

WaitBeforeRead, WaitBeforeWrite func() error
BeforeReserve, BeforeRead, BeforeWrite func() error

mx sync.Mutex
status EchoStatus
Expand Down Expand Up @@ -60,6 +60,15 @@ func (e *Echo) handleStream(s network.Stream) {
e.status.StreamsIn++
e.mx.Unlock()

if e.BeforeReserve != nil {
if err := e.BeforeReserve(); err != nil {
echoLog.Debugf("error syncing before reserve: %s", err)

s.Reset()
return
}
}

if err := s.Scope().SetService(EchoService); err != nil {
echoLog.Debugf("error attaching stream to echo service: %s", err)

Expand All @@ -82,9 +91,9 @@ func (e *Echo) handleStream(s network.Stream) {
return
}

if e.WaitBeforeRead != nil {
if err := e.WaitBeforeRead(); err != nil {
echoLog.Debugf("error waiting before read: %s", err)
if e.BeforeRead != nil {
if err := e.BeforeRead(); err != nil {
echoLog.Debugf("error syncing before read: %s", err)

s.Reset()
return
Expand Down Expand Up @@ -116,9 +125,9 @@ func (e *Echo) handleStream(s network.Stream) {
e.status.EchosIn++
e.mx.Unlock()

if e.WaitBeforeWrite != nil {
if err := e.WaitBeforeWrite(); err != nil {
echoLog.Debugf("error waiting before write: %s", err)
if e.BeforeWrite != nil {
if err := e.BeforeWrite(); err != nil {
echoLog.Debugf("error syncing before write: %s", err)

s.Reset()
return
Expand Down
42 changes: 12 additions & 30 deletions itest/echo_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,8 @@ import (
"github.com/libp2p/go-libp2p"
"github.com/libp2p/go-libp2p-core/peer"
"github.com/libp2p/go-libp2p-core/peerstore"

"github.com/stretchr/testify/require"
)

func createEchos(t *testing.T, count int, opts ...libp2p.Option) []*Echo {
Expand Down Expand Up @@ -35,46 +37,26 @@ func createEchos(t *testing.T, count int, opts ...libp2p.Option) []*Echo {
return result
}

func closeEchos(echos []*Echo) {
for _, e := range echos {
e.Host.Close()
}
}

func checkEchoStatus(t *testing.T, e *Echo, expected EchoStatus) {
t.Helper()

status := e.Status()

if status.StreamsIn != expected.StreamsIn {
t.Fatalf("expected %d streams in, got %d", expected.StreamsIn, status.StreamsIn)
}
if status.EchosIn != expected.EchosIn {
t.Fatalf("expected %d echos in, got %d", expected.EchosIn, status.EchosIn)
}
if status.EchosOut != expected.EchosOut {
t.Fatalf("expected %d echos out, got %d", expected.EchosOut, status.EchosOut)
}
if status.IOErrors != expected.IOErrors {
t.Fatalf("expected %d I/O errors, got %d", expected.IOErrors, status.IOErrors)
}
if status.ResourceServiceErrors != expected.ResourceServiceErrors {
t.Fatalf("expected %d service resource errors, got %d", expected.ResourceServiceErrors, status.ResourceServiceErrors)
}
if status.ResourceReservationErrors != expected.ResourceReservationErrors {
t.Fatalf("expected %d reservation resource errors, got %d", expected.ResourceReservationErrors, status.ResourceReservationErrors)
}
require.Equal(t, expected, e.Status())
}

func TestEcho(t *testing.T) {
echos := createEchos(t, 2)
defer closeEchos(echos)

err := echos[0].Host.Connect(context.TODO(), peer.AddrInfo{ID: echos[1].Host.ID()})
if err != nil {
if err := echos[0].Host.Connect(context.TODO(), peer.AddrInfo{ID: echos[1].Host.ID()}); err != nil {
t.Fatal(err)
}

defer func() {
for _, e := range echos {
e.Host.Close()
}
}()

if err = echos[0].Echo(echos[1].Host.ID(), "hello libp2p"); err != nil {
if err := echos[0].Echo(echos[1].Host.ID(), "hello libp2p"); err != nil {
t.Fatal(err)
}

Expand Down
73 changes: 55 additions & 18 deletions itest/rcmgr_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@ package itest
import (
"context"
"sync"
"sync/atomic"
"testing"
"time"

Expand All @@ -16,11 +17,10 @@ func TestResourceManagerConnInbound(t *testing.T) {
// this test checks that we can not exceed the inbound conn limit at system level
// we specify: 1 conn per peer, 3 conns total, and we try to create 4 conns
limiter := rcmgr.NewFixedLimiter(1 << 30)
limiter.SystemLimits = limiter.SystemLimits.
WithConnLimit(3, 1024)
limiter.DefaultPeerLimits = limiter.DefaultPeerLimits.
WithConnLimit(1, 16)
limiter.SystemLimits = limiter.SystemLimits.WithConnLimit(3, 1024)
limiter.DefaultPeerLimits = limiter.DefaultPeerLimits.WithConnLimit(1, 16)
echos := createEchos(t, 5, libp2p.ResourceManager(rcmgr.NewResourceManager(limiter)))
defer closeEchos(echos)

for i := 1; i < 4; i++ {
err := echos[i].Host.Connect(context.Background(), peer.AddrInfo{ID: echos[0].Host.ID()})
Expand All @@ -47,11 +47,10 @@ func TestResourceManagerConnOutbound(t *testing.T) {
// this test checks that we can not exceed the inbound conn limit at system level
// we specify: 1 conn per peer, 3 conns total, and we try to create 4 conns
limiter := rcmgr.NewFixedLimiter(1 << 30)
limiter.SystemLimits = limiter.SystemLimits.
WithConnLimit(1024, 3)
limiter.DefaultPeerLimits = limiter.DefaultPeerLimits.
WithConnLimit(16, 1)
limiter.SystemLimits = limiter.SystemLimits.WithConnLimit(1024, 3)
limiter.DefaultPeerLimits = limiter.DefaultPeerLimits.WithConnLimit(16, 1)
echos := createEchos(t, 5, libp2p.ResourceManager(rcmgr.NewResourceManager(limiter)))
defer closeEchos(echos)

for i := 1; i < 4; i++ {
err := echos[0].Host.Connect(context.Background(), peer.AddrInfo{ID: echos[i].Host.ID()})
Expand All @@ -78,14 +77,15 @@ func TestResourceManagerServiceInbound(t *testing.T) {
// this test checks that we can not exceed the inbound stream limit at service level
// we specify: 3 streams for the service, and we try to create 4 streams
limiter := rcmgr.NewFixedLimiter(1 << 30)
limiter.DefaultServiceLimits = limiter.DefaultServiceLimits.
WithStreamLimit(3, 1024)
limiter.DefaultServiceLimits = limiter.DefaultServiceLimits.WithStreamLimit(3, 1024)
echos := createEchos(t, 5, libp2p.ResourceManager(rcmgr.NewResourceManager(limiter)))
defer closeEchos(echos)

echos[0].WaitBeforeRead = func() error {
time.Sleep(100 * time.Millisecond)
return nil
}
count1 := new(int32)
ready1 := new(chan struct{})
ready2 := new(chan struct{})
echos[0].BeforeReserve = waitForSignal(count1, ready1)
echos[0].BeforeRead = waitForChannel(ready2)

for i := 1; i < 5; i++ {
err := echos[i].Host.Connect(context.Background(), peer.AddrInfo{ID: echos[0].Host.ID()})
Expand All @@ -95,6 +95,10 @@ func TestResourceManagerServiceInbound(t *testing.T) {
time.Sleep(10 * time.Millisecond)
}

*count1 = 4
*ready1 = make(chan struct{})
*ready2 = make(chan struct{})

var wg sync.WaitGroup
for i := 1; i < 5; i++ {
wg.Add(1)
Expand All @@ -104,6 +108,7 @@ func TestResourceManagerServiceInbound(t *testing.T) {
err := echos[i].Echo(echos[0].Host.ID(), "hello libp2p")
if err != nil {
t.Log(err)
close(*ready2)
}
}(i)
}
Expand All @@ -125,11 +130,14 @@ func TestResourceManagerServicePeerInbound(t *testing.T) {
EchoService: limiter.DefaultPeerLimits.WithStreamLimit(2, 1024),
}
echos := createEchos(t, 5, libp2p.ResourceManager(rcmgr.NewResourceManager(limiter)))
defer closeEchos(echos)

echos[0].WaitBeforeRead = func() error {
time.Sleep(100 * time.Millisecond)
return nil
}
count1 := new(int32)
count2 := new(int32)
ready1 := new(chan struct{})
ready2 := new(chan struct{})
echos[0].BeforeReserve = waitForSignal(count1, ready1)
echos[0].BeforeRead = waitForSignal(count2, ready2)

for i := 1; i < 5; i++ {
err := echos[i].Host.Connect(context.Background(), peer.AddrInfo{ID: echos[0].Host.ID()})
Expand All @@ -139,6 +147,11 @@ func TestResourceManagerServicePeerInbound(t *testing.T) {
time.Sleep(10 * time.Millisecond)
}

*count1 = 4
*count2 = 4
*ready1 = make(chan struct{})
*ready2 = make(chan struct{})

var wg sync.WaitGroup
for i := 1; i < 5; i++ {
wg.Add(1)
Expand All @@ -160,6 +173,11 @@ func TestResourceManagerServicePeerInbound(t *testing.T) {
ResourceServiceErrors: 0,
})

*count1 = 3
*ready1 = make(chan struct{})
*ready2 = make(chan struct{})
echos[0].BeforeRead = waitForChannel(ready2)

for i := 0; i < 3; i++ {
wg.Add(1)
go func() {
Expand All @@ -168,6 +186,7 @@ func TestResourceManagerServicePeerInbound(t *testing.T) {
err := echos[2].Echo(echos[0].Host.ID(), "hello libp2p")
if err != nil {
t.Log(err)
close(*ready2)
}
}()
}
Expand All @@ -180,3 +199,21 @@ func TestResourceManagerServicePeerInbound(t *testing.T) {
ResourceServiceErrors: 1,
})
}

func waitForSignal(count *int32, ready *chan struct{}) func() error {
return func() error {
if atomic.AddInt32(count, -1) == 0 {
close(*ready)
} else {
<-*ready
}
return nil
}
}

func waitForChannel(ready *chan struct{}) func() error {
return func() error {
<-*ready
return nil
}
}

0 comments on commit ce94fad

Please sign in to comment.