external/ton
1
0
Fork 0
mirror of https://github.com/ton-blockchain/ton synced 2025-03-09 15:40:10 +00:00
Code Issues Releases Wiki Activity

Send telemetry broadcasts to fast sync overlays

Browse source
This commit is contained in:
SpyCheese 2024-11-26 10:53:55 +03:00
parent e6aac0b143
commit d9aeab07db
8 changed files with 141 additions and 27 deletions
Download patch file Download diff file Expand all files Collapse all files

68
validator/full-node.cpp
View file

@ -279,6 +279,7 @@ void FullNodeImpl::on_new_masterchain_block(td::Ref<MasterchainState> state, std
fast_sync_overlays_.update_overlays(state, std::move(my_adnl_ids), std::move(monitoring_shards),
zero_state_file_hash_, keyring_, adnl_, overlays_, validator_manager_,
actor_id(this));
update_validator_telemetry_collector();
}
}
@ -338,7 +339,7 @@ void FullNodeImpl::send_shard_block_info(BlockIdExt block_id, CatchainSeqno cc_s
td::actor::send_closure(private_block_overlays_.begin()->second,
&FullNodePrivateBlockOverlay::send_shard_block_info, block_id, cc_seqno, data.clone());
}
auto fast_sync_overlay = fast_sync_overlays_.choose_overlay(ShardIdFull(masterchainId));
auto fast_sync_overlay = fast_sync_overlays_.choose_overlay(ShardIdFull(masterchainId)).first;
if (!fast_sync_overlay.empty()) {
td::actor::send_closure(fast_sync_overlay, &FullNodeFastSyncOverlay::send_shard_block_info, block_id, cc_seqno,
data.clone());
@ -358,7 +359,7 @@ void FullNodeImpl::send_block_candidate(BlockIdExt block_id, CatchainSeqno cc_se
td::actor::send_closure(private_block_overlays_.begin()->second, &FullNodePrivateBlockOverlay::send_block_candidate,
block_id, cc_seqno, validator_set_hash, data.clone());
}
auto fast_sync_overlay = fast_sync_overlays_.choose_overlay(block_id.shard_full());
auto fast_sync_overlay = fast_sync_overlays_.choose_overlay(block_id.shard_full()).first;
if (!fast_sync_overlay.empty()) {
td::actor::send_closure(fast_sync_overlay, &FullNodeFastSyncOverlay::send_block_candidate, block_id, cc_seqno,
validator_set_hash, data.clone());
@ -383,7 +384,7 @@ void FullNodeImpl::send_broadcast(BlockBroadcast broadcast, int mode) {
td::actor::send_closure(private_block_overlays_.begin()->second, &FullNodePrivateBlockOverlay::send_broadcast,
broadcast.clone());
}
auto fast_sync_overlay = fast_sync_overlays_.choose_overlay(broadcast.block_id.shard_full());
auto fast_sync_overlay = fast_sync_overlays_.choose_overlay(broadcast.block_id.shard_full()).first;
if (!fast_sync_overlay.empty()) {
td::actor::send_closure(fast_sync_overlay, &FullNodeFastSyncOverlay::send_broadcast, broadcast.clone());
}
@ -595,12 +596,21 @@ void FullNodeImpl::new_key_block(BlockHandle handle) {
}
void FullNodeImpl::send_validator_telemetry(PublicKeyHash key, tl_object_ptr<ton_api::validator_telemetry> telemetry) {
auto it = private_block_overlays_.find(key);
if (it == private_block_overlays_.end()) {
VLOG(FULL_NODE_INFO) << "Cannot send validator telemetry for " << key << " : no private block overlay";
return;
if (use_old_private_overlays_) {
auto it = private_block_overlays_.find(key);
if (it == private_block_overlays_.end()) {
VLOG(FULL_NODE_INFO) << "Cannot send validator telemetry for " << key << " : no private block overlay";
return;
}
td::actor::send_closure(it->second, &FullNodePrivateBlockOverlay::send_validator_telemetry, std::move(telemetry));
} else {
auto overlay = fast_sync_overlays_.get_masterchain_overlay_for(adnl::AdnlNodeIdShort{telemetry->adnl_id_});
if (overlay.empty()) {
VLOG(FULL_NODE_INFO) << "Cannot send validator telemetry for adnl id " << key << " : no fast sync overlay";
return;
}
td::actor::send_closure(overlay, &FullNodeFastSyncOverlay::send_validator_telemetry, std::move(telemetry));
}
td::actor::send_closure(it->second, &FullNodePrivateBlockOverlay::send_validator_telemetry, std::move(telemetry));
}
void FullNodeImpl::process_block_broadcast(BlockBroadcast broadcast) {
@ -631,19 +641,43 @@ void FullNodeImpl::set_validator_telemetry_filename(std::string value) {
}
void FullNodeImpl::update_validator_telemetry_collector() {
if (validator_telemetry_filename_.empty() || private_block_overlays_.empty()) {
validator_telemetry_collector_key_ = PublicKeyHash::zero();
return;
}
if (!private_block_overlays_.contains(validator_telemetry_collector_key_)) {
auto it = private_block_overlays_.begin();
validator_telemetry_collector_key_ = it->first;
td::actor::send_closure(it->second, &FullNodePrivateBlockOverlay::collect_validator_telemetry,
validator_telemetry_filename_);
if (use_old_private_overlays_) {
if (validator_telemetry_filename_.empty() || private_block_overlays_.empty()) {
validator_telemetry_collector_key_ = PublicKeyHash::zero();
return;
}
if (!private_block_overlays_.contains(validator_telemetry_collector_key_)) {
auto it = private_block_overlays_.begin();
validator_telemetry_collector_key_ = it->first;
td::actor::send_closure(it->second, &FullNodePrivateBlockOverlay::collect_validator_telemetry,
validator_telemetry_filename_);
}
} else {
if (validator_telemetry_filename_.empty()) {
validator_telemetry_collector_key_ = PublicKeyHash::zero();
return;
}
if (fast_sync_overlays_.get_masterchain_overlay_for(adnl::AdnlNodeIdShort{validator_telemetry_collector_key_})
.empty()) {
auto [actor, adnl_id] = fast_sync_overlays_.choose_overlay(ShardIdFull{masterchainId});
validator_telemetry_collector_key_ = adnl_id.pubkey_hash();
if (!actor.empty()) {
td::actor::send_closure(actor, &FullNodeFastSyncOverlay::collect_validator_telemetry,
validator_telemetry_filename_);
}
}
}
}
void FullNodeImpl::start_up() {
// TODO: enable fast sync overlays by other means (e.g. some config param)
// TODO: in the future - remove the old private overlay entirely
// This env var is for testing
auto fast_sync_env = getenv("TON_FAST_SYNC_OVERLAYS");
if (fast_sync_env && !strcmp(fast_sync_env, "1")) {
use_old_private_overlays_ = false;
}
update_shard_actor(ShardIdFull{masterchainId}, true);
if (local_id_.is_zero()) {
if (adnl_id_.is_zero()) {