Switch to Tokio

Author: sourcefrog

Cargo.lock

@@ -20,7 +20,6 @@ s3 = [
     "dep:base64",
     "dep:crc32c",
     "dep:futures",
-    "dep:tokio",
 ]
 s3-integration-test = ["s3"]
 sftp = ["dep:ssh2", "dep:libssh2-sys"]
@@ -31,6 +30,7 @@ name = "conserve"
 
 [dependencies]
 assert_matches = "1.5.0"
+async-trait = "0.1.85"
 aws-config = { version = "1.1", optional = true }
 aws-sdk-s3 = { version = "1.56", optional = true }
 aws-types = { version = "1.1", optional = true }
@@ -51,8 +51,6 @@ lazy_static = "1.4.0"
 libssh2-sys = { version = "0.3.0", optional = true }
 lru = "0.12"
 mutants = "0.0.3"
-rayon = "1.3.0"
-readahead-iterator = "0.1.1"
 regex = "1.3.9"
 semver = "1"
 serde = { version = "1", features = ["derive"] }
@@ -70,7 +68,7 @@ time = { version = "0.3.35", features = [
     "serde",
     "serde-human-readable",
 ] }
-tokio = { version = "1", optional = true, features = ["full"] }
+tokio = { version = "1.43", features = ["full", "test-util", "tracing"] }
 tracing = "0.1"
 tracing-appender = "0.2"
 unix_mode = "0.1"

Cargo.toml

@@ -2,6 +2,8 @@
 
 ## Unreleased
 
+- Changed: Conserve now internally uses Tokio rather than raw threads and Rayon for parallelism. This is a step towards better overlapping both local and network archive operations.
+
 - New: `conserve mount ARCHIVE` gives readonly access to all the history in the archive as a virtual filesystem, currently only on Windows.
 
 - New: Support for reading and writing archives over SFTP. Credentials currently must come from an sftp-agent.