From 43216b167fed845c1e509baeec42b0fc99887469 Mon Sep 17 00:00:00 2001 From: wileyj <2847772+wileyj@users.noreply.github.com> Date: Mon, 1 Jul 2024 11:20:29 -0700 Subject: [PATCH 1/5] change defatult antientropy_retry to one hour --- CHANGELOG.md | 7 +++++++ stackslib/src/net/connection.rs | 2 +- 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 8ff66f9c52..76c682f379 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -5,6 +5,13 @@ All notable changes to this project will be documented in this file. The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/), and this project adheres to the versioning scheme outlined in the [README.md](README.md). +## [2.5.0.0.4] +### Added +- Added configuration option `connections.antientropy_retry` (#4932) +### Changed +- Set default antientropy_rety to run once per hour, not once per minute + + ## [2.5.0.0.4] ### Added diff --git a/stackslib/src/net/connection.rs b/stackslib/src/net/connection.rs index 878ab04efb..7986ad6719 100644 --- a/stackslib/src/net/connection.rs +++ b/stackslib/src/net/connection.rs @@ -479,7 +479,7 @@ impl std::default::Default for ConnectionOptions { public_ip_max_retries: 3, // maximum number of retries before self-throttling for $public_ip_timeout max_block_push: 10, // maximum number of blocksData messages to push out via our anti-entropy protocol max_microblock_push: 10, // maximum number of microblocks messages to push out via our anti-entropy protocol - antientropy_retry: 60, // retry pushing data once every minute + antientropy_retry: 3600, // retry pushing data once every hour antientropy_public: true, // run antientropy even if we're NOT NAT'ed max_buffered_blocks_available: 1, max_buffered_microblocks_available: 1, From 6f498b038cf0e0464516d7b1d3fa881deb9b04f8 Mon Sep 17 00:00:00 2001 From: wileyj <2847772+wileyj@users.noreply.github.com> Date: Mon, 1 Jul 2024 11:26:35 -0700 Subject: [PATCH 2/5] Adjust Changlog text --- CHANGELOG.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 76c682f379..951063a6ab 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -9,7 +9,7 @@ and this project adheres to the versioning scheme outlined in the [README.md](RE ### Added - Added configuration option `connections.antientropy_retry` (#4932) ### Changed -- Set default antientropy_rety to run once per hour, not once per minute +- Set default antientropy_rety to run once per hour ## [2.5.0.0.4] From ad14bed76a5f63a6223abd3909d783f2b05bbd85 Mon Sep 17 00:00:00 2001 From: wileyj <2847772+wileyj@users.noreply.github.com> Date: Mon, 1 Jul 2024 11:35:15 -0700 Subject: [PATCH 3/5] fix formatting --- stackslib/src/net/connection.rs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/stackslib/src/net/connection.rs b/stackslib/src/net/connection.rs index 7986ad6719..7986c9294d 100644 --- a/stackslib/src/net/connection.rs +++ b/stackslib/src/net/connection.rs @@ -479,7 +479,7 @@ impl std::default::Default for ConnectionOptions { public_ip_max_retries: 3, // maximum number of retries before self-throttling for $public_ip_timeout max_block_push: 10, // maximum number of blocksData messages to push out via our anti-entropy protocol max_microblock_push: 10, // maximum number of microblocks messages to push out via our anti-entropy protocol - antientropy_retry: 3600, // retry pushing data once every hour + antientropy_retry: 3600, // retry pushing data once every hour antientropy_public: true, // run antientropy even if we're NOT NAT'ed max_buffered_blocks_available: 1, max_buffered_microblocks_available: 1, From ebd17f4fcf0ee0b198af8c6a2eb7e6f7203f5ab1 Mon Sep 17 00:00:00 2001 From: wileyj <2847772+wileyj@users.noreply.github.com> Date: Mon, 1 Jul 2024 14:54:29 -0700 Subject: [PATCH 4/5] fix typo in version number --- CHANGELOG.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 951063a6ab..03a394ff20 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -5,11 +5,11 @@ All notable changes to this project will be documented in this file. The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/), and this project adheres to the versioning scheme outlined in the [README.md](README.md). -## [2.5.0.0.4] +## [2.5.0.0.5] ### Added - Added configuration option `connections.antientropy_retry` (#4932) ### Changed -- Set default antientropy_rety to run once per hour +- Set default antientropy_rety to run once per hour (#4935) ## [2.5.0.0.4] From ea394b7e7c6136c90b90f8b983aa9a91ae4a0182 Mon Sep 17 00:00:00 2001 From: wileyj <2847772+wileyj@users.noreply.github.com> Date: Mon, 1 Jul 2024 15:19:30 -0700 Subject: [PATCH 5/5] fix typo: rety->retry --- CHANGELOG.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 03a394ff20..950a831076 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -9,7 +9,7 @@ and this project adheres to the versioning scheme outlined in the [README.md](RE ### Added - Added configuration option `connections.antientropy_retry` (#4932) ### Changed -- Set default antientropy_rety to run once per hour (#4935) +- Set default antientropy_retry to run once per hour (#4935) ## [2.5.0.0.4]