introduce peer manager #31

Liuhaai · 2022-04-23T00:13:33Z

Description

The new component peerManager is introduced for peer discovering, peer connecting, and peer managing. In the peerManager, the Rendezvous protocol is used for peer discovery, which replaces the old Neighbors method
To interact with peerManager externally, the methods Advertise, FindPeers, BlockPeer, AddBootstrap and ConnectedPeers are added in Host class.
Code clean work for NewHost func

peerManager.go

p2p.go

dustinxie · 2022-04-26T17:37:12Z

peerManager.go

+			continue
+		}
+		if err := ma.host.Connect(ctx, peer); err != nil {
+			return err


we should count the new connection success / total, instead of return err on a single connection? something like

newConn = len(peerChan) - len(ma.host.Network().Conns()) for { if err := ma.host.Connect(ctx, peer); err == nil { success++ } } if success < newConn * 2/3 { return err }

p2p.go

peerManager.go

dustinxie · 2022-05-20T20:29:52Z

p2p.go

@@ -66,6 +65,8 @@ type (
 		EnableRateLimit          bool            `yaml:"enableRateLimit"`
 		RateLimit                RateLimitConfig `yaml:"rateLimit"`
 		PrivateNetworkPSK        string          `yaml:"privateNetworkPSK"`
+		GroupID                  string          `yaml:"groupID"`
+		ServerMode               bool            `yaml:"serverMode"`


remove ServerMode? we discussed it needs to be server mode, so no need to change regarding this

add a blacklist timeout value, see comment below

dustinxie · 2022-05-20T20:31:44Z

p2p.go

+		return nil
+	}
+}
+


dustinxie · 2022-05-20T20:32:45Z

p2p.go

+		dhtOpt = append(dhtOpt, dht.Mode(dht.ModeServer))
+	} else {
+		dhtOpt = append(dhtOpt, dht.Mode(dht.ModeClient))
+	}


p2p.go

dustinxie · 2022-05-23T18:45:06Z

p2p.go

+}
+
+// AddBootstrap adds bootnode into peermanager
+func (h *Host) AddBootstrap(bootNodeAddrs []multiaddr.Multiaddr) error {


remove this func? it is not used

dustinxie · 2022-05-23T18:45:19Z

peerManager.go

+	return err
+}
+
+func (ma *peerManager) AddBootstrap(ids ...core.PeerID) {


remove this func? it is not used

dustinxie · 2022-05-24T21:28:58Z

peerManager.go

@@ -157,6 +157,11 @@ func (ma *peerManager) BlockPeer(pr peer.ID) {
 	}
 }

