@@ -29,7 +29,7 @@ use mas_storage::Clock;
29
29
use rand:: RngCore ;
30
30
use thiserror:: Error ;
31
31
use thiserror_ext:: ContextInto ;
32
- use tracing:: { Level , Span } ;
32
+ use tracing:: { info , Level , Span } ;
33
33
use tracing_indicatif:: { span_ext:: IndicatifSpanExt , style:: ProgressStyle } ;
34
34
use ulid:: Ulid ;
35
35
use uuid:: Uuid ;
@@ -252,6 +252,8 @@ async fn migrate_users(
252
252
server_name : & str ,
253
253
rng : & mut impl RngCore ,
254
254
) -> Result < UsersMigrated , Error > {
255
+ let start = Instant :: now ( ) ;
256
+
255
257
let span = Span :: current ( ) ;
256
258
span. pb_set_style ( & ProgressStyle :: default_bar ( ) ) ;
257
259
span. pb_set_length ( user_count_hint as u64 ) ;
@@ -298,6 +300,11 @@ async fn migrate_users(
298
300
. await
299
301
. into_mas ( "writing passwords" ) ?;
300
302
303
+ info ! (
304
+ "users migrated in {:.1}s" ,
305
+ Instant :: now( ) . duration_since( start) . as_secs_f64( )
306
+ ) ;
307
+
301
308
Ok ( UsersMigrated {
302
309
user_localparts_to_uuid,
303
310
synapse_admins,
@@ -313,6 +320,8 @@ async fn migrate_threepids(
313
320
rng : & mut impl RngCore ,
314
321
user_localparts_to_uuid : & HashMap < CompactString , Uuid > ,
315
322
) -> Result < ( ) , Error > {
323
+ let start = Instant :: now ( ) ;
324
+
316
325
let span = Span :: current ( ) ;
317
326
span. pb_set_style ( & ProgressStyle :: default_bar ( ) ) ;
318
327
span. pb_set_length ( count_hint) ;
@@ -392,6 +401,11 @@ async fn migrate_threepids(
392
401
. await
393
402
. into_mas ( "writing unsupported threepids" ) ?;
394
403
404
+ info ! (
405
+ "third-party IDs migrated in {:.1}s" ,
406
+ Instant :: now( ) . duration_since( start) . as_secs_f64( )
407
+ ) ;
408
+
395
409
Ok ( ( ) )
396
410
}
397
411
@@ -409,6 +423,8 @@ async fn migrate_external_ids(
409
423
user_localparts_to_uuid : & HashMap < CompactString , Uuid > ,
410
424
provider_id_mapping : & HashMap < String , Uuid > ,
411
425
) -> Result < ( ) , Error > {
426
+ let start = Instant :: now ( ) ;
427
+
412
428
let span = Span :: current ( ) ;
413
429
span. pb_set_style ( & ProgressStyle :: default_bar ( ) ) ;
414
430
span. pb_set_length ( count_hint) ;
@@ -470,7 +486,12 @@ async fn migrate_external_ids(
470
486
write_buffer
471
487
. finish ( mas)
472
488
. await
473
- . into_mas ( "writing threepids" ) ?;
489
+ . into_mas ( "writing upstream links" ) ?;
490
+
491
+ info ! (
492
+ "upstream links (external IDs) migrated in {:.1}s" ,
493
+ Instant :: now( ) . duration_since( start) . as_secs_f64( )
494
+ ) ;
474
495
475
496
Ok ( ( ) )
476
497
}
@@ -495,6 +516,8 @@ async fn migrate_devices(
495
516
devices : & mut HashMap < ( Uuid , CompactString ) , Uuid > ,
496
517
synapse_admins : & HashSet < Uuid > ,
497
518
) -> Result < ( ) , Error > {
519
+ let start = Instant :: now ( ) ;
520
+
498
521
let span = Span :: current ( ) ;
499
522
span. pb_set_style ( & ProgressStyle :: default_bar ( ) ) ;
500
523
span. pb_set_length ( count_hint) ;
@@ -579,6 +602,11 @@ async fn migrate_devices(
579
602
. await
580
603
. into_mas ( "writing compat sessions" ) ?;
581
604
605
+ info ! (
606
+ "devices migrated in {:.1}s" ,
607
+ Instant :: now( ) . duration_since( start) . as_secs_f64( )
608
+ ) ;
609
+
582
610
Ok ( ( ) )
583
611
}
584
612
@@ -596,6 +624,8 @@ async fn migrate_unrefreshable_access_tokens(
596
624
user_localparts_to_uuid : & HashMap < CompactString , Uuid > ,
597
625
devices : & mut HashMap < ( Uuid , CompactString ) , Uuid > ,
598
626
) -> Result < ( ) , Error > {
627
+ let start = Instant :: now ( ) ;
628
+
599
629
let span = Span :: current ( ) ;
600
630
span. pb_set_style ( & ProgressStyle :: default_bar ( ) ) ;
601
631
span. pb_set_length ( count_hint) ;
@@ -697,6 +727,11 @@ async fn migrate_unrefreshable_access_tokens(
697
727
. await
698
728
. into_mas ( "writing deviceless compat sessions" ) ?;
699
729
730
+ info ! (
731
+ "non-refreshable access tokens migrated in {:.1}s" ,
732
+ Instant :: now( ) . duration_since( start) . as_secs_f64( )
733
+ ) ;
734
+
700
735
Ok ( ( ) )
701
736
}
702
737
@@ -714,6 +749,8 @@ async fn migrate_refreshable_token_pairs(
714
749
user_localparts_to_uuid : & HashMap < CompactString , Uuid > ,
715
750
devices : & mut HashMap < ( Uuid , CompactString ) , Uuid > ,
716
751
) -> Result < ( ) , Error > {
752
+ let start = Instant :: now ( ) ;
753
+
717
754
let span = Span :: current ( ) ;
718
755
span. pb_set_style ( & ProgressStyle :: default_bar ( ) ) ;
719
756
span. pb_set_length ( count_hint) ;
@@ -803,6 +840,11 @@ async fn migrate_refreshable_token_pairs(
803
840
. await
804
841
. into_mas ( "writing compat refresh tokens" ) ?;
805
842
843
+ info ! (
844
+ "refreshable token pairs migrated in {:.1}s" ,
845
+ Instant :: now( ) . duration_since( start) . as_secs_f64( )
846
+ ) ;
847
+
806
848
Ok ( ( ) )
807
849
}
808
850
0 commit comments