From 9c63b7c39c259d7debfb2f84c68677e9a2f7afa0 Mon Sep 17 00:00:00 2001
From: Christian Schwarz <christian@neon.tech>
Date: Fri, 11 Jul 2025 16:29:29 +0000
Subject: [PATCH] switch to std::sync::Mutex

---
 libs/neon_failpoint/Cargo.toml |  2 +-
 libs/neon_failpoint/src/lib.rs | 24 +++++++++++++-----------
 2 files changed, 14 insertions(+), 12 deletions(-)

diff --git a/libs/neon_failpoint/Cargo.toml b/libs/neon_failpoint/Cargo.toml
index bfb8e33666..51d3d9413a 100644
--- a/libs/neon_failpoint/Cargo.toml
+++ b/libs/neon_failpoint/Cargo.toml
@@ -24,4 +24,4 @@ testing = []
 
 [[example]]
 name = "context_demo"
-required-features = ["testing"]
\ No newline at end of file
+required-features = ["testing"]
diff --git a/libs/neon_failpoint/src/lib.rs b/libs/neon_failpoint/src/lib.rs
index 59c6d1ac6a..ac5538c448 100644
--- a/libs/neon_failpoint/src/lib.rs
+++ b/libs/neon_failpoint/src/lib.rs
@@ -15,7 +15,6 @@ use std::time::Duration;
 use anyhow::Result;
 use either::Either;
 use once_cell::sync::Lazy;
-use parking_lot::RwLock;
 use rand::Rng;
 use regex::Regex;
 use serde::{Deserialize, Serialize};
@@ -26,8 +25,9 @@ pub mod macros;
 pub use either; // re-export for use in macros
 
 /// Global failpoint registry
-static FAILPOINTS: Lazy<Arc<RwLock<HashMap<String, FailpointConfig>>>> =
-    Lazy::new(|| Arc::new(RwLock::new(HashMap::new())));
+// TODO: switch to simple_rcu, but it's in `utils`
+static FAILPOINTS: Lazy<Arc<std::sync::RwLock<HashMap<String, FailpointConfig>>>> =
+    Lazy::new(|| Default::default());
 
 /// Configuration for a single failpoint
 #[derive(Debug, Clone)]
@@ -106,7 +106,7 @@ pub fn configure_failpoint(name: &str, actions: &str) -> Result<()> {
         trigger_count: 0,
     };
 
-    let mut failpoints = FAILPOINTS.write();
+    let mut failpoints = FAILPOINTS.write().unwrap();
 
     // If this failpoint already exists, notify all waiting tasks
     if let Some(existing_config) = failpoints.get(name) {
@@ -136,7 +136,7 @@ pub fn configure_failpoint_with_context(
         trigger_count: 0,
     };
 
-    let mut failpoints = FAILPOINTS.write();
+    let mut failpoints = FAILPOINTS.write().unwrap();
 
     // If this failpoint already exists, notify all waiting tasks
     if let Some(existing_config) = failpoints.get(name) {
@@ -154,7 +154,7 @@ pub fn configure_failpoint_with_context(
 
 /// Remove a failpoint configuration
 pub fn remove_failpoint(name: &str) {
-    let mut failpoints = FAILPOINTS.write();
+    let mut failpoints = FAILPOINTS.write().unwrap();
 
     // Notify all waiting tasks before removing
     if let Some(existing_config) = failpoints.get(name) {
@@ -176,6 +176,7 @@ pub fn has_failpoints() -> bool {
 pub fn list() -> Vec<(impl std::fmt::Display, impl std::fmt::Display)> {
     FAILPOINTS
         .read()
+        .unwrap()
         .iter()
         .map(|(name, config)| (name.clone(), format!("{config:?}")))
         .collect::<Vec<_>>()
@@ -201,7 +202,7 @@ pub fn failpoint_with_cancellation(
     }
 
     let config = {
-        let failpoints = FAILPOINTS.read();
+        let failpoints = FAILPOINTS.read().unwrap();
         failpoints.get(name).cloned()
     };
 
@@ -234,7 +235,8 @@ pub fn failpoint_with_cancellation(
 
         // Increment trigger count
         {
-            let mut failpoints = FAILPOINTS.write();
+            let mut failpoints: std::sync::RwLockWriteGuard<'_, HashMap<String, FailpointConfig>> =
+                FAILPOINTS.write().unwrap();
             if let Some(fp_config) = failpoints.get_mut(name) {
                 fp_config.trigger_count += 1;
             }
@@ -280,7 +282,7 @@ fn execute_action(
 
                 // Add the notifier to the failpoint configuration
                 {
-                    let mut failpoints = FAILPOINTS.write();
+                    let mut failpoints = FAILPOINTS.write().unwrap();
                     if let Some(fp_config) = failpoints.get_mut(&name) {
                         fp_config.notifiers.push(notifier.clone());
                     }
@@ -321,7 +323,7 @@ fn execute_action(
 
                 // Add the notifier to the failpoint configuration
                 {
-                    let mut failpoints = FAILPOINTS.write();
+                    let mut failpoints = FAILPOINTS.write().unwrap();
                     if let Some(fp_config) = failpoints.get_mut(&name) {
                         fp_config.notifiers.push(notifier.clone());
                     }
@@ -448,7 +450,7 @@ struct NotifierCleanupGuard {
 
 impl Drop for NotifierCleanupGuard {
     fn drop(&mut self) {
-        let mut failpoints = FAILPOINTS.write();
+        let mut failpoints = FAILPOINTS.write().unwrap();
         if let Some(fp_config) = failpoints.get_mut(&self.failpoint_name) {
             // Remove this specific notifier from the list
             fp_config