gaspersic/solana
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Avoid tmp snapshot backlog in SnapshotPackagerService under high load (#14516)

Browse Source
This commit is contained in:
Michael Vines
2021-01-11 10:21:15 -08:00
committed by GitHub
parent 3fb9f017d3
commit a95675a7ce
6 changed files with 95 additions and 56 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
core/src/validator.rs
View File

@ -26,7 +26,7 @@ use crate::{
serve_repair::ServeRepair,
serve_repair_service::ServeRepairService,
sigverify,
snapshot_packager_service::SnapshotPackagerService,
snapshot_packager_service::{PendingSnapshotPackage, SnapshotPackagerService},
tpu::Tpu,
transaction_status_service::TransactionStatusService,
tvu::{Sockets, Tvu, TvuConfig},
@ -70,7 +70,7 @@ use std::{
path::{Path, PathBuf},
sync::atomic::{AtomicBool, Ordering},
sync::mpsc::Receiver,
sync::{mpsc::channel, Arc, Mutex, RwLock},
sync::{Arc, Mutex, RwLock},
thread::sleep,
time::Duration,
};
@ -518,7 +518,7 @@ impl Validator {
&exit,
);
let (snapshot_packager_service, snapshot_config_and_package_sender) =
let (snapshot_packager_service, snapshot_config_and_pending_package) =
if let Some(snapshot_config) = config.snapshot_config.clone() {
if is_snapshot_config_invalid(
snapshot_config.snapshot_interval_slots,
@ -528,12 +528,17 @@ impl Validator {
}
// Start a snapshot packaging service
let (sender, receiver) = channel();
let snapshot_packager_service =
SnapshotPackagerService::new(receiver, snapshot_hash, &exit, &cluster_info);
let pending_snapshot_package = PendingSnapshotPackage::default();
let snapshot_packager_service = SnapshotPackagerService::new(
pending_snapshot_package.clone(),
snapshot_hash,
&exit,
&cluster_info,
);
(
Some(snapshot_packager_service),
Some((snapshot_config, sender)),
Some((snapshot_config, pending_snapshot_package)),
)
} else {
(None, None)
@ -609,7 +614,7 @@ impl Validator {
transaction_status_sender.clone(),
rewards_recorder_sender,
cache_block_time_sender,
snapshot_config_and_package_sender,
snapshot_config_and_pending_package,
vote_tracker.clone(),
retransmit_slots_sender,
verified_vote_receiver,