From 31c8a08dd1309069bb1144fe4716ad1f8eb657ea Mon Sep 17 00:00:00 2001
From: Quentin Gliech <quenting@element.io>
Date: Tue, 22 Apr 2025 17:57:30 +0200
Subject: [PATCH] syn2mas: spawn the writer connections in parallel

Also make sure we have a single span for them
---
 crates/cli/src/commands/syn2mas.rs | 12 +++++-------
 1 file changed, 5 insertions(+), 7 deletions(-)

diff --git a/crates/cli/src/commands/syn2mas.rs b/crates/cli/src/commands/syn2mas.rs
index 473afed54..bc1ae72f1 100644
--- a/crates/cli/src/commands/syn2mas.rs
+++ b/crates/cli/src/commands/syn2mas.rs
@@ -231,18 +231,17 @@ impl Options {
 
                 // TODO this dry-run flag should be set to false in real circumstances !!!
                 let reader = SynapseReader::new(&mut syn_conn, true).await?;
-                let mut writer_mas_connections = Vec::with_capacity(NUM_WRITER_CONNECTIONS);
-                for _ in 0..NUM_WRITER_CONNECTIONS {
-                    writer_mas_connections.push(
+                let writer_mas_connections =
+                    futures_util::future::try_join_all((0..NUM_WRITER_CONNECTIONS).map(|_| {
                         database_connection_from_config_with_options(
                             &config,
                             &DatabaseConnectOptions {
                                 log_slow_statements: false,
                             },
                         )
-                        .await?,
-                    );
-                }
+                    }))
+                    .instrument(tracing::info_span!("syn2mas.mas_writer_connections"))
+                    .await?;
                 let writer = MasWriter::new(mas_connection, writer_mas_connections).await?;
 
                 let clock = SystemClock::default();
@@ -256,7 +255,6 @@ impl Options {
                     tokio::spawn(occasional_progress_logger(progress.clone()));
 
                 let mas_matrix = MatrixConfig::extract(figment)?;
-                eprintln!("\n\n");
                 syn2mas::migrate(
                     reader,
                     writer,