Yehowshua/ZIm
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fix stale server queries, use foreign keys from connectionsn to servers

Browse source
This commit is contained in:
Max Brunsfeld 2022-12-14 17:34:24 -08:00
parent 363e3cae4b
commit 6c58a4f885
10 changed files with 128 additions and 122 deletions
Download patch file Download diff file Expand all files Collapse all files

1
crates/collab/.env.toml
View file

@ -2,6 +2,7 @@ DATABASE_URL = "postgres://postgres@localhost/zed"
HTTP_PORT = 8080 HTTP_PORT = 8080
API_TOKEN = "secret" API_TOKEN = "secret"
INVITE_LINK_PREFIX = "http://localhost:3000/invites/" INVITE_LINK_PREFIX = "http://localhost:3000/invites/"
ZED_ENVIRONMENT = "development"
LIVE_KIT_SERVER = "http://localhost:7880" LIVE_KIT_SERVER = "http://localhost:7880"
LIVE_KIT_KEY = "devkey" LIVE_KIT_KEY = "devkey"
LIVE_KIT_SECRET = "secret" LIVE_KIT_SECRET = "secret"

10
crates/collab/migrations.sqlite/20221109000000_test_schema.sql
View file

@ -44,7 +44,7 @@ CREATE TABLE "projects" (
"room_id" INTEGER REFERENCES rooms (id) NOT NULL, "room_id" INTEGER REFERENCES rooms (id) NOT NULL,
"host_user_id" INTEGER REFERENCES users (id) NOT NULL, "host_user_id" INTEGER REFERENCES users (id) NOT NULL,
"host_connection_id" INTEGER NOT NULL, "host_connection_id" INTEGER NOT NULL,
"host_connection_epoch" INTEGER NOT NULL, "host_connection_server_id" INTEGER NOT NULL REFERENCES servers (id) ON DELETE CASCADE,
"unregistered" BOOLEAN NOT NULL DEFAULT FALSE "unregistered" BOOLEAN NOT NULL DEFAULT FALSE
); );
CREATE INDEX "index_projects_on_host_connection_epoch" ON "projects" ("host_connection_epoch"); CREATE INDEX "index_projects_on_host_connection_epoch" ON "projects" ("host_connection_epoch");
@ -103,7 +103,7 @@ CREATE TABLE "project_collaborators" (
"id" INTEGER PRIMARY KEY AUTOINCREMENT, "id" INTEGER PRIMARY KEY AUTOINCREMENT,
"project_id" INTEGER NOT NULL REFERENCES projects (id) ON DELETE CASCADE, "project_id" INTEGER NOT NULL REFERENCES projects (id) ON DELETE CASCADE,
"connection_id" INTEGER NOT NULL, "connection_id" INTEGER NOT NULL,
"connection_epoch" INTEGER NOT NULL, "connection_server_id" INTEGER NOT NULL REFERENCES servers (id) ON DELETE CASCADE,
"user_id" INTEGER NOT NULL, "user_id" INTEGER NOT NULL,
"replica_id" INTEGER NOT NULL, "replica_id" INTEGER NOT NULL,
"is_host" BOOLEAN NOT NULL "is_host" BOOLEAN NOT NULL
@ -119,14 +119,14 @@ CREATE TABLE "room_participants" (
"room_id" INTEGER NOT NULL REFERENCES rooms (id), "room_id" INTEGER NOT NULL REFERENCES rooms (id),
"user_id" INTEGER NOT NULL REFERENCES users (id), "user_id" INTEGER NOT NULL REFERENCES users (id),
"answering_connection_id" INTEGER, "answering_connection_id" INTEGER,
"answering_connection_epoch" INTEGER, "answering_connection_server_id" INTEGER REFERENCES servers (id) ON DELETE CASCADE,
"answering_connection_lost" BOOLEAN NOT NULL, "answering_connection_lost" BOOLEAN NOT NULL,
"location_kind" INTEGER, "location_kind" INTEGER,
"location_project_id" INTEGER, "location_project_id" INTEGER,
"initial_project_id" INTEGER, "initial_project_id" INTEGER,
"calling_user_id" INTEGER NOT NULL REFERENCES users (id), "calling_user_id" INTEGER NOT NULL REFERENCES users (id),
"calling_connection_id" INTEGER NOT NULL, "calling_connection_id" INTEGER NOT NULL,
"calling_connection_epoch" INTEGER NOT NULL "calling_connection_server_id" INTEGER REFERENCES servers (id) ON DELETE SET NULL
); );
CREATE UNIQUE INDEX "index_room_participants_on_user_id" ON "room_participants" ("user_id"); CREATE UNIQUE INDEX "index_room_participants_on_user_id" ON "room_participants" ("user_id");
CREATE INDEX "index_room_participants_on_room_id" ON "room_participants" ("room_id"); CREATE INDEX "index_room_participants_on_room_id" ON "room_participants" ("room_id");
@ -136,6 +136,6 @@ CREATE INDEX "index_room_participants_on_answering_connection_id" ON "room_parti
CREATE UNIQUE INDEX "index_room_participants_on_answering_connection_id_and_answering_connection_epoch" ON "room_participants" ("answering_connection_id", "answering_connection_epoch"); CREATE UNIQUE INDEX "index_room_participants_on_answering_connection_id_and_answering_connection_epoch" ON "room_participants" ("answering_connection_id", "answering_connection_epoch");
CREATE TABLE "servers" ( CREATE TABLE "servers" (
"epoch" INTEGER PRIMARY KEY AUTOINCREMENT, "id" INTEGER PRIMARY KEY AUTOINCREMENT,
"environment" VARCHAR NOT NULL "environment" VARCHAR NOT NULL
); );

