make destroy_idle_sessions async

databendlabs · Mar 10, 2022 · c124470 · c124470
1 parent 9eaacad
commit c124470
Showing 1 changed file with 3 additions and 3 deletions.
diff --git a/query/src/sessions/session_mgr.rs b/query/src/sessions/session_mgr.rs
@@ -218,7 +218,7 @@ impl SessionManager {
             let mut signal = Box::pin(signal.next());
 
             for _index in 0..timeout_secs {
-                if SessionManager::destroy_idle_sessions(&active_sessions) {
+                if SessionManager::destroy_idle_sessions(&active_sessions).await {
                     return;
                 }
 
@@ -247,10 +247,10 @@ impl SessionManager {
             .collect::<Vec<_>>()
     }
 
-    fn destroy_idle_sessions(sessions: &Arc<RwLock<HashMap<String, Arc<Session>>>>) -> bool {
+    async fn destroy_idle_sessions(sessions: &Arc<RwLock<HashMap<String, Arc<Session>>>>) -> bool {
         // Read lock does not support reentrant
         // https://github.com/Amanieu/parking_lot/blob/lock_api-0.4.4/lock_api/src/rwlock.rs#L422
-        let active_sessions_read_guard = futures::executor::block_on(sessions.read());
+        let active_sessions_read_guard = sessions.read().await;
 
         // First try to kill the idle session
         active_sessions_read_guard.values().for_each(Session::kill);