Skip to content

web search done right

progress messages when starting workers

Mikkel Denker761eba772e11
diff --git a/crates/core/src/entrypoint/ampc/approximated_harmonic_centrality/worker.rs b/crates/core/src/entrypoint/ampc/approximated_harmonic_centrality/worker.rs
index d6a37a35..46e3ba4d 100644
--- a/crates/core/src/entrypoint/ampc/approximated_harmonic_centrality/worker.rs
+++ b/crates/core/src/entrypoint/ampc/approximated_harmonic_centrality/worker.rs
@@ -128,6 +128,7 @@ impl RemoteWorker for RemoteApproxCentralityWorker {
}
pub fn run(config: ApproxHarmonicWorkerConfig) -> Result<()> {
+ tracing::info!("starting worker");
let tokio_conf = config.clone();
let graph = Webgraph::builder(config.graph_path, config.shard).open()?;
@@ -138,6 +139,7 @@ pub fn run(config: ApproxHarmonicWorkerConfig) -> Result<()> {
};
crate::start_gossip_cluster_thread(tokio_conf.gossip, Some(service));
+ tracing::info!("worker ready");
worker.run(config.host)?;
Ok(())
diff --git a/crates/core/src/entrypoint/ampc/harmonic_centrality/coordinator.rs b/crates/core/src/entrypoint/ampc/harmonic_centrality/coordinator.rs
index cf28c839..9c5d8321 100644
--- a/crates/core/src/entrypoint/ampc/harmonic_centrality/coordinator.rs
+++ b/crates/core/src/entrypoint/ampc/harmonic_centrality/coordinator.rs
@@ -190,7 +190,7 @@ pub fn run(config: HarmonicCoordinatorConfig) -> Result<()> {
.build()?
.block_on(setup_gossip(tokio_conf))?;
- let jobs = cluster
+ let jobs: Vec<_> = cluster
.workers
.iter()
.map(|worker| CentralityJob {
@@ -198,6 +198,8 @@ pub fn run(config: HarmonicCoordinatorConfig) -> Result<()> {
})
.collect();
+ tracing::info!("starting {} jobs", jobs.len());
+
let coordinator = build(&cluster.dht, cluster.workers.clone());
let res = coordinator.run(jobs, CentralityFinish)?;
diff --git a/crates/core/src/entrypoint/ampc/harmonic_centrality/worker.rs b/crates/core/src/entrypoint/ampc/harmonic_centrality/worker.rs
index 6018821b..fc96fcc7 100644
--- a/crates/core/src/entrypoint/ampc/harmonic_centrality/worker.rs
+++ b/crates/core/src/entrypoint/ampc/harmonic_centrality/worker.rs
@@ -42,6 +42,7 @@ pub struct CentralityWorker {
changed_nodes: Arc<Mutex<U64BloomFilter>>,
round: AtomicU64,
has_updated_meta_for_round: AtomicBool,
+ num_nodes: u64,
}
impl CentralityWorker {
@@ -52,6 +53,7 @@ impl CentralityWorker {
changed_nodes.fill();
Self {
+ num_nodes,
shard,
graph,
changed_nodes: Arc::new(Mutex::new(changed_nodes)),
@@ -107,7 +109,7 @@ impl Message<CentralityWorker> for NumNodes {
type Response = u64;
fn handle(self, worker: &CentralityWorker) -> Self::Response {
- worker.graph.host_nodes().len() as u64
+ worker.num_nodes
}
}
@@ -173,6 +175,7 @@ impl RemoteWorker for RemoteCentralityWorker {
}
pub fn run(config: HarmonicWorkerConfig) -> Result<()> {
+ tracing::info!("starting worker");
let tokio_conf = config.clone();
let graph = Webgraph::builder(config.graph_path, config.shard).open()?;
@@ -183,6 +186,7 @@ pub fn run(config: HarmonicWorkerConfig) -> Result<()> {
};
crate::start_gossip_cluster_thread(tokio_conf.gossip, Some(service));
+ tracing::info!("worker ready");
worker.run(config.host)?;
Ok(())