Skip to content
GitLab
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Sign in
Toggle navigation
Menu
Open sidebar
parity
Mirrored projects
polkadot
Commits
a888f0cc
Unverified
Commit
a888f0cc
authored
Mar 27, 2021
by
asynchronous rob
Committed by
GitHub
Mar 27, 2021
Browse files
duplicate logging fix (#2729)
* duplicate logging fix * remove duplicate peer IDs
parent
a218a1fe
Pipeline
#130939
failed with stages
in 27 minutes and 39 seconds
Changes
1
Pipelines
1
Hide whitespace changes
Inline
Side-by-side
node/network/approval-distribution/src/lib.rs
View file @
a888f0cc
...
@@ -412,7 +412,7 @@ impl State {
...
@@ -412,7 +412,7 @@ impl State {
if
let
Some
(
peer_id
)
=
source
.peer_id
()
{
if
let
Some
(
peer_id
)
=
source
.peer_id
()
{
tracing
::
debug!
(
tracing
::
debug!
(
target
:
LOG_TARGET
,
target
:
LOG_TARGET
,
?
source
,
?
peer_id
,
?
block_hash
,
?
block_hash
,
?
validator_index
,
?
validator_index
,
"Unexpected assignment"
,
"Unexpected assignment"
,
...
@@ -437,7 +437,7 @@ impl State {
...
@@ -437,7 +437,7 @@ impl State {
if
knowledge
.get
()
.known_messages
.contains
(
&
fingerprint
)
{
if
knowledge
.get
()
.known_messages
.contains
(
&
fingerprint
)
{
tracing
::
debug!
(
tracing
::
debug!
(
target
:
LOG_TARGET
,
target
:
LOG_TARGET
,
?
source
,
?
peer_id
,
?
fingerprint
,
?
fingerprint
,
"Duplicate assignment"
,
"Duplicate assignment"
,
);
);
...
@@ -448,7 +448,7 @@ impl State {
...
@@ -448,7 +448,7 @@ impl State {
hash_map
::
Entry
::
Vacant
(
_
)
=>
{
hash_map
::
Entry
::
Vacant
(
_
)
=>
{
tracing
::
debug!
(
tracing
::
debug!
(
target
:
LOG_TARGET
,
target
:
LOG_TARGET
,
?
source
,
?
peer_id
,
?
fingerprint
,
?
fingerprint
,
"Assignment from a peer is out of view"
,
"Assignment from a peer is out of view"
,
);
);
...
@@ -462,7 +462,7 @@ impl State {
...
@@ -462,7 +462,7 @@ impl State {
if
let
Some
(
peer_knowledge
)
=
entry
.known_by
.get_mut
(
&
peer_id
)
{
if
let
Some
(
peer_knowledge
)
=
entry
.known_by
.get_mut
(
&
peer_id
)
{
tracing
::
trace!
(
tracing
::
trace!
(
target
:
LOG_TARGET
,
target
:
LOG_TARGET
,
?
source
,
?
peer_id
,
?
fingerprint
,
?
fingerprint
,
"Known assignment"
,
"Known assignment"
,
);
);
...
@@ -628,7 +628,6 @@ impl State {
...
@@ -628,7 +628,6 @@ impl State {
if
!
entry
.knowledge.known_messages
.contains
(
&
assignment_fingerprint
)
{
if
!
entry
.knowledge.known_messages
.contains
(
&
assignment_fingerprint
)
{
tracing
::
debug!
(
tracing
::
debug!
(
target
:
LOG_TARGET
,
target
:
LOG_TARGET
,
?
source
,
?
peer_id
,
?
peer_id
,
?
fingerprint
,
?
fingerprint
,
"Unknown approval assignment"
,
"Unknown approval assignment"
,
...
@@ -640,14 +639,14 @@ impl State {
...
@@ -640,14 +639,14 @@ impl State {
// check if our knowledge of the peer already contains this approval
// check if our knowledge of the peer already contains this approval
match
entry
.known_by
.entry
(
peer_id
.clone
())
{
match
entry
.known_by
.entry
(
peer_id
.clone
())
{
hash_map
::
Entry
::
Occupied
(
knowledge
)
=>
{
hash_map
::
Entry
::
Occupied
(
knowledge
)
=>
{
tracing
::
debug!
(
target
:
LOG_TARGET
,
?
source
,
?
peer_id
,
?
fingerprint
,
"Duplicate approval"
,
);
if
knowledge
.get
()
.known_messages
.contains
(
&
fingerprint
)
{
if
knowledge
.get
()
.known_messages
.contains
(
&
fingerprint
)
{
tracing
::
debug!
(
target
:
LOG_TARGET
,
?
peer_id
,
?
fingerprint
,
"Duplicate approval"
,
);
modify_reputation
(
ctx
,
peer_id
,
COST_DUPLICATE_MESSAGE
)
.await
;
modify_reputation
(
ctx
,
peer_id
,
COST_DUPLICATE_MESSAGE
)
.await
;
return
;
return
;
}
}
...
@@ -655,7 +654,6 @@ impl State {
...
@@ -655,7 +654,6 @@ impl State {
hash_map
::
Entry
::
Vacant
(
_
)
=>
{
hash_map
::
Entry
::
Vacant
(
_
)
=>
{
tracing
::
debug!
(
tracing
::
debug!
(
target
:
LOG_TARGET
,
target
:
LOG_TARGET
,
?
source
,
?
peer_id
,
?
peer_id
,
?
fingerprint
,
?
fingerprint
,
"Approval from a peer is out of view"
,
"Approval from a peer is out of view"
,
...
@@ -668,7 +666,6 @@ impl State {
...
@@ -668,7 +666,6 @@ impl State {
if
entry
.knowledge.known_messages
.contains
(
&
fingerprint
)
{
if
entry
.knowledge.known_messages
.contains
(
&
fingerprint
)
{
tracing
::
trace!
(
tracing
::
trace!
(
target
:
LOG_TARGET
,
target
:
LOG_TARGET
,
?
source
,
?
peer_id
,
?
peer_id
,
?
fingerprint
,
?
fingerprint
,
"Known approval"
,
"Known approval"
,
...
@@ -700,7 +697,6 @@ impl State {
...
@@ -700,7 +697,6 @@ impl State {
tracing
::
trace!
(
tracing
::
trace!
(
target
:
LOG_TARGET
,
target
:
LOG_TARGET
,
?
source
,
?
peer_id
,
?
peer_id
,
?
fingerprint
,
?
fingerprint
,
?
result
,
?
result
,
...
...
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new 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