mirror/Easytier
1
0
Fork 0
mirror of https://github.com/EasyTier/EasyTier.git synced 2026-09-03 17:45:44 +00:00
Code Issues Packages Projects Releases Wiki Activity

node_mgr: fix catalog creation, step 1

Browse Source
This commit is contained in:
Luna Yao
2026-04-06 11:54:50 +02:00
parent ffa7ca3850
commit 231b7d8300
1 changed files with 18 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files
easytier/src/dns/node_mgr.rs
+18 -19
View File
@@ -8,7 +8,7 @@ use crate::proto::rpc_types::controller::BaseController;
use crate::utils::{DeterministicDigest, MapTryInto}; use crate::utils::{DeterministicDigest, MapTryInto};
use anyhow::Error; use anyhow::Error;
use hickory_server::authority::Catalog; use hickory_server::authority::Catalog;
use itertools::Itertools; use itertools::{chain, Itertools};
use moka::future::Cache; use moka::future::Cache;
use std::collections::HashSet; use std::collections::HashSet;
use std::time::Duration; use std::time::Duration;
@@ -64,23 +64,17 @@ impl DnsNodeMgr {
tracing::warn!("building catalog with zones: {:?}", zones); tracing::warn!("building catalog with zones: {:?}", zones);
let mut catalog = Catalog::new(); zones.into_iter().fold(Catalog::new(), |mut catalog, zone| {
for zone in zones.iter() {
catalog.upsert( catalog.upsert(
zone.origin.clone(), zone.origin.clone(),
zone.create_memory_authority().into_iter().collect(), chain(
zone.create_memory_authority(),
zone.create_forward_authority(),
)
.collect(),
); );
} catalog
})
for zone in zones.iter() {
catalog.upsert(
zone.origin.clone(),
zone.create_forward_authority().into_iter().collect(),
);
}
catalog
} }
pub fn collect_zones(&self) -> ZoneGroup { pub fn collect_zones(&self) -> ZoneGroup {
@@ -126,7 +120,12 @@ impl DnsNodeMgrRpc for DnsNodeMgr {
type Controller = BaseController; type Controller = BaseController;
// TODO: change level to trace // TODO: change level to trace
#[instrument(level = "debug", skip_all, fields(from = ?input.id, snapshot = ?input.snapshot), err)] #[instrument(
level = "debug",
skip_all,
fields(from = ?input.id, snapshot = ?input.snapshot),
err
)]
async fn heartbeat( async fn heartbeat(
&self, &self,
_: BaseController, _: BaseController,
@@ -169,15 +168,15 @@ impl DnsNodeMgrRpc for DnsNodeMgr {
#[cfg(test)] #[cfg(test)]
mod tests { mod tests {
use super::*; use super::*;
use crate::common::log;
use crate::dns::utils::response::ResponseHandle; use crate::dns::utils::response::ResponseHandle;
use hickory_proto::op::{Message, MessageType, OpCode, Query, ResponseCode}; use hickory_proto::op::{Message, MessageType, OpCode, Query, ResponseCode};
use hickory_proto::rr::{rdata, Name, RData, RecordType}; use hickory_proto::rr::{rdata, Name, RData, RecordType};
use hickory_proto::serialize::binary::{BinDecodable, BinDecoder, BinEncodable, BinEncoder}; use hickory_proto::serialize::binary::{BinDecodable, BinEncodable, BinEncoder};
use hickory_proto::xfer::Protocol; use hickory_proto::xfer::Protocol;
use hickory_server::authority::{MessageRequest, MessageResponse}; use hickory_server::authority::MessageRequest;
use hickory_server::server::Request; use hickory_server::server::Request;
use std::net::{Ipv4Addr, SocketAddrV4}; use std::net::{Ipv4Addr, SocketAddrV4};
use crate::common::log;
#[tokio::test] #[tokio::test]
async fn test_force_insert_node_info_then_catalog_lookup() -> anyhow::Result<()> { async fn test_force_insert_node_info_then_catalog_lookup() -> anyhow::Result<()> {