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
0503716f
Unverified
Commit
0503716f
authored
Jun 16, 2021
by
Peter Mrekaj
Committed by
GitHub
Jun 16, 2021
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
refactor(kademlia): add peers at start asynchronously (#2082)
parent
b68d0418
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
29 additions
and
7 deletions
+29
-7
kademlia.go
pkg/topology/kademlia/kademlia.go
+18
-6
kademlia_test.go
pkg/topology/kademlia/kademlia_test.go
+2
-0
metrics.go
pkg/topology/kademlia/metrics.go
+9
-1
No files found.
pkg/topology/kademlia/kademlia.go
View file @
0503716f
...
...
@@ -9,7 +9,6 @@ import (
random
"crypto/rand"
"encoding/json"
"errors"
"fmt"
"math"
"math/big"
"math/bits"
...
...
@@ -570,12 +569,25 @@ func (k *Kad) Start(_ context.Context) error {
k
.
wg
.
Add
(
1
)
go
k
.
manage
()
addresses
,
err
:=
k
.
addressBook
.
Overlays
()
if
err
!=
nil
{
return
fmt
.
Errorf
(
"addressbook overlays: %w"
,
err
)
}
go
func
()
{
select
{
case
<-
k
.
halt
:
return
case
<-
k
.
quit
:
return
default
:
}
start
:=
time
.
Now
()
addresses
,
err
:=
k
.
addressBook
.
Overlays
()
if
err
!=
nil
{
k
.
logger
.
Errorf
(
"addressbook overlays: %w"
,
err
)
return
}
k
.
AddPeers
(
addresses
...
)
k
.
metrics
.
StartAddAddressBookOverlaysTime
.
Observe
(
float64
(
time
.
Since
(
start
)
.
Nanoseconds
()))
}()
k
.
AddPeers
(
addresses
...
)
return
nil
}
...
...
pkg/topology/kademlia/kademlia_test.go
View file @
0503716f
...
...
@@ -807,6 +807,8 @@ func TestAddressBookQuickPrune(t *testing.T) {
}
defer
kad
.
Close
()
time
.
Sleep
(
100
*
time
.
Millisecond
)
nonConnPeer
,
err
:=
bzz
.
NewAddress
(
signer
,
nonConnectableAddress
,
test
.
RandomAddressAt
(
base
,
1
),
0
)
if
err
!=
nil
{
t
.
Fatal
(
err
)
...
...
pkg/topology/kademlia/metrics.go
View file @
0503716f
...
...
@@ -26,6 +26,7 @@ type metrics struct {
TotalOutboundConnectionAttempts
prometheus
.
Counter
TotalOutboundConnectionFailedAttempts
prometheus
.
Counter
TotalBootNodesConnectionAttempts
prometheus
.
Counter
StartAddAddressBookOverlaysTime
prometheus
.
Histogram
}
// newMetrics is a convenient constructor for creating new metrics.
...
...
@@ -122,7 +123,14 @@ func newMetrics() metrics {
Subsystem
:
subsystem
,
Name
:
"total_bootnodes_connection_attempts"
,
Help
:
"Total boot-nodes connection attempts made."
,
})}
}),
StartAddAddressBookOverlaysTime
:
prometheus
.
NewHistogram
(
prometheus
.
HistogramOpts
{
Namespace
:
m
.
Namespace
,
Subsystem
:
subsystem
,
Name
:
"start_add_addressbook_overlays_time"
,
Help
:
"The time spent adding overlays peers from addressbook on kademlia start."
,
}),
}
}
// Metrics returns set of prometheus collectors.
...
...
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