A little more cleanup

Cargo.toml

@@ -33,6 +33,7 @@ itertools = "0.13.0"
 lazy_static = "1.4.0"
 log = "0.4.22"
 object_store = { version = "0.10.2", features = ["aws"], optional = true }
+parking_lot = "0.12.3"
 pin-project-lite = {version = "0.2.14" }
 prost = "0.12.3"
 ratatui = "0.28.0"

src/execution/dedicated_executor.rs

@@ -16,18 +16,20 @@
 // under the License.
 
 use std::{
-    sync::{Arc, OnceLock, RwLock},
+    sync::{Arc, OnceLock},
     time::Duration,
 };
 
 use futures::{
     future::{BoxFuture, Shared},
-    FutureExt,
+    Future, FutureExt, TryFutureExt,
 };
 use log::warn;
+use parking_lot::RwLock;
 use tokio::{
     runtime::Handle,
     sync::{oneshot::error::RecvError, Notify},
+    task::JoinSet,
 };
 
 const SHUTDOWN_TIMEOUT: Duration = Duration::from_secs(60 * 5);
@@ -84,6 +86,11 @@ const SHUTDOWN_TIMEOUT: Duration = Duration::from_secs(60 * 5);
 /// context.', .../tokio-1.4.0/src/runtime/blocking/shutdown.rs:51:21
 struct DedicatedExecutor {
     state: Arc<RwLock<State>>,
+
+    /// Used for testing.
+    ///
+    /// This will ignore explicit shutdown requests.
+    testing: bool,
 }
 
 /// [`DedicatedExecutor`] for testing purposes.
@@ -182,12 +189,7 @@ impl DedicatedExecutor {
                 // - https://github.com/influxdata/influxdb_iox/pull/11030
                 runtime_builder.enable_time();
 
-                Self::new_inner(
-                    "testing",
-                    runtime_builder,
-                    Arc::new(Registry::default()),
-                    true,
-                )
+                Self::new_inner("testing", runtime_builder, true)
             })
             .clone()
     }