diff --git a/Cargo.lock b/Cargo.lock
index 92cd708ea4..db36ef9eeb 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -1643,6 +1643,15 @@ dependencies = [
  "tracing",
 ]
 
+[[package]]
+name = "instant"
+version = "0.1.9"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "61124eeebbd69b8190558df225adf7e4caafce0d743919e5d6b19652314ec5ec"
+dependencies = [
+ "cfg-if 1.0.0",
+]
+
 [[package]]
 name = "integer-encoding"
 version = "1.1.7"
@@ -1764,6 +1773,15 @@ version = "0.2.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "c7d73b3f436185384286bd8098d17ec07c9a7d2388a6599f824d8502b529702a"
 
+[[package]]
+name = "lock_api"
+version = "0.4.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "dd96ffd135b2fd7b973ac026d28085defbe8983df057ced3eb4f2130b0831312"
+dependencies = [
+ "scopeguard",
+]
+
 [[package]]
 name = "log"
 version = "0.4.14"
@@ -2173,6 +2191,9 @@ name = "once_cell"
 version = "1.5.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "13bd41f508810a131401606d54ac32a467c97172d74ba7662562ebba5ad07fa0"
+dependencies = [
+ "parking_lot",
+]
 
 [[package]]
 name = "oorandom"
@@ -2300,6 +2321,31 @@ dependencies = [
  "tracing",
 ]
 
+[[package]]
+name = "parking_lot"
+version = "0.11.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "6d7744ac029df22dca6284efe4e898991d28e3085c706c972bcd7da4a27a15eb"
+dependencies = [
+ "instant",
+ "lock_api",
+ "parking_lot_core",
+]
+
+[[package]]
+name = "parking_lot_core"
+version = "0.8.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "fa7a782938e745763fe6907fc6ba86946d72f49fe7e21de074e08128a99fb018"
+dependencies = [
+ "cfg-if 1.0.0",
+ "instant",
+ "libc",
+ "redox_syscall 0.2.5",
+ "smallvec",
+ "winapi",
+]
+
 [[package]]
 name = "parquet"
 version = "4.0.0-SNAPSHOT"
@@ -3717,6 +3763,7 @@ dependencies = [
  "mio",
  "num_cpus",
  "once_cell",
+ "parking_lot",
  "pin-project-lite",
  "signal-hook-registry",
  "tokio-macros",
@@ -3940,6 +3987,7 @@ dependencies = [
  "chrono",
  "lazy_static",
  "matchers",
+ "parking_lot",
  "regex",
  "serde",
  "serde_json",
diff --git a/Cargo.toml b/Cargo.toml
index a31e5b3362..804db184a7 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -78,13 +78,13 @@ serde_json = "1.0.44"
 serde_urlencoded = "0.7.0"
 snafu = "0.6.9"
 structopt = "0.3.21"
-tokio = { version = "1.0", features = ["macros", "rt-multi-thread"] }
+tokio = { version = "1.0", features = ["macros", "rt-multi-thread", "parking_lot"] }
 tokio-stream = { version = "0.1.2", features = ["net"] }
 tonic = "0.4.0"
 tracing = { version = "0.1", features = ["release_max_level_debug"] }
 tracing-futures = "0.2.4"
 tracing-opentelemetry = "0.11.0"
-tracing-subscriber = "0.2.15"
+tracing-subscriber = { version = "0.2.15", features = ["parking_lot"] }
 
 [dev-dependencies]
 # Workspace dependencies, in alphabetical order
diff --git a/logfmt/Cargo.toml b/logfmt/Cargo.toml
index 72bf469e9e..0ca49e98fb 100644
--- a/logfmt/Cargo.toml
+++ b/logfmt/Cargo.toml
@@ -10,5 +10,5 @@ tracing = { version = "0.1" }
 tracing-subscriber = "0.2.15"
 
 [dev-dependencies] # In alphabetical order
-once_cell = "1.4.0"
+once_cell = { version = "1.4.0", features = ["parking_lot"] }
 regex = "1.4.3"
diff --git a/wal/Cargo.toml b/wal/Cargo.toml
index 0effdedeae..29af4d8ffc 100644
--- a/wal/Cargo.toml
+++ b/wal/Cargo.toml
@@ -9,7 +9,7 @@ byteorder = "1.3.4"
 crc32fast = "1.2.0"
 futures = "0.3.4"
 itertools = "0.9.0"
-once_cell = "1.4.0"
+once_cell = { version = "1.4.0", features = ["parking_lot"] }
 regex = "1.3.7"
 serde = { version = "1.0", features = ["derive"] }
 serde_json = "1.0.44"