maybe the old test would work?

Signed-off-by: Alex Chi Z <chi@neon.tech>

Author: skyzh

compute_tools/src/compute.rs

@@ -146,7 +146,7 @@ pub struct ComputeNode {
     /// read/write, not the whole configuration process.
     pub state: Mutex<ComputeState>,
     /// `Condvar` to allow notifying waiters about state changes.
-    pub state_changed: Condvar,
+    pub state_changed: tokio::sync::Condvar,
 
     // key: ext_archive_name, value: started download time, download_completed?
     pub ext_download_progress: RwLock<HashMap<String, (DateTime<Utc>, bool)>>,
@@ -2648,7 +2648,7 @@ LIMIT 100",
     /// the pageserver connection strings has changed.
     ///
     /// The operation will time out after a specified duration.
-    pub fn wait_timeout_while_pageserver_connstr_unchanged(&self, duration: Duration) {
+    pub async fn wait_timeout_while_pageserver_connstr_unchanged(&self, duration: Duration) {
         let state = self.state.lock().unwrap();
         let old_pageserver_conninfo = state
             .pspec

compute_tools/src/lsn_lease.rs

@@ -62,7 +62,11 @@ async fn lsn_lease_bg_task(
             "Request succeeded, sleeping for {} seconds",
             sleep_duration.as_secs()
         );
-        compute.wait_timeout_while_pageserver_connstr_unchanged(sleep_duration);
+        let compute = compute.clone();
+        tokio::task::spawn_blocking(|| {
+            compute.wait_timeout_while_pageserver_connstr_unchanged(sleep_duration);
+        })
+        .await?;
     }
 }
 

test_runner/regress/test_readonly_node.py

@@ -233,15 +233,6 @@ def trigger_gc_and_select(
         log.info(f"`SELECT` query succeed after GC, {ctx=}")
         return offset
 
-    # It's not reliable to let the compute renew the lease in this test case as we have a very tight
-    # lease timeout. Therefore, the test case itself will renew the lease.
-    #
-    # This is a workaround to make the test case more deterministic.
-    def renew_lease(env: NeonEnv, lease_lsn: Lsn):
-        env.storage_controller.pageserver_api().timeline_lsn_lease(
-            env.initial_tenant, env.initial_timeline, lease_lsn
-        )
-
     # Insert some records on main branch
     with env.endpoints.create_start("main", config_lines=["shared_buffers=1MB"]) as ep_main:
         with ep_main.cursor() as cur:
@@ -254,9 +245,6 @@ def renew_lease(env: NeonEnv, lease_lsn: Lsn):
         XLOG_BLCKSZ = 8192
         lsn = Lsn((int(lsn) // XLOG_BLCKSZ) * XLOG_BLCKSZ)
 
-        # We need to mock the way cplane works: it gets a lease for a branch before starting the compute.
-        renew_lease(env, lsn)
-
         with env.endpoints.create_start(
             branch_name="main",
             endpoint_id="static",
@@ -277,8 +265,6 @@ def renew_lease(env: NeonEnv, lease_lsn: Lsn):
                 ps.stop()
                 ps.start()
 
-            renew_lease(env, lsn)
-
             trigger_gc_and_select(
                 env,
                 ep_static,