Skip to content

Commit 879c18e

Browse files
yacovmyacovm
committed
[FAB-8067] Fine tune gossip UT port ranges
This change set adjusts gossip UT port ranges so that different packages could run in parallel. Change-Id: I514623bc1291134cfb11e9f6a1f2439883aa409f Signed-off-by: yacovm <yacovm@il.ibm.com>
1 parent 831753b commit 879c18e

File tree

10 files changed

+85
-105
lines changed

10 files changed

+85
-105
lines changed

‎gossip/comm/comm_test.go

+26-26
Original file line numberDiff line numberDiff line change
@@ -327,8 +327,8 @@ func TestHandshake(t *testing.T) {
327327

328328
func TestBasic(t *testing.T) {
329329
t.Parallel()
330-
comm1, _ := newCommInstance(2000, naiveSec)
331-
comm2, _ := newCommInstance(3000, naiveSec)
330+
comm1, _ := newCommInstance(52000, naiveSec)
331+
comm2, _ := newCommInstance(53000, naiveSec)
332332
comm1.(*commImpl).SetDialOpts()
333333
comm2.(*commImpl).SetDialOpts()
334334
defer comm1.Stop()
@@ -342,25 +342,25 @@ func TestBasic(t *testing.T) {
342342
}
343343
go reader(m1)
344344
go reader(m2)
345-
comm1.Send(createGossipMsg(), remotePeer(3000))
345+
comm1.Send(createGossipMsg(), remotePeer(53000))
346346
time.Sleep(time.Second)
347-
comm2.Send(createGossipMsg(), remotePeer(2000))
347+
comm2.Send(createGossipMsg(), remotePeer(52000))
348348
waitForMessages(t, out, 2, "Didn't receive 2 messages")
349349
}
350350

351351
func TestProdConstructor(t *testing.T) {
352352
t.Parallel()
353-
srv, lsnr, dialOpts, certs := createGRPCLayer(20000)
353+
srv, lsnr, dialOpts, certs := createGRPCLayer(29000)
354354
defer srv.Stop()
355355
defer lsnr.Close()
356-
id := []byte("localhost:20000")
356+
id := []byte("localhost:29000")
357357
comm1, _ := NewCommInstance(srv, certs, identity.NewIdentityMapper(naiveSec, id, noopPurgeIdentity), id, dialOpts)
358358
go srv.Serve(lsnr)
359359

360-
srv, lsnr, dialOpts, certs = createGRPCLayer(30000)
360+
srv, lsnr, dialOpts, certs = createGRPCLayer(39000)
361361
defer srv.Stop()
362362
defer lsnr.Close()
363-
id = []byte("localhost:30000")
363+
id = []byte("localhost:39000")
364364
comm2, _ := NewCommInstance(srv, certs, identity.NewIdentityMapper(naiveSec, id, noopPurgeIdentity), id, dialOpts)
365365
go srv.Serve(lsnr)
366366
defer comm1.Stop()
@@ -374,9 +374,9 @@ func TestProdConstructor(t *testing.T) {
374374
}
375375
go reader(m1)
376376
go reader(m2)
377-
comm1.Send(createGossipMsg(), remotePeer(30000))
377+
comm1.Send(createGossipMsg(), remotePeer(39000))
378378
time.Sleep(time.Second)
379-
comm2.Send(createGossipMsg(), remotePeer(20000))
379+
comm2.Send(createGossipMsg(), remotePeer(29000))
380380
waitForMessages(t, out, 2, "Didn't receive 2 messages")
381381
}
382382

@@ -545,8 +545,8 @@ func TestNonResponsivePing(t *testing.T) {
545545

546546
func TestResponses(t *testing.T) {
547547
t.Parallel()
548-
comm1, _ := newCommInstance(8611, naiveSec)
549-
comm2, _ := newCommInstance(8612, naiveSec)
548+
comm1, _ := newCommInstance(58611, naiveSec)
549+
comm2, _ := newCommInstance(58612, naiveSec)
550550

551551
defer comm1.Stop()
552552
defer comm2.Stop()
@@ -569,7 +569,7 @@ func TestResponses(t *testing.T) {
569569

570570
ticker := time.NewTicker(10 * time.Second)
571571
wg.Wait()
572-
comm2.Send(msg, remotePeer(8611))
572+
comm2.Send(msg, remotePeer(58611))
573573

574574
select {
575575
case <-ticker.C:
@@ -584,8 +584,8 @@ func TestResponses(t *testing.T) {
584584

585585
func TestAccept(t *testing.T) {
586586
t.Parallel()
587-
comm1, _ := newCommInstance(7611, naiveSec)
588-
comm2, _ := newCommInstance(7612, naiveSec)
587+
comm1, _ := newCommInstance(57611, naiveSec)
588+
comm2, _ := newCommInstance(57612, naiveSec)
589589

590590
evenNONCESelector := func(m interface{}) bool {
591591
return m.(proto.ReceivedMessage).GetGossipMessage().Nonce%2 == 0
@@ -616,7 +616,7 @@ func TestAccept(t *testing.T) {
616616
go readIntoSlice(&oddResults, oddNONCES)
617617

618618
for i := 0; i < util.GetIntOrDefault("peer.gossip.recvBuffSize", defRecvBuffSize); i++ {
619-
comm2.Send(createGossipMsg(), remotePeer(7611))
619+
comm2.Send(createGossipMsg(), remotePeer(57611))
620620
}
621621

622622
waitForMessages(t, out, util.GetIntOrDefault("peer.gossip.recvBuffSize", defRecvBuffSize), "Didn't receive all messages sent")
@@ -642,8 +642,8 @@ func TestAccept(t *testing.T) {
642642

643643
func TestReConnections(t *testing.T) {
644644
t.Parallel()
645-
comm1, _ := newCommInstance(3611, naiveSec)
646-
comm2, _ := newCommInstance(3612, naiveSec)
645+
comm1, _ := newCommInstance(43611, naiveSec)
646+
comm2, _ := newCommInstance(43612, naiveSec)
647647

648648
reader := func(out chan uint64, in <-chan proto.ReceivedMessage) {
649649
for {
@@ -662,19 +662,19 @@ func TestReConnections(t *testing.T) {
662662
go reader(out2, comm2.Accept(acceptAll))
663663

664664
// comm1 connects to comm2
665-
comm1.Send(createGossipMsg(), remotePeer(3612))
665+
comm1.Send(createGossipMsg(), remotePeer(43612))
666666
waitForMessages(t, out2, 1, "Comm2 didn't receive a message from comm1 in a timely manner")
667667
time.Sleep(time.Second)
668668
// comm2 sends to comm1
669-
comm2.Send(createGossipMsg(), remotePeer(3611))
669+
comm2.Send(createGossipMsg(), remotePeer(43611))
670670
waitForMessages(t, out1, 1, "Comm1 didn't receive a message from comm2 in a timely manner")
671671

672672
comm1.Stop()
673-
comm1, _ = newCommInstance(3611, naiveSec)
673+
comm1, _ = newCommInstance(43611, naiveSec)
674674
time.Sleep(time.Second)
675675
out1 = make(chan uint64, 1)
676676
go reader(out1, comm1.Accept(acceptAll))
677-
comm2.Send(createGossipMsg(), remotePeer(3611))
677+
comm2.Send(createGossipMsg(), remotePeer(43611))
678678
waitForMessages(t, out1, 1, "Comm1 didn't receive a message from comm2 in a timely manner")
679679
}
680680

@@ -721,14 +721,14 @@ func TestProbe(t *testing.T) {
721721

722722
func TestPresumedDead(t *testing.T) {
723723
t.Parallel()
724-
comm1, _ := newCommInstance(4611, naiveSec)
725-
comm2, _ := newCommInstance(4612, naiveSec)
724+
comm1, _ := newCommInstance(44611, naiveSec)
725+
comm2, _ := newCommInstance(44612, naiveSec)
726726

727727
wg := sync.WaitGroup{}
728728
wg.Add(1)
729729
go func() {
730730
wg.Wait()
731-
comm1.Send(createGossipMsg(), remotePeer(4612))
731+
comm1.Send(createGossipMsg(), remotePeer(44612))
732732
}()
733733

734734
ticker := time.NewTicker(time.Duration(10) * time.Second)
@@ -744,7 +744,7 @@ func TestPresumedDead(t *testing.T) {
744744
comm2.Stop()
745745
go func() {
746746
for i := 0; i < 5; i++ {
747-
comm1.Send(createGossipMsg(), remotePeer(4612))
747+
comm1.Send(createGossipMsg(), remotePeer(44612))
748748
time.Sleep(time.Millisecond * 200)
749749
}
750750
}()

‎gossip/comm/crypto_test.go

+2-2
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ func createTestServer(t *testing.T, cert *tls.Certificate) *gossipTestServer {
4141
InsecureSkipVerify: true,
4242
}
4343
s := grpc.NewServer(grpc.Creds(credentials.NewTLS(tlsConf)))
44-
ll, err := net.Listen("tcp", fmt.Sprintf("%s:%d", "", 5611))
44+
ll, err := net.Listen("tcp", fmt.Sprintf("%s:%d", "", 2030))
4545
assert.NoError(t, err, "%v", err)
4646

4747
srv := &gossipTestServer{s: s, ll: ll, selfCertHash: certHashFromRawCert(cert.Certificate[0])}
@@ -85,7 +85,7 @@ func TestCertificateExtraction(t *testing.T) {
8585
})
8686
ctx := context.Background()
8787
ctx, _ = context.WithTimeout(ctx, time.Second)
88-
conn, err := grpc.DialContext(ctx, "localhost:5611", grpc.WithTransportCredentials(ta), grpc.WithBlock())
88+
conn, err := grpc.DialContext(ctx, "localhost:2030", grpc.WithTransportCredentials(ta), grpc.WithBlock())
8989
assert.NoError(t, err, "%v", err)
9090

9191
cl := proto.NewGossipClient(conn)

‎gossip/discovery/discovery_test.go

+10-10
Original file line numberDiff line numberDiff line change
@@ -419,7 +419,7 @@ func TestConnect(t *testing.T) {
419419
instances := []*gossipInstance{}
420420
firstSentMemReqMsgs := make(chan *proto.SignedGossipMessage, nodeNum)
421421
for i := 0; i < nodeNum; i++ {
422-
inst := createDiscoveryInstance(7611+i, fmt.Sprintf("d%d", i), []string{})
422+
inst := createDiscoveryInstance(17611+i, fmt.Sprintf("d%d", i), []string{})
423423

424424
inst.comm.lock.Lock()
425425
inst.comm.mock = &mock.Mock{}
@@ -439,7 +439,7 @@ func TestConnect(t *testing.T) {
439439

440440
instances = append(instances, inst)
441441
j := (i + 1) % 10
442-
endpoint := fmt.Sprintf("localhost:%d", 7611+j)
442+
endpoint := fmt.Sprintf("localhost:%d", 17611+j)
443443
netMember2Connect2 := NetworkMember{Endpoint: endpoint, PKIid: []byte(endpoint)}
444444
inst.Connect(netMember2Connect2, func() (identification *PeerIdentification, err error) {
445445
return &PeerIdentification{SelfOrg: false, ID: nil}, nil
@@ -471,18 +471,18 @@ func TestConnect(t *testing.T) {
471471
func TestUpdate(t *testing.T) {
472472
t.Parallel()
473473
nodeNum := 5
474-
bootPeers := []string{bootPeer(6611), bootPeer(6612)}
474+
bootPeers := []string{bootPeer(16611), bootPeer(16612)}
475475
instances := []*gossipInstance{}
476476

477-
inst := createDiscoveryInstance(6611, "d1", bootPeers)
477+
inst := createDiscoveryInstance(16611, "d1", bootPeers)
478478
instances = append(instances, inst)
479479

480-
inst = createDiscoveryInstance(6612, "d2", bootPeers)
480+
inst = createDiscoveryInstance(16612, "d2", bootPeers)
481481
instances = append(instances, inst)
482482

483483
for i := 3; i <= nodeNum; i++ {
484484
id := fmt.Sprintf("d%d", i)
485-
inst = createDiscoveryInstance(6610+i, id, bootPeers)
485+
inst = createDiscoveryInstance(16610+i, id, bootPeers)
486486
instances = append(instances, inst)
487487
}
488488

@@ -493,7 +493,7 @@ func TestUpdate(t *testing.T) {
493493
waitUntilOrFail(t, fullMembership)
494494

495495
instances[0].UpdateMetadata([]byte("bla bla"))
496-
instances[nodeNum-1].UpdateEndpoint("localhost:5511")
496+
instances[nodeNum-1].UpdateEndpoint("localhost:15511")
497497

498498
checkMembership := func() bool {
499499
for _, member := range instances[nodeNum-1].GetMembership() {
@@ -506,7 +506,7 @@ func TestUpdate(t *testing.T) {
506506

507507
for _, member := range instances[0].GetMembership() {
508508
if string(member.PKIid) == instances[nodeNum-1].comm.id {
509-
if "localhost:5511" != string(member.Endpoint) {
509+
if "localhost:15511" != string(member.Endpoint) {
510510
return false
511511
}
512512
}
@@ -629,14 +629,14 @@ func TestGetFullMembership(t *testing.T) {
629629

630630
func TestGossipDiscoveryStopping(t *testing.T) {
631631
t.Parallel()
632-
inst := createDiscoveryInstance(9611, "d1", []string{bootPeer(9611)})
632+
inst := createDiscoveryInstance(19611, "d1", []string{bootPeer(19611)})
633633
time.Sleep(time.Second)
634634
waitUntilOrFailBlocking(t, inst.Stop)
635635
}
636636

637637
func TestGossipDiscoverySkipConnectingToLocalhostBootstrap(t *testing.T) {
638638
t.Parallel()
639-
inst := createDiscoveryInstance(11611, "d1", []string{"localhost:11611", "127.0.0.1:11611"})
639+
inst := createDiscoveryInstance(11711, "d1", []string{"localhost:11711", "127.0.0.1:11711"})
640640
inst.comm.lock.Lock()
641641
inst.comm.mock = &mock.Mock{}
642642
inst.comm.mock.On("SendToPeer", mock.Anything, mock.Anything).Run(func(mock.Arguments) {

0 commit comments

Comments
 (0)