mirror of
https://github.com/pezkuwichain/pezkuwi-subxt.git
synced 2026-06-13 01:11:10 +00:00
rpc: backpressured RPC server (bump jsonrpsee 0.20) (#1313)
This is a rather big change in jsonrpsee, the major things in this bump are: - Server backpressure (the subscription impls are modified to deal with that) - Allow custom error types / return types (remove jsonrpsee::core::Error and jsonrpee::core::CallError) - Bug fixes (graceful shutdown in particular not used by substrate anyway) - Less dependencies for the clients in particular - Return type requires Clone in method call responses - Moved to tokio channels - Async subscription API (not used in this PR) Major changes in this PR: - The subscriptions are now bounded and if subscription can't keep up with the server it is dropped - CLI: add parameter to configure the jsonrpc server bounded message buffer (default is 64) - Add our own subscription helper to deal with the unbounded streams in substrate The most important things in this PR to review is the added helpers functions in `substrate/client/rpc/src/utils.rs` and the rest is pretty much chore. Regarding the "bounded buffer limit" it may cause the server to handle the JSON-RPC calls slower than before. The message size limit is bounded by "--rpc-response-size" thus "by default 10MB * 64 = 640MB" but the subscription message size is not covered by this limit and could be capped as well. Hopefully the last release prior to 1.0, sorry in advance for a big PR Previous attempt: https://github.com/paritytech/substrate/pull/13992 Resolves https://github.com/paritytech/polkadot-sdk/issues/748, resolves https://github.com/paritytech/polkadot-sdk/issues/627
This commit is contained in:
@@ -0,0 +1,228 @@
|
||||
// This file is part of Substrate.
|
||||
|
||||
// Copyright (C) Parity Technologies (UK) Ltd.
|
||||
// SPDX-License-Identifier: GPL-3.0-or-later WITH Classpath-exception-2.0
|
||||
|
||||
// This program is free software: you can redistribute it and/or modify
|
||||
// it under the terms of the GNU General Public License as published by
|
||||
// the Free Software Foundation, either version 3 of the License, or
|
||||
// (at your option) any later version.
|
||||
|
||||
// This program is distributed in the hope that it will be useful,
|
||||
// but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||
// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||
// GNU General Public License for more details.
|
||||
|
||||
// You should have received a copy of the GNU General Public License
|
||||
// along with this program. If not, see <https://www.gnu.org/licenses/>.
|
||||
|
||||
//! JSON-RPC helpers.
|
||||
|
||||
use crate::SubscriptionTaskExecutor;
|
||||
use futures::{
|
||||
future::{self, Either, Fuse, FusedFuture},
|
||||
Future, FutureExt, Stream, StreamExt,
|
||||
};
|
||||
use jsonrpsee::{PendingSubscriptionSink, SubscriptionMessage, SubscriptionSink};
|
||||
use sp_runtime::Serialize;
|
||||
use std::collections::VecDeque;
|
||||
|
||||
const DEFAULT_BUF_SIZE: usize = 16;
|
||||
|
||||
/// A simple bounded VecDeque.
|
||||
struct BoundedVecDeque<T> {
|
||||
inner: VecDeque<T>,
|
||||
max_cap: usize,
|
||||
}
|
||||
|
||||
impl<T> BoundedVecDeque<T> {
|
||||
/// Create a new bounded VecDeque.
|
||||
fn new() -> Self {
|
||||
Self { inner: VecDeque::with_capacity(DEFAULT_BUF_SIZE), max_cap: DEFAULT_BUF_SIZE }
|
||||
}
|
||||
|
||||
fn push_back(&mut self, item: T) -> Result<(), ()> {
|
||||
if self.inner.len() >= self.max_cap {
|
||||
Err(())
|
||||
} else {
|
||||
self.inner.push_back(item);
|
||||
Ok(())
|
||||
}
|
||||
}
|
||||
|
||||
fn pop_front(&mut self) -> Option<T> {
|
||||
self.inner.pop_front()
|
||||
}
|
||||
}
|
||||
|
||||
/// Feed items to the subscription from the underlying stream.
|
||||
///
|
||||
/// This is bounded because the underlying streams in substrate are
|
||||
/// unbounded and if the subscription can't keep with stream it can
|
||||
/// cause the buffer to become very large and consume lots of memory.
|
||||
///
|
||||
/// In such cases the subscription is dropped.
|
||||
pub async fn pipe_from_stream<S, T>(pending: PendingSubscriptionSink, mut stream: S)
|
||||
where
|
||||
S: Stream<Item = T> + Unpin + Send + 'static,
|
||||
T: Serialize + Send + 'static,
|
||||
{
|
||||
let mut buf = BoundedVecDeque::new();
|
||||
let accept_fut = pending.accept();
|
||||
|
||||
futures::pin_mut!(accept_fut);
|
||||
|
||||
// Poll the stream while waiting for the subscription to be accepted
|
||||
//
|
||||
// If the `max_cap` is exceeded then the subscription is dropped.
|
||||
let sink = loop {
|
||||
match future::select(accept_fut, stream.next()).await {
|
||||
Either::Left((Ok(sink), _)) => break sink,
|
||||
Either::Right((Some(msg), f)) => {
|
||||
if buf.push_back(msg).is_err() {
|
||||
log::warn!(target: "rpc", "Subscription::accept failed buffer limit={} exceed; dropping subscription", buf.max_cap);
|
||||
return
|
||||
}
|
||||
accept_fut = f;
|
||||
},
|
||||
// The connection was closed or the stream was closed.
|
||||
_ => return,
|
||||
}
|
||||
};
|
||||
|
||||
inner_pipe_from_stream(sink, stream, buf).await
|
||||
}
|
||||
|
||||
async fn inner_pipe_from_stream<S, T>(
|
||||
sink: SubscriptionSink,
|
||||
mut stream: S,
|
||||
mut buf: BoundedVecDeque<T>,
|
||||
) where
|
||||
S: Stream<Item = T> + Unpin + Send + 'static,
|
||||
T: Serialize + Send + 'static,
|
||||
{
|
||||
let mut next_fut = Box::pin(Fuse::terminated());
|
||||
let mut next_item = stream.next();
|
||||
let closed = sink.closed();
|
||||
|
||||
futures::pin_mut!(closed);
|
||||
|
||||
loop {
|
||||
if next_fut.is_terminated() {
|
||||
if let Some(v) = buf.pop_front() {
|
||||
let val = to_sub_message(&sink, &v);
|
||||
next_fut.set(async { sink.send(val).await }.fuse());
|
||||
}
|
||||
}
|
||||
|
||||
match future::select(closed, future::select(next_fut, next_item)).await {
|
||||
// Send operation finished.
|
||||
Either::Right((Either::Left((_, n)), c)) => {
|
||||
next_item = n;
|
||||
closed = c;
|
||||
next_fut = Box::pin(Fuse::terminated());
|
||||
},
|
||||
// New item from the stream
|
||||
Either::Right((Either::Right((Some(v), n)), c)) => {
|
||||
if buf.push_back(v).is_err() {
|
||||
log::warn!(target: "rpc", "Subscription buffer limit={} exceed; dropping subscription", buf.max_cap);
|
||||
return
|
||||
}
|
||||
|
||||
next_fut = n;
|
||||
closed = c;
|
||||
next_item = stream.next();
|
||||
},
|
||||
// Stream "finished".
|
||||
//
|
||||
// Process remaining items and terminate.
|
||||
Either::Right((Either::Right((None, pending_fut)), _)) => {
|
||||
if pending_fut.await.is_err() {
|
||||
return;
|
||||
}
|
||||
|
||||
while let Some(v) = buf.pop_front() {
|
||||
let val = to_sub_message(&sink, &v);
|
||||
if sink.send(val).await.is_err() {
|
||||
return;
|
||||
}
|
||||
}
|
||||
|
||||
return;
|
||||
},
|
||||
// Subscription was closed.
|
||||
Either::Left(_) => return,
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
/// Builds a subscription message.
|
||||
///
|
||||
/// # Panics
|
||||
///
|
||||
/// This function panics `Serialize` fails and it is treated a bug.
|
||||
pub fn to_sub_message(sink: &SubscriptionSink, result: &impl Serialize) -> SubscriptionMessage {
|
||||
SubscriptionMessage::new(sink.method_name(), sink.subscription_id(), result)
|
||||
.expect("Serialize infallible; qed")
|
||||
}
|
||||
|
||||
/// Helper for spawning non-blocking rpc subscription task.
|
||||
pub fn spawn_subscription_task(
|
||||
executor: &SubscriptionTaskExecutor,
|
||||
fut: impl Future<Output = ()> + Send + 'static,
|
||||
) {
|
||||
executor.spawn("substrate-rpc-subscription", Some("rpc"), fut.boxed());
|
||||
}
|
||||
|
||||
#[cfg(test)]
|
||||
mod tests {
|
||||
use super::pipe_from_stream;
|
||||
use futures::StreamExt;
|
||||
use jsonrpsee::{core::EmptyServerParams, RpcModule, Subscription};
|
||||
|
||||
async fn subscribe() -> Subscription {
|
||||
let mut module = RpcModule::new(());
|
||||
module
|
||||
.register_subscription("sub", "my_sub", "unsub", |_, pending, _| async move {
|
||||
let stream = futures::stream::iter([0; 16]);
|
||||
pipe_from_stream(pending, stream).await;
|
||||
Ok(())
|
||||
})
|
||||
.unwrap();
|
||||
|
||||
module.subscribe("sub", EmptyServerParams::new(), 1).await.unwrap()
|
||||
}
|
||||
|
||||
#[tokio::test]
|
||||
async fn pipe_from_stream_works() {
|
||||
let mut sub = subscribe().await;
|
||||
let mut rx = 0;
|
||||
|
||||
while let Some(Ok(_)) = sub.next::<usize>().await {
|
||||
rx += 1;
|
||||
}
|
||||
|
||||
assert_eq!(rx, 16);
|
||||
}
|
||||
|
||||
#[tokio::test]
|
||||
async fn pipe_from_stream_is_bounded() {
|
||||
let (tx, mut rx) = futures::channel::mpsc::unbounded::<()>();
|
||||
|
||||
let mut module = RpcModule::new(tx);
|
||||
module
|
||||
.register_subscription("sub", "my_sub", "unsub", |_, pending, ctx| async move {
|
||||
let stream = futures::stream::iter([0; 32]);
|
||||
pipe_from_stream(pending, stream).await;
|
||||
_ = ctx.unbounded_send(());
|
||||
Ok(())
|
||||
})
|
||||
.unwrap();
|
||||
|
||||
let mut sub = module.subscribe("sub", EmptyServerParams::new(), 1).await.unwrap();
|
||||
|
||||
// When the 17th item arrives the subscription is dropped
|
||||
_ = rx.next().await.unwrap();
|
||||
assert!(sub.next::<usize>().await.is_none());
|
||||
}
|
||||
}
|
||||
Reference in New Issue
Block a user