geyser: use runtime instaed of unconstrained (#332)

rpcpool · May 17, 2024 · 43bd81a · 43bd81a
1 parent 9f1dbd7
commit 43bd81a
Show file tree

Hide file tree

Showing 8 changed files with 75 additions and 32 deletions.
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -6,6 +6,9 @@ concurrency:
   cancel-in-progress: true
 
 on:
+  pull_request:
+    paths:
+      - '.github/workflows/release.yml'
   push:
     branches:
       - 'master'
@@ -75,16 +78,6 @@ jobs:
       - name: Build release tarball
         run: ./ci/create-tarball.sh
 
-      - name: Rename binaries for ubuntu22 release
-        if: matrix.os == 'ubuntu-22.04'
-        run: |
-          mv target/release/client target/release/client-22
-          mv target/release/config-check target/release/config-check-22
-          mv target/release/grpc-google-pubsub target/release/grpc-google-pubsub-22
-          mv target/release/grpc-kafka target/release/grpc-kafka-22
-          mv ${{ env.GEYSER_PLUGIN_NAME }}-release-x86_64-unknown-linux-gnu.tar.bz2 ${{ env.GEYSER_PLUGIN_NAME }}-release22-x86_64-unknown-linux-gnu.tar.bz2
-          mv ${{ env.GEYSER_PLUGIN_NAME }}-release-x86_64-unknown-linux-gnu.yml ${{ env.GEYSER_PLUGIN_NAME }}-release22-x86_64-unknown-linux-gnu.yml
-
       - name: Deleteing directories to avoid upload conflict
         run: |
           rm -rf \
@@ -93,6 +86,27 @@ jobs:
             target/release/grpc-google-pubsub.d \
             target/release/grpc-kafka.d
 
+      - name: Remove debug information
+        run: |
+          strip \
+            target/release/client \
+            target/release/config-check \
+            target/release/grpc-google-pubsub \
+            target/release/grpc-kafka
+
+      - name: Rename binaries
+        run: |
+          mv target/release/client target/release/client-${{ matrix.os }}
+          mv target/release/config-check target/release/config-check-${{ matrix.os }}
+          mv target/release/grpc-google-pubsub target/release/grpc-google-pubsub-${{ matrix.os }}
+          mv target/release/grpc-kafka target/release/grpc-kafka-${{ matrix.os }}
+
+      - name: Rename lib for ubuntu22 release
+        if: matrix.os == 'ubuntu-22.04'
+        run: |
+          mv ${{ env.GEYSER_PLUGIN_NAME }}-release-x86_64-unknown-linux-gnu.tar.bz2 ${{ env.GEYSER_PLUGIN_NAME }}-release22-x86_64-unknown-linux-gnu.tar.bz2
+          mv ${{ env.GEYSER_PLUGIN_NAME }}-release-x86_64-unknown-linux-gnu.yml ${{ env.GEYSER_PLUGIN_NAME }}-release22-x86_64-unknown-linux-gnu.yml
+
       - name: Release
         if: startsWith(github.ref, 'refs/tags/')
         uses: softprops/action-gh-release@v2
@@ -109,3 +123,14 @@ jobs:
             target/release/config-check*
             target/release/grpc-google-pubsub*
             target/release/grpc-kafka*
+
+      - uses: actions/upload-artifact@v4
+        with:
+          name: yellowstone-grpc-${{ github.sha }}-${{ matrix.os }}
+          path: |
+            ${{ env.GEYSER_PLUGIN_NAME }}-release*
+            yellowstone-grpc-proto/proto/*.proto
+            target/release/client*
+            target/release/config-check*
+            target/release/grpc-google-pubsub*
+            target/release/grpc-kafka*
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -16,6 +16,17 @@ The minor version will be incremented upon a breaking change and the patch versi
 
 ### Breaking
 
+## 2024-05-17
+
+- yellowstone-grpc-client-1.15.0+solana.1.17.33
+- yellowstone-grpc-geyser-1.14.2+solana.1.17.33
+- yellowstone-grpc-proto-1.14.0+solana.1.17.33
+- yellowstone-grpc-tools-1.0.0-rc.11+solana.1.17.33
+
+### Features
+
+- geyser: use runtime instaed of unconstrained ([#332](https://github.com/rpcpool/yellowstone-grpc/pull/332))
+
 ## 2024-05-15
 
 - yellowstone-grpc-client-1.15.0+solana.1.17.33

diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -3,7 +3,7 @@ resolver = "2"
 members = [
     "examples/rust", # 1.13.0+solana.1.17.33
     "yellowstone-grpc-client", # 1.15.0+solana.1.17.33
-    "yellowstone-grpc-geyser", # 1.14.1+solana.1.17.33
+    "yellowstone-grpc-geyser", # 1.14.2+solana.1.17.33
     "yellowstone-grpc-proto", # 1.14.0+solana.1.17.33
     "yellowstone-grpc-tools", # 1.0.0-rc.11+solana.1.17.33
 ]

diff --git a/yellowstone-grpc-geyser/Cargo.toml b/yellowstone-grpc-geyser/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "yellowstone-grpc-geyser"
-version = "1.14.1+solana.1.17.33"
+version = "1.14.2+solana.1.17.33"
 authors = { workspace = true }
 edition = { workspace = true }
 description = "Yellowstone gRPC Geyser Plugin"

diff --git a/yellowstone-grpc-geyser/src/grpc.rs b/yellowstone-grpc-geyser/src/grpc.rs
@@ -27,7 +27,9 @@ use {
     },
     tokio::{
         fs,
+        runtime::Builder,
         sync::{broadcast, mpsc, Mutex, Notify, RwLock, Semaphore},
+        task::spawn_blocking,
         time::{sleep, Duration, Instant},
     },
     tokio_stream::wrappers::ReceiverStream,
@@ -783,12 +785,20 @@ impl GrpcService {
 
         // Run geyser message loop
         let (messages_tx, messages_rx) = mpsc::unbounded_channel();
-        tokio::spawn(tokio::task::unconstrained(Self::geyser_loop(
-            messages_rx,
-            blocks_meta_tx,
-            broadcast_tx,
-            block_fail_action,
-        )));
+        spawn_blocking(move || {
+            Builder::new_multi_thread()
+                .thread_name_fn(crate::get_thread_name)
+                .worker_threads(4)
+                .enable_all()
+                .build()
+                .expect("Failed to create a new runtime for geyser loop")
+                .block_on(Self::geyser_loop(
+                    messages_rx,
+                    blocks_meta_tx,
+                    broadcast_tx,
+                    block_fail_action,
+                ));
+        });
 
         // Run Server
         let shutdown = Arc::new(Notify::new());

diff --git a/yellowstone-grpc-geyser/src/lib.rs b/yellowstone-grpc-geyser/src/lib.rs
@@ -8,3 +8,11 @@ pub mod grpc;
 pub mod plugin;
 pub mod prom;
 pub mod version;
+
+pub fn get_thread_name() -> String {
+    use std::sync::atomic::{AtomicUsize, Ordering};
+
+    static ATOMIC_ID: AtomicUsize = AtomicUsize::new(0);
+    let id = ATOMIC_ID.fetch_add(1, Ordering::Relaxed);
+    format!("solGeyserGrpc{id:02}")
+}
diff --git a/yellowstone-grpc-geyser/src/plugin.rs b/yellowstone-grpc-geyser/src/plugin.rs
@@ -9,14 +9,7 @@ use {
         ReplicaEntryInfoVersions, ReplicaTransactionInfoVersions, Result as PluginResult,
         SlotStatus,
     },
-    std::{
-        concat, env,
-        sync::{
-            atomic::{AtomicUsize, Ordering},
-            Arc,
-        },
-        time::Duration,
-    },
+    std::{concat, env, sync::Arc, time::Duration},
     tokio::{
         runtime::{Builder, Runtime},
         sync::{mpsc, Notify},
@@ -68,11 +61,7 @@ impl GeyserPlugin for Plugin {
 
         // Create inner
         let runtime = Builder::new_multi_thread()
-            .thread_name_fn(|| {
-                static ATOMIC_ID: AtomicUsize = AtomicUsize::new(0);
-                let id = ATOMIC_ID.fetch_add(1, Ordering::Relaxed);
-                format!("solGeyserGrpc{id:02}")
-            })
+            .thread_name_fn(crate::get_thread_name)
             .enable_all()
             .build()
             .map_err(|error| GeyserPluginError::Custom(Box::new(error)))?;