Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

diagnostics: refactor network peers mutex #11178

Merged
merged 3 commits into from
Jul 16, 2024
Merged

diagnostics: refactor network peers mutex #11178

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
f1379d6
refactor
dvovk Jul 15, 2024
9bc04b0
fix
dvovk Jul 16, 2024
2a11fd3
fix
dvovk Jul 16, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
38 changes: 25 additions & 13 deletions erigon-lib/diagnostics/network.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,6 +43,13 @@ func NewPeerStats(peerLimit int) *PeerStats {
}

func (p *PeerStats) AddOrUpdatePeer(peerID string, peerInfo PeerStatisticMsgUpdate) {
p.mu.Lock()
defer p.mu.Unlock()

p.addOrUpdatePeer(peerID, peerInfo)
}

func (p *PeerStats) addOrUpdatePeer(peerID string, peerInfo PeerStatisticMsgUpdate) {
if value, ok := p.peersInfo.Load(peerID); ok {
p.updatePeer(peerID, peerInfo, value)
} else {
Expand All @@ -61,7 +68,7 @@ func (p *PeerStats) AddPeer(peerID string, peerInfo PeerStatisticMsgUpdate) {
}

func (p *PeerStats) addPeer(peerID string, peerInfo PeerStatisticMsgUpdate) {
pv := PeerStatisticsFromMsgUpdate(peerInfo, nil)
pv := peerStatisticsFromMsgUpdate(peerInfo, nil)
p.peersInfo.Store(peerID, pv)
p.recordsCount++
p.lastUpdateMap[peerID] = time.Now()
Expand All @@ -74,13 +81,17 @@ func (p *PeerStats) UpdatePeer(peerID string, peerInfo PeerStatisticMsgUpdate, p
}

func (p *PeerStats) updatePeer(peerID string, peerInfo PeerStatisticMsgUpdate, prevValue any) {
pv := PeerStatisticsFromMsgUpdate(peerInfo, prevValue)
pv := peerStatisticsFromMsgUpdate(peerInfo, prevValue)

p.peersInfo.Store(peerID, pv)
p.lastUpdateMap[peerID] = time.Now()
}

func PeerStatisticsFromMsgUpdate(msg PeerStatisticMsgUpdate, prevValue any) PeerStatistics {
return peerStatisticsFromMsgUpdate(msg, prevValue)
}

func peerStatisticsFromMsgUpdate(msg PeerStatisticMsgUpdate, prevValue any) PeerStatistics {
ps := PeerStatistics{
PeerType: msg.PeerType,
BytesIn: 0,
Expand Down Expand Up @@ -131,6 +142,10 @@ func (p *PeerStats) GetPeers() map[string]PeerStatistics {
p.mu.Lock()
defer p.mu.Unlock()

return p.getPeers()
}

func (p *PeerStats) getPeers() map[string]PeerStatistics {
stats := make(map[string]PeerStatistics)
p.peersInfo.Range(func(key, value interface{}) bool {
loadedKey, ok := key.(string)
Expand All @@ -156,6 +171,10 @@ func (p *PeerStats) GetPeerStatistics(peerID string) PeerStatistics {
p.mu.Lock()
defer p.mu.Unlock()

return p.getPeerStatistics(peerID)
}

func (p *PeerStats) getPeerStatistics(peerID string) PeerStatistics {
if value, ok := p.peersInfo.Load(peerID); ok {
if peerStats, ok := value.(PeerStatistics); ok {
return peerStats.Clone()
Expand All @@ -165,21 +184,14 @@ func (p *PeerStats) GetPeerStatistics(peerID string) PeerStatistics {
return PeerStatistics{}
}

func (p *PeerStats) GetLastUpdate(peerID string) time.Time {
func (p *PeerStats) RemovePeer(peerID string) {
p.mu.Lock()
defer p.mu.Unlock()

if lastUpdate, ok := p.lastUpdateMap[peerID]; ok {
return lastUpdate
}

return time.Time{}
p.removePeer(peerID)
}

func (p *PeerStats) RemovePeer(peerID string) {
p.mu.Lock()
defer p.mu.Unlock()

func (p *PeerStats) removePeer(peerID string) {
p.peersInfo.Delete(peerID)
p.recordsCount--
delete(p.lastUpdateMap, peerID)
Expand Down Expand Up @@ -224,7 +236,7 @@ func (p *PeerStats) removePeersWhichExceedLimit(limit int) {
if peersToRemove > 0 {
peers := p.getOldestUpdatedPeersWithSize(peersToRemove)
for _, peer := range peers {
p.RemovePeer(peer.PeerID)
p.removePeer(peer.PeerID)
}
}
}
Expand Down
49 changes: 18 additions & 31 deletions erigon-lib/diagnostics/network_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,6 @@ package diagnostics_test
import (
"strconv"
"testing"
"time"

"github.com/ledgerwatch/erigon-lib/diagnostics"
"github.com/stretchr/testify/require"
Expand Down Expand Up @@ -162,36 +161,6 @@ func TestGetPeers(t *testing.T) {
require.True(t, peers["test1"].Equal(mockInboundPeerStats))
}

func TestLastUpdated(t *testing.T) {
peerStats := diagnostics.NewPeerStats(1000)

peerStats.AddOrUpdatePeer("test1", mockInboundUpdMsg)
require.NotEmpty(t, peerStats.GetLastUpdate("test1"))

for i := 1; i < 20; i++ {
pid := "test" + strconv.Itoa(i)
peerStats.AddOrUpdatePeer(pid, mockInboundUpdMsg)
//wait for 1 milisecond to make sure that the last update time is different
time.Sleep(10 * time.Millisecond)
}

require.True(t, peerStats.GetLastUpdate("test2").After(peerStats.GetLastUpdate("test1")))

oldestPeers := peerStats.GetOldestUpdatedPeersWithSize(10)

// we have 100 peers, but we should get only 10 oldest
require.Equal(t, len(oldestPeers), 10)
// the oldest peer should be test1
require.Equal(t, "test1", oldestPeers[0].PeerID)

// update test1 to
peerStats.AddOrUpdatePeer("test1", mockInboundUpdMsg)
oldestPeers = peerStats.GetOldestUpdatedPeersWithSize(10)

// the oldest peer should not be test1
require.NotEqual(t, "test1", oldestPeers[0].PeerID)
}

func TestRemovePeersWhichExceedLimit(t *testing.T) {
limit := 100
peerStats := diagnostics.NewPeerStats(limit)
Expand All @@ -212,6 +181,24 @@ func TestRemovePeersWhichExceedLimit(t *testing.T) {
require.Equal(t, 100, peerStats.GetPeersCount())
}

func TestRemovePeer(t *testing.T) {
limit := 10
peerStats := diagnostics.NewPeerStats(limit)

for i := 1; i < 11; i++ {
pid := "test" + strconv.Itoa(i)
peerStats.AddOrUpdatePeer(pid, mockInboundUpdMsg)
}
require.Equal(t, 10, peerStats.GetPeersCount())

peerStats.RemovePeer("test1")

require.Equal(t, limit-1, peerStats.GetPeersCount())

firstPeerStats := peerStats.GetPeerStatistics("test1")
require.True(t, firstPeerStats.Equal(diagnostics.PeerStatistics{}))
}

func TestAddingPeersAboveTheLimit(t *testing.T) {
limit := 100
peerStats := diagnostics.NewPeerStats(limit)
Expand Down
Loading