Skip to content

Commit

Permalink
Merge remote-tracking branch 'origin/main' into tee/flag-old-batches-…
Browse files Browse the repository at this point in the history
…as-permanently-ignored-automatically
  • Loading branch information
pbeza committed Nov 20, 2024
2 parents c61c1fa + 920eba1 commit 733c27d
Show file tree
Hide file tree
Showing 3 changed files with 10 additions and 2 deletions.
1 change: 1 addition & 0 deletions prover/Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 1 addition & 0 deletions prover/crates/bin/circuit_prover/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,7 @@ zksync_core_leftovers.workspace = true
zksync_utils.workspace = true
zksync_circuit_prover_service.workspace = true
zksync_prover_job_processor.workspace = true
zksync_vlog.workspace = true

vise.workspace = true
shivini = { workspace = true, features = [
Expand Down
10 changes: 8 additions & 2 deletions prover/crates/bin/circuit_prover/src/main.rs
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@ use zksync_prover_dal::{ConnectionPool, Prover};
use zksync_prover_fri_types::PROVER_PROTOCOL_SEMANTIC_VERSION;
use zksync_prover_keystore::keystore::Keystore;
use zksync_utils::wait_for_tasks::ManagedTasks;
use zksync_vlog::prometheus::PrometheusExporterConfig;

/// On most commodity hardware, WVG can take ~30 seconds to complete.
/// GPU processing is ~1 second.
Expand Down Expand Up @@ -82,7 +83,10 @@ async fn main() -> anyhow::Result<()> {

let cancellation_token = CancellationToken::new();

let mut tasks = vec![];
let exporter_config = PrometheusExporterConfig::pull(prover_config.prometheus_port);
let (metrics_stop_sender, metrics_stop_receiver) = tokio::sync::watch::channel(false);

let mut tasks = vec![tokio::spawn(exporter_config.run(metrics_stop_receiver))];

let (witness_vector_sender, witness_vector_receiver) = tokio::sync::mpsc::channel(CHANNEL_SIZE);

Expand Down Expand Up @@ -142,7 +146,9 @@ async fn main() -> anyhow::Result<()> {
.shutdown_time
.observe(shutdown_time.elapsed());
PROVER_BINARY_METRICS.run_time.observe(start_time.elapsed());

metrics_stop_sender
.send(true)
.context("failed to stop metrics")?;
Ok(())
}
/// Loads configs necessary for proving.
Expand Down

0 comments on commit 733c27d

Please sign in to comment.