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

fix: keep grpc alive by sending using ping-pong #160

Merged
merged 1 commit into from
Oct 9, 2024
Merged
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
40 changes: 36 additions & 4 deletions grpc-ingest/src/grpc.rs
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,9 @@ use {
util::create_shutdown,
},
anyhow::Context,
futures::stream::StreamExt,
futures::{channel::mpsc::SendError, stream::StreamExt, Sink, SinkExt},
redis::streams::StreamMaxlen,
std::{collections::HashMap, sync::Arc, time::Duration},
std::{collections::HashMap, pin::Pin, sync::Arc, time::Duration},
tokio::{sync::Mutex, time::sleep},
topograph::{
executor::{Executor, Nonblock, Tokio},
Expand All @@ -16,23 +16,28 @@ use {
tracing::{debug, warn},
yellowstone_grpc_client::GeyserGrpcClient,
yellowstone_grpc_proto::{
geyser::{SubscribeRequest, SubscribeUpdate},
geyser::{SubscribeRequest, SubscribeRequestPing, SubscribeUpdate},
prelude::subscribe_update::UpdateOneof,
prost::Message,
},
yellowstone_grpc_tools::config::GrpcRequestToProto,
};

const PING_ID: i32 = 0;

enum GrpcJob {
FlushRedisPipe,
ProcessSubscribeUpdate(Box<SubscribeUpdate>),
}

type SubscribeTx = Pin<Box<dyn Sink<SubscribeRequest, Error = SendError> + Send + Sync>>;

#[derive(Clone)]
pub struct GrpcJobHandler {
connection: redis::aio::MultiplexedConnection,
config: Arc<ConfigGrpc>,
pipe: Arc<Mutex<TrackedPipeline>>,
subscribe_tx: Arc<Mutex<SubscribeTx>>,
}

impl<'a> AsyncHandler<GrpcJob, topograph::executor::Handle<'a, GrpcJob, Nonblock<Tokio>>>
Expand All @@ -49,6 +54,8 @@ impl<'a> AsyncHandler<GrpcJob, topograph::executor::Handle<'a, GrpcJob, Nonblock
let connection = self.connection.clone();
let pipe = Arc::clone(&self.pipe);

let subscribe_tx = Arc::clone(&self.subscribe_tx);

async move {
match job {
GrpcJob::FlushRedisPipe => {
Expand Down Expand Up @@ -98,6 +105,29 @@ impl<'a> AsyncHandler<GrpcJob, topograph::executor::Handle<'a, GrpcJob, Nonblock

debug!(message = "Transaction update", ?transaction);
}
UpdateOneof::Ping(_) => {
subscribe_tx
.lock()
.await
.send(SubscribeRequest {
ping: Some(SubscribeRequestPing { id: PING_ID }),
..Default::default()
})
.await
.map_err(|err| {
warn!(message = "Failed to send ping", ?err);
})
.ok();

debug!(message = "Ping", id = PING_ID);
}
UpdateOneof::Pong(pong) => {
if pong.id == PING_ID {
debug!(message = "Pong", id = PING_ID);
} else {
warn!(message = "Unknown pong id", id = pong.id);
}
}
var => warn!(message = "Unknown update variant", ?var),
}
}
Expand Down Expand Up @@ -144,9 +174,10 @@ pub async fn run(config: ConfigGrpc) -> anyhow::Result<()> {
.await
.context("failed to connect to gRPC")?;

let (_subscribe_tx, stream) = dragon_mouth_client
let (subscribe_tx, stream) = dragon_mouth_client
.subscribe_with_request(Some(request))
.await?;

tokio::pin!(stream);

let exec = Executor::builder(Nonblock(Tokio))
Expand All @@ -155,6 +186,7 @@ pub async fn run(config: ConfigGrpc) -> anyhow::Result<()> {
config: Arc::clone(&config),
connection: connection.clone(),
pipe: Arc::clone(&pipe),
subscribe_tx: Arc::new(Mutex::new(Box::pin(subscribe_tx))),
})?;

let deadline_config = Arc::clone(&config);
Expand Down
Loading