From 71073d0f325518980b467eb136c26df7849413c4 Mon Sep 17 00:00:00 2001
From: Antonio Scandurra <me@as-cii.com>
Date: Fri, 27 Jan 2023 11:01:24 +0100
Subject: [PATCH] Merge pull request #2103 from
 zed-industries/connection-staleness

Fix connection staleness issues
---
 Cargo.toml                                    |  2 --
 Dockerfile                                    |  1 +
 crates/collab/src/db.rs                       |  8 ++------
 .../src/tests/randomized_integration_tests.rs | 10 ++++------
 crates/rpc/src/proto.rs                       | 20 ++++++++++++++-----
 5 files changed, 22 insertions(+), 19 deletions(-)

diff --git a/Cargo.toml b/Cargo.toml
index 1ace51dbd5c417290438bc2314920666001d4efd..417e7e4ff4886077288e20864e18b8a29394e323 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -83,5 +83,3 @@ split-debuginfo = "unpacked"
 
 [profile.release]
 debug = true
-
-
diff --git a/Dockerfile b/Dockerfile
index 5a6279a95e3dab632b215900bbaef417571123cc..d3170696c5fc08c67cbca61a203eced42e4eba0d 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -5,6 +5,7 @@ WORKDIR app
 COPY . .
 
 # Compile collab server
+ARG CARGO_PROFILE_RELEASE_PANIC=abort
 RUN --mount=type=cache,target=./script/node_modules \
     --mount=type=cache,target=/usr/local/cargo/registry \
     --mount=type=cache,target=./target \
diff --git a/crates/collab/src/db.rs b/crates/collab/src/db.rs
index 63ea7fdd9e128ee76206f7bcf7829bc05bee8d52..3358652feb06768f648d73e2df7b0ca08975078a 100644
--- a/crates/collab/src/db.rs
+++ b/crates/collab/src/db.rs
@@ -1586,12 +1586,8 @@ impl Database {
                     .filter(
                         Condition::all()
                             .add(
-                                room_participant::Column::CallingConnectionId
-                                    .eq(connection.id as i32),
-                            )
-                            .add(
-                                room_participant::Column::CallingConnectionServerId
-                                    .eq(connection.owner_id as i32),
+                                room_participant::Column::CallingUserId
+                                    .eq(leaving_participant.user_id),
                             )
                             .add(room_participant::Column::AnsweringConnectionId.is_null()),
                     )
diff --git a/crates/collab/src/tests/randomized_integration_tests.rs b/crates/collab/src/tests/randomized_integration_tests.rs
index ed8f984d274228b7c777635c73e6ac2686407991..55f716f013d5c60c4d1496eba2a714a4627340b1 100644
--- a/crates/collab/src/tests/randomized_integration_tests.rs
+++ b/crates/collab/src/tests/randomized_integration_tests.rs
@@ -166,12 +166,10 @@ async fn test_random_collaboration(
                     let contacts = server.app_state.db.get_contacts(*user_id).await.unwrap();
                     let pool = server.connection_pool.lock();
                     for contact in contacts {
-                        if let db::Contact::Accepted { user_id, .. } = contact {
-                            if pool.is_user_online(user_id) {
-                                assert_ne!(
-                                    user_id, removed_user_id,
-                                    "removed client is still a contact of another peer"
-                                );
+                        if let db::Contact::Accepted { user_id, busy, .. } = contact {
+                            if user_id == removed_user_id {
+                                assert!(!pool.is_user_online(user_id));
+                                assert!(!busy);
                             }
                         }
                     }
diff --git a/crates/rpc/src/proto.rs b/crates/rpc/src/proto.rs
index 6b09f07db4f436e679c8681b30e63993fe8db413..1a56abc7835103428352867b840102ef740c952f 100644
--- a/crates/rpc/src/proto.rs
+++ b/crates/rpc/src/proto.rs
@@ -9,7 +9,7 @@ use std::fmt;
 use std::{
     cmp,
     fmt::Debug,
-    io, iter, mem,
+    io, iter,
     time::{Duration, SystemTime, UNIX_EPOCH},
 };
 
@@ -489,16 +489,26 @@ pub fn split_worktree_update(
             return None;
         }
 
-        let chunk_size = cmp::min(message.updated_entries.len(), max_chunk_size);
-        let updated_entries = message.updated_entries.drain(..chunk_size).collect();
-        done = message.updated_entries.is_empty();
+        let updated_entries_chunk_size = cmp::min(message.updated_entries.len(), max_chunk_size);
+        let updated_entries = message
+            .updated_entries
+            .drain(..updated_entries_chunk_size)
+            .collect();
+
+        let removed_entries_chunk_size = cmp::min(message.removed_entries.len(), max_chunk_size);
+        let removed_entries = message
+            .removed_entries
+            .drain(..removed_entries_chunk_size)
+            .collect();
+
+        done = message.updated_entries.is_empty() && message.removed_entries.is_empty();
         Some(UpdateWorktree {
             project_id: message.project_id,
             worktree_id: message.worktree_id,
             root_name: message.root_name.clone(),
             abs_path: message.abs_path.clone(),
             updated_entries,
-            removed_entries: mem::take(&mut message.removed_entries),
+            removed_entries,
             scan_id: message.scan_id,
             is_last_update: done && message.is_last_update,
         })