34
crates/collab/migrations/20221214144346_change_epoch_from_uuid_to_integer.sql
View file

@ -1,14 +1,22 @@
ALTER TABLE "projects" CREATE TABLE servers (
ALTER COLUMN "host_connection_epoch" TYPE INTEGER USING -1; id SERIAL PRIMARY KEY,
environment VARCHAR NOT NULL
ALTER TABLE "project_collaborators"
ALTER COLUMN "connection_epoch" TYPE INTEGER USING -1;
ALTER TABLE "room_participants"
ALTER COLUMN "answering_connection_epoch" TYPE INTEGER USING -1,
ALTER COLUMN "calling_connection_epoch" TYPE INTEGER USING -1;
CREATE TABLE "servers" (
"epoch" SERIAL PRIMARY KEY,
"environment" VARCHAR NOT NULL
); );
DELETE FROM projects;
ALTER TABLE projects
DROP COLUMN host_connection_epoch,
ADD COLUMN host_connection_server_id INTEGER NOT NULL REFERENCES servers (id) ON DELETE CASCADE;
DELETE FROM project_collaborators;
ALTER TABLE project_collaborators
DROP COLUMN connection_epoch,
ADD COLUMN connection_server_id INTEGER NOT NULL REFERENCES servers (id) ON DELETE CASCADE;
DELETE FROM room_participants;
ALTER TABLE room_participants
DROP COLUMN answering_connection_epoch,
DROP COLUMN calling_connection_epoch,
ADD COLUMN answering_connection_server_id INTEGER REFERENCES servers (id) ON DELETE CASCADE,
ADD COLUMN calling_connection_server_id INTEGER REFERENCES servers (id) ON DELETE SET NULL;

151
crates/collab/src/db.rs
View file

