refactor: Wrap lease_keepalive_abort with defer

Cargo.toml

@@ -13,6 +13,7 @@ crate-type = ["cdylib"]
 etcd-client = "0.12.4"
 pyo3 = { version = "0.20.2", features = ["extension-module", "multiple-pymethods"] }
 pyo3-asyncio = { version = "0.20.0", features = ["tokio-runtime"] }
+scopeguard = "1.2.0"
 tokio = { version = "1.32.0", features = ["sync"] }
 tokio-stream = "0.1.14"
 tonic = "0.10.2"

src/lock_manager.rs

@@ -6,6 +6,7 @@ use crate::{
 use etcd_client::{Client as EtcdClient, LockOptions};
 
 use pyo3::{prelude::*, types::PyBytes};
+use scopeguard::defer;
 use std::{future::ready, time::Duration};
 use tokio::time::{sleep, timeout};
 
@@ -112,13 +113,9 @@ impl EtcdLockManager {
                 None => ready(Ok(self.try_lock(&mut client).await)).await,
             };
 
-        if let Some(ref lease_keepalive_task) = self.lease_keepalive_task {
-            lease_keepalive_task.abort();
-        }
-
         match timeout_result {
             Ok(Ok(_)) => {}
-            Ok(Err(e)) => return Err(e.into()),
+            Ok(Err(try_lock_err)) => return Err(try_lock_err.into()),
             Err(timedout_err) => {
                 if let Some(lease_id) = self.lease_id {
                     if let Err(etcd_client::Error::GRpcStatus(status)) =
@@ -133,6 +130,12 @@ impl EtcdLockManager {
             }
         }
 
+        defer! {
+            if let Some(ref lease_keepalive_task) = self.lease_keepalive_task {
+                lease_keepalive_task.abort();
+            }
+        }
+
         Ok(PyCommunicator::new(client))
     }