Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
M
mybee
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
vicotor
mybee
Commits
dd605e23
Unverified
Commit
dd605e23
authored
May 22, 2021
by
Janoš Guljaš
Committed by
GitHub
May 22, 2021
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
perf(kademlia): optimize wait next map keys (#1817)
parent
48f0a205
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
10 additions
and
10 deletions
+10
-10
kademlia.go
pkg/topology/kademlia/kademlia.go
+10
-10
No files found.
pkg/topology/kademlia/kademlia.go
View file @
dd605e23
...
...
@@ -239,7 +239,7 @@ func (k *Kad) connectBalanced(wg *sync.WaitGroup, peerConnChan chan<- *peerConnI
skipPeers
:=
func
(
peer
swarm
.
Address
)
bool
{
k
.
waitNextMu
.
Lock
()
defer
k
.
waitNextMu
.
Unlock
()
next
,
ok
:=
k
.
waitNext
[
peer
.
String
()]
next
,
ok
:=
k
.
waitNext
[
peer
.
Byte
String
()]
return
ok
&&
time
.
Now
()
.
Before
(
next
.
tryAfter
)
}
...
...
@@ -306,7 +306,7 @@ func (k *Kad) connectNeighbours(wg *sync.WaitGroup, peerConnChan chan<- *peerCon
}
k
.
waitNextMu
.
Lock
()
if
next
,
ok
:=
k
.
waitNext
[
addr
.
String
()];
ok
&&
time
.
Now
()
.
Before
(
next
.
tryAfter
)
{
if
next
,
ok
:=
k
.
waitNext
[
addr
.
Byte
String
()];
ok
&&
time
.
Now
()
.
Before
(
next
.
tryAfter
)
{
k
.
waitNextMu
.
Unlock
()
return
false
,
false
,
nil
}
...
...
@@ -351,7 +351,7 @@ func (k *Kad) connectionAttemptsHandler(ctx context.Context, wg *sync.WaitGroup,
remove
:=
func
(
peer
*
peerConnInfo
)
{
k
.
waitNextMu
.
Lock
()
delete
(
k
.
waitNext
,
peer
.
addr
.
String
())
delete
(
k
.
waitNext
,
peer
.
addr
.
Byte
String
())
k
.
waitNextMu
.
Unlock
()
k
.
knownPeers
.
Remove
(
peer
.
addr
,
peer
.
po
)
if
err
:=
k
.
addressBook
.
Remove
(
peer
.
addr
);
err
!=
nil
{
...
...
@@ -375,7 +375,7 @@ func (k *Kad) connectionAttemptsHandler(ctx context.Context, wg *sync.WaitGroup,
}
k
.
waitNextMu
.
Lock
()
k
.
waitNext
[
peer
.
addr
.
String
()]
=
retryInfo
{
tryAfter
:
time
.
Now
()
.
Add
(
shortRetry
)}
k
.
waitNext
[
peer
.
addr
.
Byte
String
()]
=
retryInfo
{
tryAfter
:
time
.
Now
()
.
Add
(
shortRetry
)}
k
.
waitNextMu
.
Unlock
()
k
.
connectedPeers
.
Add
(
peer
.
addr
,
peer
.
po
)
...
...
@@ -413,7 +413,7 @@ func (k *Kad) connectionAttemptsHandler(ctx context.Context, wg *sync.WaitGroup,
// Check if the peer was penalized.
k
.
waitNextMu
.
Lock
()
next
,
ok
:=
k
.
waitNext
[
addr
]
next
,
ok
:=
k
.
waitNext
[
peer
.
addr
.
ByteString
()
]
if
ok
&&
time
.
Now
()
.
Before
(
next
.
tryAfter
)
{
k
.
waitNextMu
.
Unlock
()
wg
.
Done
()
...
...
@@ -681,7 +681,7 @@ func (k *Kad) connect(ctx context.Context, peer swarm.Address, ma ma.Multiaddr)
if
errors
.
As
(
err
,
&
e
)
{
retryTime
=
e
.
TryAfter
()
}
else
{
if
info
,
ok
:=
k
.
waitNext
[
peer
.
String
()];
ok
{
if
info
,
ok
:=
k
.
waitNext
[
peer
.
Byte
String
()];
ok
{
failedAttempts
=
info
.
failedAttempts
}
failedAttempts
++
...
...
@@ -694,13 +694,13 @@ func (k *Kad) connect(ctx context.Context, peer swarm.Address, ma ma.Multiaddr)
if
err
:=
k
.
collector
.
Inspect
(
peer
,
func
(
ss
*
metrics
.
Snapshot
)
{
quickPrune
:=
ss
==
nil
||
ss
.
HasAtMaxOneConnectionAttempt
()
if
(
k
.
connectedPeers
.
Length
()
>
0
&&
quickPrune
)
||
failedAttempts
>
maxConnAttempts
{
delete
(
k
.
waitNext
,
peer
.
String
())
delete
(
k
.
waitNext
,
peer
.
Byte
String
())
if
err
:=
k
.
addressBook
.
Remove
(
peer
);
err
!=
nil
{
k
.
logger
.
Debugf
(
"could not remove peer from addressbook: %q"
,
peer
)
}
k
.
logger
.
Debugf
(
"kademlia pruned peer from address book %q"
,
peer
)
}
else
{
k
.
waitNext
[
peer
.
String
()]
=
retryInfo
{
k
.
waitNext
[
peer
.
Byte
String
()]
=
retryInfo
{
tryAfter
:
retryTime
,
failedAttempts
:
failedAttempts
,
}
...
...
@@ -836,7 +836,7 @@ func (k *Kad) connected(ctx context.Context, addr swarm.Address) error {
}
k
.
waitNextMu
.
Lock
()
delete
(
k
.
waitNext
,
addr
.
String
())
delete
(
k
.
waitNext
,
addr
.
Byte
String
())
k
.
waitNextMu
.
Unlock
()
k
.
depthMu
.
Lock
()
...
...
@@ -857,7 +857,7 @@ func (k *Kad) Disconnected(peer p2p.Peer) {
k
.
connectedPeers
.
Remove
(
peer
.
Address
,
po
)
k
.
waitNextMu
.
Lock
()
k
.
waitNext
[
peer
.
Address
.
String
()]
=
retryInfo
{
tryAfter
:
time
.
Now
()
.
Add
(
timeToRetry
),
failedAttempts
:
0
}
k
.
waitNext
[
peer
.
Address
.
Byte
String
()]
=
retryInfo
{
tryAfter
:
time
.
Now
()
.
Add
(
timeToRetry
),
failedAttempts
:
0
}
k
.
waitNextMu
.
Unlock
()
if
err
:=
k
.
collector
.
Record
(
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment