Move from fast-async-mutex to async-lock crate as it's maintained.

TraceMachina · Jun 25, 2023 · e172756 · e172756
1 parent 85bf34d
commit e172756
Show file tree

Hide file tree

Showing 50 changed files with 264 additions and 181 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -43,7 +43,7 @@ rusoto_core = "0.48.0"
 rusoto_signature = "0.48.0"
 http = "^0.2"
 pin-project-lite = "0.2.7"
-fast-async-mutex = "0.6.7"
+async-lock = "2.7.0"
 lz4_flex = "0.9.0"
 bincode = "1.3.3"
 bytes = "1.1.0"

diff --git a/cas/grpc_service/BUILD b/cas/grpc_service/BUILD
@@ -59,7 +59,7 @@ rust_library(
         "//cas/store:grpc_store",
         "//config",
         "//proto",
-        "//third_party:fast_async_mutex",
+        "//third_party:async_lock",
         "//third_party:futures",
         "//third_party:tokio",
         "//third_party:tonic",

diff --git a/cas/grpc_service/bytestream_server.rs b/cas/grpc_service/bytestream_server.rs
@@ -18,7 +18,7 @@ use std::pin::Pin;
 use std::sync::Arc;
 use std::time::Instant;
 
-use fast_async_mutex::mutex::Mutex;
+use async_lock::Mutex;
 use futures::{stream::unfold, Stream};
 use proto::google::bytestream::{
     byte_stream_server::ByteStream, byte_stream_server::ByteStreamServer as Server, QueryWriteStatusRequest,

diff --git a/cas/scheduler/BUILD b/cas/scheduler/BUILD
@@ -16,7 +16,7 @@ rust_library(
     srcs = ["scheduler.rs"],
     deps = [
         "//config",
-        "//third_party:fast_async_mutex",
+        "//third_party:async_lock",
         "//third_party:lru",
         "//third_party:rand",
         "//third_party:tokio",

diff --git a/cas/scheduler/scheduler.rs b/cas/scheduler/scheduler.rs
@@ -17,7 +17,7 @@ use std::collections::{BTreeMap, HashMap, HashSet};
 use std::sync::Arc;
 use std::time::SystemTime;
 
-use fast_async_mutex::mutex::Mutex;
+use async_lock::Mutex;
 use lru::LruCache;
 use rand::{thread_rng, Rng};
 use tokio::sync::watch;

diff --git a/cas/store/BUILD b/cas/store/BUILD
@@ -239,7 +239,7 @@ rust_library(
     deps = [
         "//config",
         "//proto",
-        "//third_party:fast_async_mutex",
+        "//third_party:async_lock",
         "//third_party:futures",
         "//third_party:shellexpand",
         "//third_party:tokio",

diff --git a/cas/store/grpc_store.rs b/cas/store/grpc_store.rs
@@ -15,8 +15,8 @@
 use std::pin::Pin;
 use std::sync::Arc;
 
+use async_lock::Mutex;
 use async_trait::async_trait;
-use fast_async_mutex::mutex::Mutex;
 use futures::{stream::unfold, Stream};
 use shellexpand;
 use tonic::{transport, IntoRequest, Request, Response, Streaming};

diff --git a/cas/worker/BUILD b/cas/worker/BUILD
@@ -33,7 +33,7 @@ rust_library(
         "//cas/store:filesystem_store",
         "//proto",
         "//third_party:bytes",
-        "//third_party:fast_async_mutex",
+        "//third_party:async_lock",
         "//third_party:filetime",
         "//third_party:futures",
         "//third_party:hex",
@@ -98,7 +98,7 @@ rust_library(
     testonly = True,
     deps = [
         "//proto",
-        "//third_party:fast_async_mutex",
+        "//third_party:async_lock",
         "//third_party:tokio",
         "//third_party:tonic",
         ":worker_api_client_wrapper",
@@ -113,7 +113,7 @@ rust_library(
     deps = [
         "//cas/scheduler:action_messages",
         "//proto",
-        "//third_party:fast_async_mutex",
+        "//third_party:async_lock",
         "//third_party:tokio",
         "//util:error",
         ":running_actions_manager",

diff --git a/cas/worker/running_actions_manager.rs b/cas/worker/running_actions_manager.rs
@@ -23,8 +23,8 @@ use std::process::Stdio;
 use std::sync::{atomic::AtomicBool, atomic::Ordering, Arc, Weak};
 use std::time::SystemTime;
 
+use async_lock::Mutex;
 use bytes::{BufMut, Bytes, BytesMut};
-use fast_async_mutex::mutex::Mutex;
 use filetime::{set_file_mtime, FileTime};
 use futures::future::{try_join, try_join3, try_join_all, BoxFuture, FutureExt, TryFutureExt};
 use futures::stream::{FuturesUnordered, StreamExt, TryStreamExt};

diff --git a/cas/worker/tests/utils/mock_running_actions_manager.rs b/cas/worker/tests/utils/mock_running_actions_manager.rs
@@ -14,8 +14,8 @@
 
 use std::sync::Arc;
 
+use async_lock::Mutex;
 use async_trait::async_trait;
-use fast_async_mutex::mutex::Mutex;
 use tokio::sync::mpsc;
 
 use action_messages::ActionResult;

diff --git a/cas/worker/tests/utils/mock_worker_api_client.rs b/cas/worker/tests/utils/mock_worker_api_client.rs
@@ -14,8 +14,8 @@
 
 use std::sync::Arc;
 
+use async_lock::Mutex;
 use async_trait::async_trait;
-use fast_async_mutex::mutex::Mutex;
 use tokio::sync::mpsc;
 use tonic::{Response, Status, Streaming};