Skip to content

syn2mas: remove obsolete TODOs #4267

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Mar 19, 2025
Merged

syn2mas: remove obsolete TODOs #4267

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 1 addition & 4 deletions crates/syn2mas/src/mas_writer/mod.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1084,10 +1084,7 @@ impl MasWriter {
}

// How many entries to buffer at once, before writing a batch of rows to the
// database. TODO tune: didn't see that much difference between 4k and 64k
// (4k: 13.5~14, 64k: 12.5~13s — streaming the whole way would be better,
// especially for DB latency, but probably fiiine and also we won't be able to
// stream to two tables at once...)
// database.
const WRITE_BUFFER_BATCH_SIZE: usize = 4096;

/// A function that can accept and flush buffers from a `MasWriteBuffer`.
Expand Down
1 change: 0 additions & 1 deletion crates/syn2mas/src/migration.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -713,7 +713,6 @@ async fn migrate_devices(
.ok()
});

// TODO skip access tokens for deactivated users
write_buffer
.write(
&mut mas,
Expand Down
5 changes: 2 additions & 3 deletions crates/syn2mas/src/synapse_reader/checks.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -140,7 +140,8 @@ pub fn synapse_config_check(synapse_config: &Config) -> (Vec<CheckWarning>, Vec<
warnings.push(CheckWarning::DisableUserConsentAfterMigration);
}

// TODO provide guidance on migrating these
// TODO provide guidance on migrating these auth systems
// that are not directly supported as upstreams in MAS
if synapse_config.cas_config.enabled {
warnings.push(CheckWarning::ExternalAuthSystem("CAS"));
}
Expand All @@ -150,8 +151,6 @@ pub fn synapse_config_check(synapse_config: &Config) -> (Vec<CheckWarning>, Vec<
if synapse_config.jwt_config.enabled {
warnings.push(CheckWarning::ExternalAuthSystem("JWT"));
}

// TODO provide guidance on migrating these
if synapse_config.password_config.enabled && !synapse_config.password_config.localdb_enabled {
warnings.push(CheckWarning::ExternalAuthSystem(
"non-standard password provider plugin",
Expand Down
3 changes: 0 additions & 3 deletions crates/syn2mas/src/synapse_reader/mod.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -193,7 +193,6 @@ pub struct SynapseUser {
/// Note that not all numeric user IDs are guests; guests can upgrade their
/// account!
pub is_guest: SynapseBool,
// TODO do we care about upgrade_ts (users who upgraded from guest accounts to real accounts)
/// The ID of the appservice that created this user, if any.
pub appservice_id: Option<String>,
}
Expand Down Expand Up @@ -252,7 +251,6 @@ pub struct SynapseRefreshableTokenPair {
/// This is a safety measure against other processes changing the data
/// underneath our feet. It's still not a good idea to run Synapse at the same
/// time as the migration.
// TODO not complete!
const TABLES_TO_LOCK: &[&str] = &[
"users",
"user_threepids",
Expand Down Expand Up @@ -328,7 +326,6 @@ impl<'conn> SynapseReader<'conn> {
///
/// - An underlying database error whilst committing the transaction.
pub async fn finish(self) -> Result<(), Error> {
// TODO enforce that this is called somehow.
self.txn.commit().await.into_database("end transaction")?;
Ok(())
}
Expand Down
Loading