Skip to content
This repository was archived by the owner on Nov 15, 2023. It is now read-only.

Collator protocol subsystem #1659

Merged
montekki merged 20 commits into from
Sep 10, 2020
Merged

Collator protocol subsystem #1659

Changes from 1 commit
Commits
Show all changes
20 commits
Select commit Hold shift + click to select a range
a12b1ee
WIP
montekki Aug 20, 2020
b97ab57
Merge branch 'master' into fs-collator-protocol-subsystem
montekki Aug 21, 2020
b6c5c2c
The initial implementation of the collator side.
montekki Aug 30, 2020
a2255d6
Improve comments
montekki Aug 31, 2020
2e9d3c4
Merge branch 'master' into fs-collator-protocol-subsystem
montekki Aug 31, 2020
26ff153
Multiple collation requests
montekki Sep 3, 2020
00456c0
Add more tests and comments to validator side
montekki Sep 3, 2020
d463407
Add comments, remove dead code
montekki Sep 3, 2020
eda8d7e
Apply suggestions from code review
montekki Sep 7, 2020
0b6c572
Fix build after suggested changes
montekki Sep 8, 2020
b58d785
Also connect to the next validator group
montekki Sep 8, 2020
232db34
Remove a Future impl and move TimeoutExt to util
montekki Sep 8, 2020
bbd1c6a
Minor nits
montekki Sep 8, 2020
3ebad8a
Fix build
montekki Sep 8, 2020
a43e7a0
Merge branch 'master' into fs-collator-protocol-subsystem
montekki Sep 8, 2020
36745f6
Change FetchCollations back to FetchCollation
montekki Sep 9, 2020
bad21c9
Merge branch 'master' into fs-collator-protocol-subsystem
montekki Sep 9, 2020
b1c5c66
Try this
montekki Sep 9, 2020
0c48ed6
Final fixes
montekki Sep 10, 2020
3be73a1
Fix build
montekki Sep 10, 2020
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
Prev Previous commit
Next Next commit
Fix build after suggested changes
  • Loading branch information
@montekki
montekki committed Sep 8, 2020
commit 0b6c57256276b0fb4456f1b9773ef8b460e7561f
13 changes: 8 additions & 5 deletions node/network/collator-protocol/src/validator_side.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -456,10 +456,13 @@ async fn handle_our_view_change(
) -> Result<()> {
let old_view = std::mem::replace(&mut (state.view), view);

let removed = old_view.difference(&state.view).collect::<Vec<_>>();
let removed = old_view
.difference(&state.view)
.cloned()
.collect::<Vec<_>>();

for removed in removed {
remove_relay_parent(state, *removed).await?;
for removed in removed.into_iter() {
remove_relay_parent(state, removed).await?;
}

Ok(())
Expand All @@ -480,7 +483,7 @@ where
if let Some(request_info) = state.requests_info.remove(&id) {
let (relay_parent, para_id, peer_id) = key;

modify_reputation(ctx, peer_id.clone(), COST_REQUEST_TIMEDOUT).await?;
modify_reputation(ctx, peer_id.clone(), COST_REQUEST_TIMED_OUT).await?;

// the callee will check if the parent is still in view, so do no checks here.
request_collation(
Copy link
Contributor

@rphmeier rphmeier Sep 7, 2020

Choose a reason for hiding this comment

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

Why does this immediately request the collation again?

Copy link
Contributor Author

@montekki montekki Sep 8, 2020

Choose a reason for hiding this comment

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

If the request times out, we need to note the collator as being unreliable and reduce its priority relative to other collators. And then make another request - repeat until we get a response or the chain has moved on.

Copy link
Contributor

@rphmeier rphmeier Sep 9, 2020

Choose a reason for hiding this comment

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

Oh, yeah, that was coming from the perspective of there being no CandidateSelection subsystem. If there is CandidateSelection, it should be CandidateSelection that decides to make another request. It doesn't really make sense to request from the collator who just timed out over and over again - the implication of the line quoted from the guide is that we should make another request of another collator.

Expand Down Expand Up @@ -899,7 +902,7 @@ mod tests {
NetworkBridgeMessage::ReportPeer(peer, rep)
) => {
assert_eq!(peer, peer_b);
assert_eq!(rep, COST_REQUEST_TIMEDOUT);
assert_eq!(rep, COST_REQUEST_TIMED_OUT);
}
);

Expand Down