Skip to content

Fix sync fails on speicfic situation #418

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

Merged
merged 1 commit into from
Jul 18, 2025
Merged

Fix sync fails on speicfic situation #418

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
1 change: 1 addition & 0 deletions config/types.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -93,6 +93,7 @@ type P2PConfig struct {
InternalZones []string `mapstructure:"internalzones" description:"List of address ranges that are recognised as inner zone of agent. defined by CIDR notation."`
Agent string `mapstructure:"agent" description:"Peer id of agent that delegates this producer, only available when local peer is producer"`
AllowLegacy bool `mapstructure:"allowlegacy" description:"Whether to allow legacy security protocols"`
MsgBufSize int `mapstructure:"msgbufsize" description:"Size of message buffer for each peer"`
}

// AuthConfig defines configuration for auditing
Expand Down
1 change: 1 addition & 0 deletions p2p/p2pcommon/peermanager.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,4 +44,5 @@ type PeerManager interface {
AddDesignatedPeer(meta PeerMeta)
RemoveDesignatedPeer(peerID types.PeerID)
ListDesignatedPeers() []PeerMeta
MsgBufSize() int
}
12 changes: 11 additions & 1 deletion p2p/peermanager.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -75,7 +75,8 @@ type peerManager struct {
designatedPeers map[types.PeerID]p2pcommon.PeerMeta
hiddenPeerSet map[types.PeerID]bool

logger *log.Logger
msgBufSize int
logger *log.Logger
}

// getPeerTask is struct to get peer for concurrent use
Expand All @@ -90,6 +91,10 @@ var _ p2pcommon.PeerManager = (*peerManager)(nil)
func NewPeerManager(is p2pcommon.InternalService, hsFactory p2pcommon.HSHandlerFactory, actor p2pcommon.ActorService, pf p2pcommon.PeerFactory, nt p2pcommon.NetworkTransport, mm metric.MetricsManager, lm p2pcommon.ListManager, logger *log.Logger, cfg *cfg.Config, skipHandshakeSync bool) p2pcommon.PeerManager {
p2pConf := cfg.P2P
//logger.SetLevel("debug")
msgBufSize := p2pConf.MsgBufSize
if msgBufSize < writeMsgBufferSize {
msgBufSize = writeMsgBufferSize
}
pm := &peerManager{
is: is,
nt: nt,
Expand Down Expand Up @@ -125,6 +130,7 @@ func NewPeerManager(is p2pcommon.InternalService, hsFactory p2pcommon.HSHandlerF
eventListeners: make([]p2pcommon.PeerEventListener, 0, 4),
taskChannel: make(chan pmTask, 4),
finishChannel: make(chan struct{}),
msgBufSize: msgBufSize,
}

// additional initializations
Expand Down Expand Up @@ -471,6 +477,10 @@ func (pm *peerManager) GetPeerBlockInfos() []types.PeerBlockInfo {
return infos
}

func (pm *peerManager) MsgBufSize() int {
return pm.msgBufSize
}

func (pm *peerManager) GetPeerAddresses(noHidden bool, showSelf bool) []*message.PeerInfo {
peers := make([]*message.PeerInfo, 0, len(pm.peerCache))
if showSelf {
Expand Down
2 changes: 1 addition & 1 deletion p2p/remotepeer.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -108,7 +108,7 @@ func newRemotePeer(remote p2pcommon.RemoteInfo, manageNum uint32, pm p2pcommon.P
maxTxNoticeHashSize: DefaultPeerTxQueueSize,
taskChannel: make(chan p2pcommon.PeerTask, 1),
}
rPeer.writeBuf = make(chan p2pcommon.MsgOrder, writeMsgBufferSize)
rPeer.writeBuf = make(chan p2pcommon.MsgOrder, pm.MsgBufSize())
rPeer.writeDirect = make(chan p2pcommon.MsgOrder)

var err error
Expand Down
Loading