Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

NodeProvider has a client pool to re-use connections #2527

Open
wants to merge 1 commit into
base: main
Choose a base branch
from
Open
Changes from all commits
Commits
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
21 changes: 18 additions & 3 deletions linera-rpc/src/node_provider.rs
Original file line number Diff line number Diff line change
@@ -1,6 +1,11 @@
// Copyright (c) Zefchain Labs, Inc.
// SPDX-License-Identifier: Apache-2.0

use std::{
collections::HashMap,
sync::{Arc, Mutex},
};

use linera_base::time::Duration;
use linera_core::node::{NodeError, ValidatorNodeProvider};

Expand All @@ -10,11 +15,12 @@ use crate::{client::Client, grpc::GrpcNodeProvider};

/// A general node provider which delegates node provision to the underlying
/// node provider according to the `ValidatorPublicNetworkConfig`.
#[derive(Copy, Clone)]
#[derive(Clone)]
pub struct NodeProvider {
grpc: GrpcNodeProvider,
#[cfg(with_simple_network)]
simple: SimpleNodeProvider,
client_pool: Arc<Mutex<HashMap<String, Client>>>,
Copy link
Contributor

Choose a reason for hiding this comment

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

Based on the experience of #2664, the GrpcNodeProvider should instead include a HashMap<String, tonic::transport::Channel>

}

impl NodeProvider {
Expand All @@ -23,6 +29,7 @@ impl NodeProvider {
grpc: GrpcNodeProvider::new(options),
#[cfg(with_simple_network)]
simple: SimpleNodeProvider::new(options),
client_pool: Default::default(),
}
}
}
Expand All @@ -32,14 +39,22 @@ impl ValidatorNodeProvider for NodeProvider {

fn make_node(&self, address: &str) -> anyhow::Result<Self::Node, NodeError> {
let address = address.to_lowercase();
let mut pool = self.client_pool.lock().unwrap();
ma2bd marked this conversation as resolved.
Show resolved Hide resolved
if let Some(client) = pool.get(&address) {
return Ok(client.clone());
Copy link
Contributor

Choose a reason for hiding this comment

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

Do both clients handle reconnecting if the other side dropped the connection?

Copy link
Contributor

Choose a reason for hiding this comment

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

Exactly. This needs to be tested

}

#[cfg(with_simple_network)]
if address.starts_with("tcp") || address.starts_with("udp") {
return Ok(Client::Simple(self.simple.make_node(&address)?));
let client = Client::Simple(self.simple.make_node(&address)?);
pool.insert(address, client.clone());
return Ok(client);
}

if address.starts_with("grpc") {
return Ok(Client::Grpc(self.grpc.make_node(&address)?));
let client = Client::Grpc(self.grpc.make_node(&address)?);
pool.insert(address, client.clone());
return Ok(client);
}

Err(NodeError::CannotResolveValidatorAddress { address })
Expand Down
Loading