From d08ec8bd53c79196849029789441489bd105c95e Mon Sep 17 00:00:00 2001
From: Antonio Scandurra <me@as-cii.com>
Date: Thu, 9 Sep 2021 17:00:18 +0200
Subject: [PATCH] Reduce backoff and add some jitter to avoid thundering herd
 issues

Co-Authored-By: Nathan Sobo <nathan@zed.dev>
---
 zed/src/rpc.rs | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/zed/src/rpc.rs b/zed/src/rpc.rs
index 07eb22f137ef75e883b0ee6129bf405bede26269..088f30e1d189cab1635390d6fc63c1388104bd34 100644
--- a/zed/src/rpc.rs
+++ b/zed/src/rpc.rs
@@ -5,6 +5,7 @@ use gpui::{AsyncAppContext, Entity, ModelContext, Task};
 use lazy_static::lazy_static;
 use parking_lot::RwLock;
 use postage::{prelude::Stream, watch};
+use rand::prelude::*;
 use std::{
     any::TypeId,
     collections::HashMap,
@@ -151,11 +152,12 @@ impl Client {
             Status::ConnectionLost => {
                 let this = self.clone();
                 let foreground = cx.foreground();
+                let heartbeat_interval = state.heartbeat_interval;
                 state._maintain_connection = Some(cx.spawn(|cx| async move {
-                    let mut delay_seconds = 5;
+                    let mut rng = StdRng::from_entropy();
+                    let mut delay = Duration::from_millis(100);
                     while let Err(error) = this.authenticate_and_connect(&cx).await {
                         log::error!("failed to connect {}", error);
-                        let delay = Duration::from_secs(delay_seconds);
                         this.set_status(
                             Status::ReconnectionError {
                                 next_reconnection: Instant::now() + delay,
@@ -163,7 +165,9 @@ impl Client {
                             &cx,
                         );
                         foreground.timer(delay).await;
-                        delay_seconds = (delay_seconds * 2).min(300);
+                        delay = delay
+                            .mul_f32(rng.gen_range(1.0..=2.0))
+                            .min(heartbeat_interval);
                     }
                 }));
             }