starred/chia-blockchain
1
0
Fork 0
mirror of https://github.com/Chia-Network/chia-blockchain.git synced 2026-08-24 10:05:29 -05:00
Code Issues Packages Projects Releases Wiki Activity

Adjust ban times for DL dat files (#17021)

Browse Source
This commit is contained in:
Earle Lowe
2023-12-08 15:40:44 -06:00
committed by GitHub
parent ca9a6011ec
commit cfab3a407d
3 changed files with 8 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
chia/data_layer/data_store.py
+2 -1
View File
@@ -1583,7 +1583,8 @@ class DataStore:
await self.update_server_info(tree_id, new_server_info)
async def server_misses_file(self, tree_id: bytes32, server_info: ServerInfo, timestamp: int) -> None:
BAN_TIME_BY_MISSING_COUNT = [5 * 60] * 3 + [15 * 60] * 3 + [60 * 60] * 2 + [240 * 60]
# Max banned time is 1 hour.
BAN_TIME_BY_MISSING_COUNT = [5 * 60] * 3 + [15 * 60] * 3 + [30 * 60] * 2 + [60 * 60]
index = min(server_info.num_consecutive_failures, len(BAN_TIME_BY_MISSING_COUNT) - 1)
new_server_info = replace(
server_info,
chia/data_layer/download_data.py
+5 -1
View File
@@ -196,7 +196,11 @@ async def insert_from_delta_file(
except Exception:
target_filename = client_foldername.joinpath(filename)
os.remove(target_filename)
await data_store.received_incorrect_file(tree_id, server_info, timestamp)
# await data_store.received_incorrect_file(tree_id, server_info, timestamp)
# incorrect file bans for 7 days which in practical usage
# is too long given this file might be incorrect for various reasons
# therefore, use the misses file logic instead
await data_store.server_misses_file(tree_id, server_info, timestamp)
await data_store.rollback_to_generation(tree_id, existing_generation - 1)
raise
tests/core/data_layer/test_data_store.py
+1 -1
View File
@@ -1243,7 +1243,7 @@ async def test_server_selection(data_store: DataStore, tree_id: bytes32) -> None
assert servers_info[0].url == "http://127.0.0.1/8000"
await data_store.received_correct_file(tree_id=tree_id, server_info=servers_info[0])
ban_times = [5 * 60] * 3 + [15 * 60] * 3 + [60 * 60] * 2 + [240 * 60] * 10
ban_times = [5 * 60] * 3 + [15 * 60] * 3 + [30 * 60] * 2 + [60 * 60] * 10
for ban_time in ban_times:
servers_info = await data_store.get_available_servers_for_store(tree_id=tree_id, timestamp=current_timestamp)
assert len(servers_info) == 1