+func (ma *peerManager) BlockPeer(pr peer.ID) {


nit: call this RemovePeer?

Liuhaai · 2022-06-23T18:43:10Z

peerManager.go

+		routing:           routing,
+		ns:                ns,
+		bootstrap:         make(map[peer.ID]bool),
+		advertiseInterval: 3 * time.Hour, // DHT provider record is republished every 3hrs by default


The group id will expire in 24 hrs. So it's advertised forcely every 3 hrs.

p2p.go

peerManager.go

dustinxie · 2022-06-23T19:47:36Z

peerManager.go

+	return pm
+}
+
+func (pm *peerManager) JoinOverlay() {


i think the go-routine only needs to be triggered once? but not start a new go-routine every time this is called?

type peerManager struct { advertise sync.Once } func (pm *peerManager) JoinOverlay( pm.advertise.Do(func() { for { select ... } }) )

Good suggestion

dustinxie · 2022-06-23T19:49:24Z

peerManager.go

+	}(pm)
+}
+
+func (pm *peerManager) Advertise() error {


also we don't need this? in JoinOverlay(), ticker.C will fire every 3 hours to keep advertising itself, right? maybe we can reduce to interval to like 30 min

this is the func triggerred externally

dustinxie · 2022-06-23T19:51:06Z

peerManager.go

+	go func(pm *peerManager) {
+		for {
+			select {
+			case ns := <-pm.advertiseQueue:


also this is not needed? since it serves the same purpose as ticker.C

dustinxie · 2022-06-23T19:58:55Z

peerManager.go

+	return pm.host.Network().ClosePeer(pr)
+}
+
+func (pm *peerManager) TryBlockPeer(pr peer.ID) {


this name is not accurate

Any suggestion?

dustinxie · 2022-06-23T20:01:07Z

peerManager.go

+	pm.blacklist.Set(pr, val.(int)+1)
+	if val.(int)+1 >= pm.blacklistTolerance {
+		pm.host.Network().ClosePeer(pr)
+	}


if a peer has been set more than pm.blacklistTolerance times, then after that it will always go to this if, and keep calling ClosePeer(), is that intended? maybe should remove the peer after reaching pm.blacklistTolerance times (give him a chance to start over)?

The peer will be filtered out by blocked(), so the node can't get this peer by ConnectedPeers() . And the id will be removed from the map when BlacklistTimeout reaches.

dustinxie reviewed Apr 26, 2022

View reviewed changes

peerManager.go Outdated Show resolved Hide resolved

dustinxie reviewed Apr 26, 2022

View reviewed changes

p2p.go Outdated Show resolved Hide resolved

dustinxie reviewed Apr 26, 2022

View reviewed changes

p2p.go Show resolved Hide resolved

Liuhaai force-pushed the peerManager branch 3 times, most recently from d850ed1 to 047757e Compare May 3, 2022 06:30

Liuhaai force-pushed the peerManager branch from dc5a314 to 8b72e56 Compare May 19, 2022 23:19

Liuhaai marked this pull request as ready for review May 19, 2022 23:20

Liuhaai force-pushed the peerManager branch from 8b72e56 to 39bb625 Compare May 19, 2022 23:26

dustinxie reviewed May 20, 2022

View reviewed changes

peerManager.go Show resolved Hide resolved

dustinxie reviewed May 20, 2022

View reviewed changes

p2p.go Outdated

return nil

}

}

Copy link

Member

dustinxie May 20, 2022

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

remove

dustinxie reviewed May 20, 2022

View reviewed changes

p2p.go Outdated Show resolved Hide resolved

dustinxie reviewed May 20, 2022

View reviewed changes

p2p.go Outdated Show resolved Hide resolved

Liuhaai force-pushed the peerManager branch from a4bcafe to bbced4b Compare May 22, 2022 05:53

dustinxie reviewed May 23, 2022

View reviewed changes

peerManager.go Outdated

return err

}

func (ma *peerManager) AddBootstrap(ids ...core.PeerID) {

Copy link

Member

dustinxie May 23, 2022

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

remove this func? it is not used

dustinxie reviewed May 24, 2022

View reviewed changes

dustinxie approved these changes May 24, 2022

View reviewed changes

Liuhaai force-pushed the peerManager branch from ec54a7e to 12ec78b Compare June 21, 2022 22:55

introduce peer manager

64aeb43

Liuhaai commented Jun 23, 2022

View reviewed changes

Liuhaai force-pushed the peerManager branch from 12ec78b to 64aeb43 Compare June 23, 2022 18:58

dustinxie reviewed Jun 23, 2022

View reviewed changes

p2p.go Outdated Show resolved Hide resolved

dustinxie reviewed Jun 23, 2022

View reviewed changes

peerManager.go Outdated Show resolved Hide resolved

dustinxie reviewed Jun 23, 2022

View reviewed changes

Liuhaai and others added 2 commits June 24, 2022 15:07

fix comment

2aa2dd3

rename AddBlocklist to BlockPeer

acf2ca1

Liuhaai mentioned this pull request Jul 5, 2022

[p2p] Improve p2p iotexproject/iotex-core#3409

Merged

1 task

Liuhaai merged commit 5fe315f into master Jul 5, 2022

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

introduce peer manager #31

introduce peer manager #31

Liuhaai commented Apr 23, 2022 •

edited

Loading

dustinxie Apr 26, 2022

dustinxie May 20, 2022

dustinxie May 20, 2022

dustinxie May 20, 2022

dustinxie May 23, 2022

dustinxie May 23, 2022

dustinxie May 24, 2022 •

edited

Loading

Liuhaai Jun 23, 2022

dustinxie Jun 23, 2022

Liuhaai Jun 24, 2022

dustinxie Jun 23, 2022

Liuhaai Jun 24, 2022

dustinxie Jun 23, 2022

dustinxie Jun 23, 2022

Liuhaai Jun 24, 2022 •

edited

Loading

dustinxie Jun 23, 2022 •

edited

Loading

Liuhaai Jun 24, 2022

introduce peer manager #31

introduce peer manager #31

Conversation

Liuhaai commented Apr 23, 2022 • edited Loading

Description

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

dustinxie May 24, 2022 • edited Loading

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Liuhaai Jun 24, 2022 • edited Loading

Choose a reason for hiding this comment

dustinxie Jun 23, 2022 • edited Loading

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Liuhaai commented Apr 23, 2022 •

edited

Loading

dustinxie May 24, 2022 •

edited

Loading

Liuhaai Jun 24, 2022 •

edited

Loading

dustinxie Jun 23, 2022 •

edited

Loading