Merge branch 'rc-2024.12.1-hotfix7'

grumbach · Jan 21, 2025 · f2bb64a · f2bb64a
2 parents df0832c + 0978816
commit f2bb64a
Show file tree

Hide file tree

Showing 8 changed files with 21 additions and 10 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -7,6 +7,17 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 *When editing this file, please respect a line length of 100.*
 
+## 2025-01-21
+
+### Client
+
+#### Changed
+
+- Use balanced retry strategy for downloading chunks. Sometimes it would be possible we wouldn't
+  find a chunk if we tried to retrieve it on the first attempt, so as with uploads, we will use a
+  balanced retry strategy for downloads. This should make the `ant file download` command more
+  robust.
+
 ## 2025-01-20
 
 ### Client

diff --git a/Cargo.lock b/Cargo.lock
diff --git a/ant-build-info/src/release_info.rs b/ant-build-info/src/release_info.rs
@@ -1,4 +1,4 @@
 pub const RELEASE_YEAR: &str = "2024";
 pub const RELEASE_MONTH: &str = "12";
 pub const RELEASE_CYCLE: &str = "1";
-pub const RELEASE_CYCLE_COUNTER: &str = "10";
+pub const RELEASE_CYCLE_COUNTER: &str = "11";
diff --git a/ant-cli/Cargo.toml b/ant-cli/Cargo.toml
@@ -3,7 +3,7 @@ authors = ["MaidSafe Developers <dev@maidsafe.net>"]
 name = "ant-cli"
 description = "CLI client for the Autonomi network"
 license = "GPL-3.0"
-version = "0.3.5"
+version = "0.3.6"
 edition = "2021"
 homepage = "https://maidsafe.net"
 readme = "README.md"
@@ -27,7 +27,7 @@ ant-bootstrap = { path = "../ant-bootstrap", version = "0.1.4" }
 ant-build-info = { path = "../ant-build-info", version = "0.1.23" }
 ant-logging = { path = "../ant-logging", version = "0.2.45" }
 ant-protocol = { path = "../ant-protocol", version = "0.3.3" }
-autonomi = { path = "../autonomi", version = "0.3.4", features = [ "loud" ] }
+autonomi = { path = "../autonomi", version = "0.3.5", features = [ "loud" ] }
 clap = { version = "4.2.1", features = ["derive"] }
 color-eyre = "0.6.3"
 const-hex = "1.13.1"
@@ -54,7 +54,7 @@ tracing = { version = "~0.1.26" }
 walkdir = "2.5.0"
 
 [dev-dependencies]
-autonomi = { path = "../autonomi", version = "0.3.4" }
+autonomi = { path = "../autonomi", version = "0.3.5" }
 criterion = "0.5.1"
 eyre = "0.6.8"
 rand = { version = "~0.8.5", features = ["small_rng"] }

diff --git a/ant-node/Cargo.toml b/ant-node/Cargo.toml
@@ -81,7 +81,7 @@ xor_name = "5.0.0"
 ant-protocol = { path = "../ant-protocol", version = "0.3.3", features = ["rpc"] }
 assert_fs = "1.0.0"
 evmlib = { path = "../evmlib", version = "0.1.8" }
-autonomi = { path = "../autonomi", version = "0.3.4" }
+autonomi = { path = "../autonomi", version = "0.3.5" }
 reqwest = { version = "0.12.2", default-features = false, features = [
     "rustls-tls-manual-roots",
 ] }

diff --git a/autonomi/Cargo.toml b/autonomi/Cargo.toml
@@ -3,7 +3,7 @@ authors = ["MaidSafe Developers <dev@maidsafe.net>"]
 description = "Autonomi client API"
 name = "autonomi"
 license = "GPL-3.0"
-version = "0.3.4"
+version = "0.3.5"
 edition = "2021"
 homepage = "https://maidsafe.net"
 readme = "README.md"

diff --git a/autonomi/src/client/data_types/chunk.rs b/autonomi/src/client/data_types/chunk.rs
@@ -120,7 +120,7 @@ impl Client {
         debug!("Fetching chunk from network at: {key:?}");
         let get_cfg = GetRecordCfg {
             get_quorum: Quorum::One,
-            retry_strategy: None,
+            retry_strategy: Some(RetryStrategy::Balanced),
             target_record: None,
             expected_holders: HashSet::new(),
         };

diff --git a/release-cycle-info b/release-cycle-info
@@ -15,4 +15,4 @@
 release-year: 2024
 release-month: 12
 release-cycle: 1
-release-cycle-counter: 10
+release-cycle-counter: 11