@ -110,7 +110,7 @@ impl Database {
Ok(new_migrations) Ok(new_migrations)
} }
pub async fn create_server(&self, environment: &str) -> Result<ServerEpoch> { pub async fn create_server(&self, environment: &str) -> Result<ServerId> {
self.transaction(|tx| async move { self.transaction(|tx| async move {
let server = server::ActiveModel { let server = server::ActiveModel {
environment: ActiveValue::set(environment.into()), environment: ActiveValue::set(environment.into()),
@ -118,30 +118,29 @@ impl Database {
} }
.insert(&*tx) .insert(&*tx)
.await?; .await?;
Ok(server.epoch) Ok(server.id)
}) })
.await .await
} }
pub async fn delete_stale_projects( pub async fn delete_stale_projects(
&self, &self,
new_epoch: ServerEpoch, new_epoch: ServerId,
environment: &str, environment: &str,
) -> Result<()> { ) -> Result<()> {
self.transaction(|tx| async move { self.transaction(|tx| async move {
let stale_server_epochs = self let stale_server_epochs = self.stale_server_ids(environment, new_epoch, &tx).await?;
.stale_server_epochs(environment, new_epoch, &tx)
.await?;
project_collaborator::Entity::delete_many() project_collaborator::Entity::delete_many()
.filter( .filter(
project_collaborator::Column::ConnectionEpoch project_collaborator::Column::ConnectionServerId
.is_in(stale_server_epochs.iter().copied()), .is_in(stale_server_epochs.iter().copied()),
) )
.exec(&*tx) .exec(&*tx)
.await?; .await?;
project::Entity::delete_many() project::Entity::delete_many()
.filter( .filter(
project::Column::HostConnectionEpoch.is_in(stale_server_epochs.iter().copied()), project::Column::HostConnectionServerId
.is_in(stale_server_epochs.iter().copied()),
) )
.exec(&*tx) .exec(&*tx)
.await?; .await?;
@ -152,7 +151,7 @@ impl Database {
pub async fn stale_room_ids( pub async fn stale_room_ids(
&self, &self,
new_epoch: ServerEpoch, new_epoch: ServerId,
environment: &str, environment: &str,
) -> Result<Vec<RoomId>> { ) -> Result<Vec<RoomId>> {
self.transaction(|tx| async move { self.transaction(|tx| async move {
@ -161,15 +160,14 @@ impl Database {
RoomId, RoomId,
} }
let stale_server_epochs = self let stale_server_epochs = self.stale_server_ids(environment, new_epoch, &tx).await?;
.stale_server_epochs(environment, new_epoch, &tx)
.await?;
Ok(room_participant::Entity::find() Ok(room_participant::Entity::find()
.select_only() .select_only()
.column(room_participant::Column::RoomId) .column(room_participant::Column::RoomId)
.distinct() .distinct()
.filter( .filter(
room_participant::Column::AnsweringConnectionEpoch.is_in(stale_server_epochs), room_participant::Column::AnsweringConnectionServerId
.is_in(stale_server_epochs),
) )
.into_values::<_, QueryAs>() .into_values::<_, QueryAs>()
.all(&*tx) .all(&*tx)
@ -181,13 +179,13 @@ impl Database {
pub async fn refresh_room( pub async fn refresh_room(
&self, &self,
room_id: RoomId, room_id: RoomId,
new_epoch: ServerEpoch, new_epoch: ServerId,
) -> Result<RoomGuard<RefreshedRoom>> { ) -> Result<RoomGuard<RefreshedRoom>> {
self.room_transaction(|tx| async move { self.room_transaction(|tx| async move {
let stale_participant_filter = Condition::all() let stale_participant_filter = Condition::all()
.add(room_participant::Column::RoomId.eq(room_id)) .add(room_participant::Column::RoomId.eq(room_id))
.add(room_participant::Column::AnsweringConnectionId.is_not_null()) .add(room_participant::Column::AnsweringConnectionId.is_not_null())
.add(room_participant::Column::AnsweringConnectionEpoch.ne(new_epoch)); .add(room_participant::Column::AnsweringConnectionServerId.ne(new_epoch));
let stale_participant_user_ids = room_participant::Entity::find() let stale_participant_user_ids = room_participant::Entity::find()
.filter(stale_participant_filter.clone()) .filter(stale_participant_filter.clone())
@ -231,19 +229,13 @@ impl Database {
.await .await
} }
pub async fn delete_stale_servers( pub async fn delete_stale_servers(&self, new_epoch: ServerId, environment: &str) -> Result<()> {
&self,
new_epoch: ServerEpoch,
environment: &str,
) -> Result<()> {
self.transaction(|tx| async move { self.transaction(|tx| async move {
server::Entity::delete_many() server::Entity::delete_many()
.filter( .filter(
Condition::all().add( Condition::all()
server::Column::Environment .add(server::Column::Environment.eq(environment))
.eq(environment) .add(server::Column::Id.ne(new_epoch)),
.add(server::Column::Epoch.ne(new_epoch)),
),
) )
.exec(&*tx) .exec(&*tx)
.await?; .await?;
@ -252,26 +244,21 @@ impl Database {
.await .await
} }
async fn stale_server_epochs( async fn stale_server_ids(
&self, &self,
environment: &str, environment: &str,
new_epoch: ServerEpoch, new_epoch: ServerId,
tx: &DatabaseTransaction, tx: &DatabaseTransaction,
) -> Result<Vec<ServerEpoch>> { ) -> Result<Vec<ServerId>> {
let stale_servers = server::Entity::find() let stale_servers = server::Entity::find()
.filter( .filter(
Condition::all().add( Condition::all()
server::Column::Environment .add(server::Column::Environment.eq(environment))
.eq(environment) .add(server::Column::Id.ne(new_epoch)),
.add(server::Column::Epoch.ne(new_epoch)),
),
) )
.all(&*tx) .all(&*tx)
.await?; .await?;
Ok(stale_servers Ok(stale_servers.into_iter().map(|server| server.id).collect())
.into_iter()
.map(|server| server.epoch)
.collect())
} }
// users // users
@ -1167,11 +1154,15 @@ impl Database {
room_id: ActiveValue::set(room_id), room_id: ActiveValue::set(room_id),
user_id: ActiveValue::set(user_id), user_id: ActiveValue::set(user_id),
answering_connection_id: ActiveValue::set(Some(connection.id as i32)), answering_connection_id: ActiveValue::set(Some(connection.id as i32)),
answering_connection_epoch: ActiveValue::set(Some(connection.epoch as i32)), answering_connection_server_id: ActiveValue::set(Some(ServerId(
connection.epoch as i32,
))),
answering_connection_lost: ActiveValue::set(false), answering_connection_lost: ActiveValue::set(false),
calling_user_id: ActiveValue::set(user_id), calling_user_id: ActiveValue::set(user_id),
calling_connection_id: ActiveValue::set(connection.id as i32), calling_connection_id: ActiveValue::set(connection.id as i32),
calling_connection_epoch: ActiveValue::set(connection.epoch as i32), calling_connection_server_id: ActiveValue::set(Some(ServerId(
connection.epoch as i32,
))),
..Default::default() ..Default::default()
} }
.insert(&*tx) .insert(&*tx)
@ -1198,7 +1189,9 @@ impl Database {
answering_connection_lost: ActiveValue::set(false), answering_connection_lost: ActiveValue::set(false),
calling_user_id: ActiveValue::set(calling_user_id), calling_user_id: ActiveValue::set(calling_user_id),
calling_connection_id: ActiveValue::set(calling_connection.id as i32), calling_connection_id: ActiveValue::set(calling_connection.id as i32),
calling_connection_epoch: ActiveValue::set(calling_connection.epoch as i32), calling_connection_server_id: ActiveValue::set(Some(ServerId(
calling_connection.epoch as i32,
))),
initial_project_id: ActiveValue::set(initial_project_id), initial_project_id: ActiveValue::set(initial_project_id),
..Default::default() ..Default::default()
} }
@ -1280,7 +1273,7 @@ impl Database {
.eq(calling_connection.id as i32), .eq(calling_connection.id as i32),
) )
.add( .add(
room_participant::Column::CallingConnectionEpoch room_participant::Column::CallingConnectionServerId
.eq(calling_connection.epoch as i32), .eq(calling_connection.epoch as i32),
) )
.add(room_participant::Column::AnsweringConnectionId.is_null()), .add(room_participant::Column::AnsweringConnectionId.is_null()),
@ -1320,14 +1313,16 @@ impl Database {
.add(room_participant::Column::AnsweringConnectionId.is_null()) .add(room_participant::Column::AnsweringConnectionId.is_null())
.add(room_participant::Column::AnsweringConnectionLost.eq(true)) .add(room_participant::Column::AnsweringConnectionLost.eq(true))
.add( .add(
room_participant::Column::AnsweringConnectionEpoch room_participant::Column::AnsweringConnectionServerId
.ne(connection.epoch as i32), .ne(connection.epoch as i32),
), ),
), ),
) )
.set(room_participant::ActiveModel { .set(room_participant::ActiveModel {
answering_connection_id: ActiveValue::set(Some(connection.id as i32)), answering_connection_id: ActiveValue::set(Some(connection.id as i32)),
answering_connection_epoch: ActiveValue::set(Some(connection.epoch as i32)), answering_connection_server_id: ActiveValue::set(Some(ServerId(
connection.epoch as i32,
))),
answering_connection_lost: ActiveValue::set(false), answering_connection_lost: ActiveValue::set(false),
..Default::default() ..Default::default()
}) })
@ -1353,7 +1348,7 @@ impl Database {
.eq(connection.id as i32), .eq(connection.id as i32),
) )
.add( .add(
room_participant::Column::AnsweringConnectionEpoch room_participant::Column::AnsweringConnectionServerId
.eq(connection.epoch as i32), .eq(connection.epoch as i32),
), ),
) )
@ -1376,7 +1371,7 @@ impl Database {
.eq(connection.id as i32), .eq(connection.id as i32),
) )
.add( .add(
room_participant::Column::CallingConnectionEpoch room_participant::Column::CallingConnectionServerId
.eq(connection.epoch as i32), .eq(connection.epoch as i32),
) )
.add(room_participant::Column::AnsweringConnectionId.is_null()), .add(room_participant::Column::AnsweringConnectionId.is_null()),
@ -1412,7 +1407,7 @@ impl Database {
project_collaborator::Column::ConnectionId.eq(connection.id as i32), project_collaborator::Column::ConnectionId.eq(connection.id as i32),
) )
.add( .add(
project_collaborator::Column::ConnectionEpoch project_collaborator::Column::ConnectionServerId
.eq(connection.epoch as i32), .eq(connection.epoch as i32),
), ),
) )
@ -1437,7 +1432,7 @@ impl Database {
}); });
let collaborator_connection_id = ConnectionId { let collaborator_connection_id = ConnectionId {
epoch: collaborator.connection_epoch as u32, epoch: collaborator.connection_server_id.0 as u32,
id: collaborator.connection_id as u32, id: collaborator.connection_id as u32,
}; };
if collaborator_connection_id != connection { if collaborator_connection_id != connection {
@ -1459,7 +1454,7 @@ impl Database {
project_collaborator::Column::ConnectionId.eq(connection.id as i32), project_collaborator::Column::ConnectionId.eq(connection.id as i32),
) )
.add( .add(
project_collaborator::Column::ConnectionEpoch project_collaborator::Column::ConnectionServerId
.eq(connection.epoch as i32), .eq(connection.epoch as i32),
), ),
) )
@ -1472,7 +1467,9 @@ impl Database {
Condition::all() Condition::all()
.add(project::Column::RoomId.eq(room_id)) .add(project::Column::RoomId.eq(room_id))
.add(project::Column::HostConnectionId.eq(connection.id as i32)) .add(project::Column::HostConnectionId.eq(connection.id as i32))
.add(project::Column::HostConnectionEpoch.eq(connection.epoch as i32)), .add(
project::Column::HostConnectionServerId.eq(connection.epoch as i32),
),
) )
.exec(&*tx) .exec(&*tx)
.await?; .await?;
@ -1538,7 +1535,7 @@ impl Database {
.eq(connection.id as i32), .eq(connection.id as i32),
) )
.add( .add(
room_participant::Column::AnsweringConnectionEpoch room_participant::Column::AnsweringConnectionServerId
.eq(connection.epoch as i32), .eq(connection.epoch as i32),
), ),
) )
@ -1573,7 +1570,7 @@ impl Database {
.eq(connection.id as i32), .eq(connection.id as i32),
) )
.add( .add(
room_participant::Column::AnsweringConnectionEpoch room_participant::Column::AnsweringConnectionServerId
.eq(connection.epoch as i32), .eq(connection.epoch as i32),
), ),
) )
@ -1595,7 +1592,7 @@ impl Database {
Condition::all() Condition::all()
.add(project_collaborator::Column::ConnectionId.eq(connection.id as i32)) .add(project_collaborator::Column::ConnectionId.eq(connection.id as i32))
.add( .add(
project_collaborator::Column::ConnectionEpoch project_collaborator::Column::ConnectionServerId
.eq(connection.epoch as i32), .eq(connection.epoch as i32),
), ),
) )
@ -1606,7 +1603,7 @@ impl Database {
Condition::all() Condition::all()
.add(project_collaborator::Column::ConnectionId.eq(connection.id as i32)) .add(project_collaborator::Column::ConnectionId.eq(connection.id as i32))
.add( .add(
project_collaborator::Column::ConnectionEpoch project_collaborator::Column::ConnectionServerId
.eq(connection.epoch as i32), .eq(connection.epoch as i32),
), ),
) )
@ -1624,7 +1621,7 @@ impl Database {
.into_iter() .into_iter()
.map(|collaborator| ConnectionId { .map(|collaborator| ConnectionId {
id: collaborator.connection_id as u32, id: collaborator.connection_id as u32,
epoch: collaborator.connection_epoch as u32, epoch: collaborator.connection_server_id.0 as u32,
}) })
.collect(); .collect();
@ -1633,7 +1630,7 @@ impl Database {
host_user_id: project.host_user_id, host_user_id: project.host_user_id,
host_connection_id: ConnectionId { host_connection_id: ConnectionId {
id: project.host_connection_id as u32, id: project.host_connection_id as u32,
epoch: project.host_connection_epoch as u32, epoch: project.host_connection_server_id.0 as u32,
}, },
connection_ids, connection_ids,
}); });
@ -1644,7 +1641,7 @@ impl Database {
.filter( .filter(
Condition::all() Condition::all()
.add(project::Column::HostConnectionId.eq(connection.id as i32)) .add(project::Column::HostConnectionId.eq(connection.id as i32))
.add(project::Column::HostConnectionEpoch.eq(connection.epoch as i32)), .add(project::Column::HostConnectionServerId.eq(connection.epoch as i32)),
) )
.exec(&*tx) .exec(&*tx)
.await?; .await?;
@ -1696,9 +1693,9 @@ impl Database {
let mut pending_participants = Vec::new(); let mut pending_participants = Vec::new();
while let Some(db_participant) = db_participants.next().await { while let Some(db_participant) = db_participants.next().await {
let db_participant = db_participant?; let db_participant = db_participant?;
if let Some((answering_connection_id, answering_connection_epoch)) = db_participant if let Some((answering_connection_id, answering_connection_server_id)) = db_participant
.answering_connection_id .answering_connection_id
.zip(db_participant.answering_connection_epoch) .zip(db_participant.answering_connection_server_id)
{ {
let location = match ( let location = match (
db_participant.location_kind, db_participant.location_kind,
@ -1720,7 +1717,7 @@ impl Database {
}; };
let answering_connection = ConnectionId { let answering_connection = ConnectionId {
epoch: answering_connection_epoch as u32, epoch: answering_connection_server_id.0 as u32,
id: answering_connection_id as u32, id: answering_connection_id as u32,
}; };
participants.insert( participants.insert(
@ -1751,7 +1748,7 @@ impl Database {
while let Some(row) = db_projects.next().await { while let Some(row) = db_projects.next().await {
let (db_project, db_worktree) = row?; let (db_project, db_worktree) = row?;
let host_connection = ConnectionId { let host_connection = ConnectionId {
epoch: db_project.host_connection_epoch as u32, epoch: db_project.host_connection_server_id.0 as u32,
id: db_project.host_connection_id as u32, id: db_project.host_connection_id as u32,
}; };
if let Some(participant) = participants.get_mut(&host_connection) { if let Some(participant) = participants.get_mut(&host_connection) {
@ -1820,7 +1817,7 @@ impl Database {
.eq(connection.id as i32), .eq(connection.id as i32),
) )
.add( .add(
room_participant::Column::AnsweringConnectionEpoch room_participant::Column::AnsweringConnectionServerId
.eq(connection.epoch as i32), .eq(connection.epoch as i32),
), ),
) )
@ -1835,7 +1832,7 @@ impl Database {
room_id: ActiveValue::set(participant.room_id), room_id: ActiveValue::set(participant.room_id),
host_user_id: ActiveValue::set(participant.user_id), host_user_id: ActiveValue::set(participant.user_id),
host_connection_id: ActiveValue::set(connection.id as i32), host_connection_id: ActiveValue::set(connection.id as i32),
host_connection_epoch: ActiveValue::set(connection.epoch as i32), host_connection_server_id: ActiveValue::set(ServerId(connection.epoch as i32)),
..Default::default() ..Default::default()
} }
.insert(&*tx) .insert(&*tx)
@ -1860,7 +1857,7 @@ impl Database {
project_collaborator::ActiveModel { project_collaborator::ActiveModel {
project_id: ActiveValue::set(project.id), project_id: ActiveValue::set(project.id),
connection_id: ActiveValue::set(connection.id as i32), connection_id: ActiveValue::set(connection.id as i32),
connection_epoch: ActiveValue::set(connection.epoch as i32), connection_server_id: ActiveValue::set(ServerId(connection.epoch as i32)),
user_id: ActiveValue::set(participant.user_id), user_id: ActiveValue::set(participant.user_id),
replica_id: ActiveValue::set(ReplicaId(0)), replica_id: ActiveValue::set(ReplicaId(0)),
is_host: ActiveValue::set(true), is_host: ActiveValue::set(true),
@ -1888,7 +1885,7 @@ impl Database {
.await? .await?
.ok_or_else(|| anyhow!("project not found"))?; .ok_or_else(|| anyhow!("project not found"))?;
let host_connection = ConnectionId { let host_connection = ConnectionId {
epoch: project.host_connection_epoch as u32, epoch: project.host_connection_server_id.0 as u32,
id: project.host_connection_id as u32, id: project.host_connection_id as u32,
}; };
if host_connection == connection { if host_connection == connection {
@ -1916,7 +1913,7 @@ impl Database {
.filter( .filter(
Condition::all() Condition::all()
.add(project::Column::HostConnectionId.eq(connection.id as i32)) .add(project::Column::HostConnectionId.eq(connection.id as i32))
.add(project::Column::HostConnectionEpoch.eq(connection.epoch as i32)), .add(project::Column::HostConnectionServerId.eq(connection.epoch as i32)),
) )
.one(&*tx) .one(&*tx)
.await? .await?
@ -1974,7 +1971,7 @@ impl Database {
.filter( .filter(
Condition::all() Condition::all()
.add(project::Column::HostConnectionId.eq(connection.id as i32)) .add(project::Column::HostConnectionId.eq(connection.id as i32))
.add(project::Column::HostConnectionEpoch.eq(connection.epoch as i32)), .add(project::Column::HostConnectionServerId.eq(connection.epoch as i32)),
) )
.one(&*tx) .one(&*tx)
.await? .await?
@ -2071,7 +2068,7 @@ impl Database {
.await? .await?
.ok_or_else(|| anyhow!("no such project"))?; .ok_or_else(|| anyhow!("no such project"))?;
let host_connection = ConnectionId { let host_connection = ConnectionId {
epoch: project.host_connection_epoch as u32, epoch: project.host_connection_server_id.0 as u32,
id: project.host_connection_id as u32, id: project.host_connection_id as u32,
}; };
if host_connection != connection { if host_connection != connection {
@ -2128,7 +2125,7 @@ impl Database {
.await? .await?
.ok_or_else(|| anyhow!("no such project"))?; .ok_or_else(|| anyhow!("no such project"))?;
let host_connection = ConnectionId { let host_connection = ConnectionId {
epoch: project.host_connection_epoch as u32, epoch: project.host_connection_server_id.0 as u32,
id: project.host_connection_id as u32, id: project.host_connection_id as u32,
}; };
if host_connection != connection { if host_connection != connection {
@ -2173,7 +2170,7 @@ impl Database {
.eq(connection.id as i32), .eq(connection.id as i32),
) )
.add( .add(
room_participant::Column::AnsweringConnectionEpoch room_participant::Column::AnsweringConnectionServerId
.eq(connection.epoch as i32), .eq(connection.epoch as i32),
), ),
) )
@ -2204,7 +2201,7 @@ impl Database {
let new_collaborator = project_collaborator::ActiveModel { let new_collaborator = project_collaborator::ActiveModel {
project_id: ActiveValue::set(project_id), project_id: ActiveValue::set(project_id),
connection_id: ActiveValue::set(connection.id as i32), connection_id: ActiveValue::set(connection.id as i32),
connection_epoch: ActiveValue::set(connection.epoch as i32), connection_server_id: ActiveValue::set(ServerId(connection.epoch as i32)),
user_id: ActiveValue::set(participant.user_id), user_id: ActiveValue::set(participant.user_id),
replica_id: ActiveValue::set(replica_id), replica_id: ActiveValue::set(replica_id),
is_host: ActiveValue::set(false), is_host: ActiveValue::set(false),
@ -2315,7 +2312,7 @@ impl Database {
.add(project_collaborator::Column::ProjectId.eq(project_id)) .add(project_collaborator::Column::ProjectId.eq(project_id))
.add(project_collaborator::Column::ConnectionId.eq(connection.id as i32)) .add(project_collaborator::Column::ConnectionId.eq(connection.id as i32))
.add( .add(
project_collaborator::Column::ConnectionEpoch project_collaborator::Column::ConnectionServerId
.eq(connection.epoch as i32), .eq(connection.epoch as i32),
), ),
) )
@ -2336,7 +2333,7 @@ impl Database {
let connection_ids = collaborators let connection_ids = collaborators
.into_iter() .into_iter()
.map(|collaborator| ConnectionId { .map(|collaborator| ConnectionId {
epoch: collaborator.connection_epoch as u32, epoch: collaborator.connection_server_id.0 as u32,
id: collaborator.connection_id as u32, id: collaborator.connection_id as u32,
}) })
.collect(); .collect();
@ -2345,7 +2342,7 @@ impl Database {
id: project_id, id: project_id,
host_user_id: project.host_user_id, host_user_id: project.host_user_id,
host_connection_id: ConnectionId { host_connection_id: ConnectionId {
epoch: project.host_connection_epoch as u32, epoch: project.host_connection_server_id.0 as u32,
id: project.host_connection_id as u32, id: project.host_connection_id as u32,
}, },
connection_ids, connection_ids,
@ -2372,7 +2369,7 @@ impl Database {
if collaborators.iter().any(|collaborator| { if collaborators.iter().any(|collaborator| {
let collaborator_connection = ConnectionId { let collaborator_connection = ConnectionId {
epoch: collaborator.connection_epoch as u32, epoch: collaborator.connection_server_id.0 as u32,
id: collaborator.connection_id as u32, id: collaborator.connection_id as u32,
}; };
collaborator_connection == connection collaborator_connection == connection
@ -2404,7 +2401,7 @@ impl Database {
while let Some(participant) = participants.next().await { while let Some(participant) = participants.next().await {
let participant = participant?; let participant = participant?;
connection_ids.insert(ConnectionId { connection_ids.insert(ConnectionId {
epoch: participant.connection_epoch as u32, epoch: participant.connection_server_id.0 as u32,
id: participant.connection_id as u32, id: participant.connection_id as u32,
}); });
} }
@ -2436,7 +2433,7 @@ impl Database {
while let Some(participant) = participants.next().await { while let Some(participant) = participants.next().await {
let participant = participant?; let participant = participant?;
guest_connection_ids.push(ConnectionId { guest_connection_ids.push(ConnectionId {
epoch: participant.connection_epoch as u32, epoch: participant.connection_server_id.0 as u32,
id: participant.connection_id as u32, id: participant.connection_id as u32,
}); });
} }
@ -2817,7 +2814,7 @@ id_type!(RoomParticipantId);
id_type!(ProjectId); id_type!(ProjectId);
id_type!(ProjectCollaboratorId); id_type!(ProjectCollaboratorId);
id_type!(ReplicaId); id_type!(ReplicaId);
id_type!(ServerEpoch); id_type!(ServerId);
id_type!(SignupId); id_type!(SignupId);
id_type!(UserId); id_type!(UserId);

4
crates/collab/src/db/project.rs
View file

@ -1,4 +1,4 @@
use super::{ProjectId, RoomId, UserId}; use super::{ProjectId, RoomId, ServerId, UserId};
use sea_orm::entity::prelude::*; use sea_orm::entity::prelude::*;
#[derive(Clone, Debug, PartialEq, Eq, DeriveEntityModel)] #[derive(Clone, Debug, PartialEq, Eq, DeriveEntityModel)]
@ -9,7 +9,7 @@ pub struct Model {
pub room_id: RoomId, pub room_id: RoomId,
pub host_user_id: UserId, pub host_user_id: UserId,
pub host_connection_id: i32, pub host_connection_id: i32,
pub host_connection_epoch: i32, pub host_connection_server_id: ServerId,
} }
#[derive(Copy, Clone, Debug, EnumIter, DeriveRelation)] #[derive(Copy, Clone, Debug, EnumIter, DeriveRelation)]

4
crates/collab/src/db/project_collaborator.rs
View file

@ -1,4 +1,4 @@
use super::{ProjectCollaboratorId, ProjectId, ReplicaId, UserId}; use super::{ProjectCollaboratorId, ProjectId, ReplicaId, ServerId, UserId};
use sea_orm::entity::prelude::*; use sea_orm::entity::prelude::*;
#[derive(Clone, Debug, PartialEq, Eq, DeriveEntityModel)] #[derive(Clone, Debug, PartialEq, Eq, DeriveEntityModel)]
@ -8,7 +8,7 @@ pub struct Model {
pub id: ProjectCollaboratorId, pub id: ProjectCollaboratorId,
pub project_id: ProjectId, pub project_id: ProjectId,
pub connection_id: i32, pub connection_id: i32,
pub connection_epoch: i32, pub connection_server_id: ServerId,
pub user_id: UserId, pub user_id: UserId,
pub replica_id: ReplicaId, pub replica_id: ReplicaId,
pub is_host: bool, pub is_host: bool,

6
crates/collab/src/db/room_participant.rs
View file

@ -1,4 +1,4 @@
use super::{ProjectId, RoomId, RoomParticipantId, UserId}; use super::{ProjectId, RoomId, RoomParticipantId, ServerId, UserId};
use sea_orm::entity::prelude::*; use sea_orm::entity::prelude::*;
#[derive(Clone, Debug, PartialEq, Eq, DeriveEntityModel)] #[derive(Clone, Debug, PartialEq, Eq, DeriveEntityModel)]
@ -9,14 +9,14 @@ pub struct Model {
pub room_id: RoomId, pub room_id: RoomId,
pub user_id: UserId, pub user_id: UserId,
pub answering_connection_id: Option<i32>, pub answering_connection_id: Option<i32>,
pub answering_connection_epoch: Option<i32>, pub answering_connection_server_id: Option<ServerId>,
pub answering_connection_lost: bool, pub answering_connection_lost: bool,
pub location_kind: Option<i32>, pub location_kind: Option<i32>,
pub location_project_id: Option<ProjectId>, pub location_project_id: Option<ProjectId>,
pub initial_project_id: Option<ProjectId>, pub initial_project_id: Option<ProjectId>,
pub calling_user_id: UserId, pub calling_user_id: UserId,
pub calling_connection_id: i32, pub calling_connection_id: i32,
pub calling_connection_epoch: i32, pub calling_connection_server_id: Option<ServerId>,
} }
#[derive(Copy, Clone, Debug, EnumIter, DeriveRelation)] #[derive(Copy, Clone, Debug, EnumIter, DeriveRelation)]

4
crates/collab/src/db/server.rs
View file

@ -1,11 +1,11 @@
use super::ServerEpoch; use super::ServerId;
use sea_orm::entity::prelude::*; use sea_orm::entity::prelude::*;
#[derive(Clone, Debug, PartialEq, Eq, DeriveEntityModel)] #[derive(Clone, Debug, PartialEq, Eq, DeriveEntityModel)]
#[sea_orm(table_name = "servers")] #[sea_orm(table_name = "servers")]
pub struct Model { pub struct Model {
#[sea_orm(primary_key)] #[sea_orm(primary_key)]
pub epoch: ServerEpoch, pub id: ServerId,
pub environment: String, pub environment: String,
} }

18
crates/collab/src/db/tests.rs
View file

@ -410,6 +410,8 @@ test_both_dbs!(
test_project_count_sqlite, test_project_count_sqlite,
db, db,
{ {
let epoch = db.create_server("test").await.unwrap().0 as u32;
let user1 = db let user1 = db
.create_user( .create_user(
&format!("admin@example.com"), &format!("admin@example.com"),
@ -436,7 +438,7 @@ test_both_dbs!(
.unwrap(); .unwrap();
let room_id = RoomId::from_proto( let room_id = RoomId::from_proto(
db.create_room(user1.user_id, ConnectionId { epoch: 0, id: 0 }, "") db.create_room(user1.user_id, ConnectionId { epoch, id: 0 }, "")
.await .await
.unwrap() .unwrap()
.id, .id,
@ -444,36 +446,34 @@ test_both_dbs!(
db.call( db.call(
room_id, room_id,
user1.user_id, user1.user_id,
ConnectionId { epoch: 0, id: 0 }, ConnectionId { epoch, id: 0 },
user2.user_id, user2.user_id,
None, None,
) )
.await .await
.unwrap(); .unwrap();
db.join_room(room_id, user2.user_id, ConnectionId { epoch: 0, id: 1 }) db.join_room(room_id, user2.user_id, ConnectionId { epoch, id: 1 })
.await .await
.unwrap(); .unwrap();
assert_eq!(db.project_count_excluding_admins().await.unwrap(), 0); assert_eq!(db.project_count_excluding_admins().await.unwrap(), 0);
db.share_project(room_id, ConnectionId { epoch: 0, id: 1 }, &[]) db.share_project(room_id, ConnectionId { epoch, id: 1 }, &[])
.await .await
.unwrap(); .unwrap();
assert_eq!(db.project_count_excluding_admins().await.unwrap(), 1); assert_eq!(db.project_count_excluding_admins().await.unwrap(), 1);
db.share_project(room_id, ConnectionId { epoch: 0, id: 1 }, &[]) db.share_project(room_id, ConnectionId { epoch, id: 1 }, &[])
.await .await
.unwrap(); .unwrap();
assert_eq!(db.project_count_excluding_admins().await.unwrap(), 2); assert_eq!(db.project_count_excluding_admins().await.unwrap(), 2);
// Projects shared by admins aren't counted. // Projects shared by admins aren't counted.
db.share_project(room_id, ConnectionId { epoch: 0, id: 0 }, &[]) db.share_project(room_id, ConnectionId { epoch, id: 0 }, &[])
.await .await
.unwrap(); .unwrap();
assert_eq!(db.project_count_excluding_admins().await.unwrap(), 2); assert_eq!(db.project_count_excluding_admins().await.unwrap(), 2);
db.leave_room(ConnectionId { epoch: 0, id: 1 }) db.leave_room(ConnectionId { epoch, id: 1 }).await.unwrap();
.await
.unwrap();
assert_eq!(db.project_count_excluding_admins().await.unwrap(), 0); assert_eq!(db.project_count_excluding_admins().await.unwrap(), 0);
} }
); );

18
crates/collab/src/rpc.rs
View file

@ -2,7 +2,7 @@ mod connection_pool;
use crate::{ use crate::{
auth, auth,
db::{self, Database, ProjectId, RoomId, ServerEpoch, User, UserId}, db::{self, Database, ProjectId, RoomId, ServerId, User, UserId},
executor::Executor, executor::Executor,
AppState, Result, AppState, Result,
}; };
@ -138,7 +138,7 @@ impl Deref for DbHandle {
} }
pub struct Server { pub struct Server {
epoch: parking_lot::Mutex<ServerEpoch>, epoch: parking_lot::Mutex<ServerId>,
peer: Arc<Peer>, peer: Arc<Peer>,
pub(crate) connection_pool: Arc<parking_lot::Mutex<ConnectionPool>>, pub(crate) connection_pool: Arc<parking_lot::Mutex<ConnectionPool>>,
app_state: Arc<AppState>, app_state: Arc<AppState>,
@ -169,7 +169,7 @@ where
} }
impl Server { impl Server {
pub fn new(epoch: ServerEpoch, app_state: Arc<AppState>, executor: Executor) -> Arc<Self> { pub fn new(epoch: ServerId, app_state: Arc<AppState>, executor: Executor) -> Arc<Self> {
let mut server = Self { let mut server = Self {
epoch: parking_lot::Mutex::new(epoch), epoch: parking_lot::Mutex::new(epoch),
peer: Peer::new(epoch.0 as u32), peer: Peer::new(epoch.0 as u32),
@ -370,7 +370,7 @@ impl Server {
} }
#[cfg(test)] #[cfg(test)]
pub fn reset(&self, epoch: ServerEpoch) { pub fn reset(&self, epoch: ServerId) {
self.teardown(); self.teardown();
*self.epoch.lock() = epoch; *self.epoch.lock() = epoch;
self.peer.reset(epoch.0 as u32); self.peer.reset(epoch.0 as u32);
@ -1156,7 +1156,7 @@ async fn join_project(
.iter() .iter()
.map(|collaborator| { .map(|collaborator| {
let peer_id = proto::PeerId { let peer_id = proto::PeerId {
epoch: collaborator.connection_epoch as u32, epoch: collaborator.connection_server_id.0 as u32,
id: collaborator.connection_id as u32, id: collaborator.connection_id as u32,
}; };
proto::Collaborator { proto::Collaborator {
@ -1412,7 +1412,7 @@ where
.find(|collaborator| collaborator.is_host) .find(|collaborator| collaborator.is_host)
.ok_or_else(|| anyhow!("host not found"))?; .ok_or_else(|| anyhow!("host not found"))?;
ConnectionId { ConnectionId {
epoch: host.connection_epoch as u32, epoch: host.connection_server_id.0 as u32,
id: host.connection_id as u32, id: host.connection_id as u32,
} }
}; };
@ -1443,7 +1443,7 @@ async fn save_buffer(
.find(|collaborator| collaborator.is_host) .find(|collaborator| collaborator.is_host)
.ok_or_else(|| anyhow!("host not found"))?; .ok_or_else(|| anyhow!("host not found"))?;
ConnectionId { ConnectionId {
epoch: host.connection_epoch as u32, epoch: host.connection_server_id.0 as u32,
id: host.connection_id as u32, id: host.connection_id as u32,
} }
}; };
@ -1459,13 +1459,13 @@ async fn save_buffer(
.await?; .await?;
collaborators.retain(|collaborator| { collaborators.retain(|collaborator| {
let collaborator_connection = ConnectionId { let collaborator_connection = ConnectionId {
epoch: collaborator.connection_epoch as u32, epoch: collaborator.connection_server_id.0 as u32,
id: collaborator.connection_id as u32, id: collaborator.connection_id as u32,
}; };
collaborator_connection != session.connection_id collaborator_connection != session.connection_id
}); });
let project_connection_ids = collaborators.iter().map(|collaborator| ConnectionId { let project_connection_ids = collaborators.iter().map(|collaborator| ConnectionId {
epoch: collaborator.connection_epoch as u32, epoch: collaborator.connection_server_id.0 as u32,
id: collaborator.connection_id as u32, id: collaborator.connection_id as u32,
}); });
broadcast(host_connection_id, project_connection_ids, |conn_id| { broadcast(host_connection_id, project_connection_ids, |conn_id| {