Skip to content

Commit 22a791d

Browse files
authored
Bump collab min version to 0.134 (#16918)
0.05% of requests use a version less than this today; and it lets us get rid of a bunch of versioning we no longer need. Release Notes: - N/A
1 parent cfc3b7d commit 22a791d

File tree

2 files changed

+3
-70
lines changed

2 files changed

+3
-70
lines changed

crates/collab/src/rpc.rs

Lines changed: 2 additions & 43 deletions
Original file line numberDiff line numberDiff line change
@@ -78,8 +78,6 @@ use tracing::{
7878
info_span, instrument, Instrument,
7979
};
8080

81-
use self::connection_pool::VersionedMessage;
82-
8381
pub const RECONNECT_TIMEOUT: Duration = Duration::from_secs(30);
8482

8583
// kubernetes gives terminated pods 10s to shutdown gracefully. After they're gone, we can clean up old resources.
@@ -507,7 +505,7 @@ impl Server {
507505
forward_mutating_project_request::<proto::ApplyCompletionAdditionalEdits>,
508506
))
509507
.add_request_handler(user_handler(
510-
forward_versioned_mutating_project_request::<proto::OpenNewBuffer>,
508+
forward_mutating_project_request::<proto::OpenNewBuffer>,
511509
))
512510
.add_request_handler(user_handler(
513511
forward_mutating_project_request::<proto::ResolveCompletionDocumentation>,
@@ -549,7 +547,7 @@ impl Server {
549547
forward_mutating_project_request::<proto::OnTypeFormatting>,
550548
))
551549
.add_request_handler(user_handler(
552-
forward_versioned_mutating_project_request::<proto::SaveBuffer>,
550+
forward_mutating_project_request::<proto::SaveBuffer>,
553551
))
554552
.add_request_handler(user_handler(
555553
forward_mutating_project_request::<proto::BlameBuffer>,
@@ -3047,45 +3045,6 @@ where
30473045
Ok(())
30483046
}
30493047

3050-
/// forward a project request to the host. These requests are disallowed
3051-
/// for guests.
3052-
async fn forward_versioned_mutating_project_request<T>(
3053-
request: T,
3054-
response: Response<T>,
3055-
session: UserSession,
3056-
) -> Result<()>
3057-
where
3058-
T: EntityMessage + RequestMessage + VersionedMessage,
3059-
{
3060-
let project_id = ProjectId::from_proto(request.remote_entity_id());
3061-
3062-
let host_connection_id = session
3063-
.db()
3064-
.await
3065-
.host_for_mutating_project_request(project_id, session.connection_id, session.user_id())
3066-
.await?;
3067-
if let Some(host_version) = session
3068-
.connection_pool()
3069-
.await
3070-
.connection(host_connection_id)
3071-
.map(|c| c.zed_version)
3072-
{
3073-
if let Some(min_required_version) = request.required_host_version() {
3074-
if min_required_version > host_version {
3075-
return Err(anyhow!(ErrorCode::RemoteUpgradeRequired
3076-
.with_tag("required", &min_required_version.to_string())))?;
3077-
}
3078-
}
3079-
}
3080-
3081-
let payload = session
3082-
.peer
3083-
.forward_request(session.connection_id, host_connection_id, request)
3084-
.await?;
3085-
response.send(payload)?;
3086-
Ok(())
3087-
}
3088-
30893048
/// Notify other participants that a new buffer has been created
30903049
async fn create_buffer_for_peer(
30913050
request: proto::CreateBufferForPeer,

crates/collab/src/rpc/connection_pool.rs

Lines changed: 1 addition & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -32,11 +32,7 @@ impl fmt::Display for ZedVersion {
3232

3333
impl ZedVersion {
3434
pub fn can_collaborate(&self) -> bool {
35-
self.0 >= SemanticVersion::new(0, 129, 2)
36-
}
37-
38-
pub fn with_save_as() -> ZedVersion {
39-
ZedVersion(SemanticVersion::new(0, 134, 0))
35+
self.0 >= SemanticVersion::new(0, 134, 0)
4036
}
4137

4238
pub fn with_list_directory() -> ZedVersion {
@@ -48,28 +44,6 @@ impl ZedVersion {
4844
}
4945
}
5046

51-
pub trait VersionedMessage {
52-
fn required_host_version(&self) -> Option<ZedVersion> {
53-
None
54-
}
55-
}
56-
57-
impl VersionedMessage for proto::SaveBuffer {
58-
fn required_host_version(&self) -> Option<ZedVersion> {
59-
if self.new_path.is_some() {
60-
Some(ZedVersion::with_save_as())
61-
} else {
62-
None
63-
}
64-
}
65-
}
66-
67-
impl VersionedMessage for proto::OpenNewBuffer {
68-
fn required_host_version(&self) -> Option<ZedVersion> {
69-
Some(ZedVersion::with_save_as())
70-
}
71-
}
72-
7347
#[derive(Serialize)]
7448
pub struct Connection {
7549
pub principal_id: PrincipalId,

0 commit comments

Comments
 (0)