fix(query): remove unexpected strong ref for http query (#13807)

* fix(query): remove unexpected strong ref for http query * fix(query): remove unexpected strong ref for http query * fix(query): remove unexpected strong ref for http query * fix(query): remove unexpected strong ref for http query
databendlabs · Nov 27, 2023 · 6680e52 · 6680e52
1 parent df815ca
commit 6680e52
Showing 1 changed file with 18 additions and 4 deletions.
diff --git a/src/query/service/src/servers/http/v1/query/http_query_manager.rs b/src/query/service/src/servers/http/v1/query/http_query_manager.rs
@@ -78,20 +78,34 @@ impl HttpQueryManager {
 
         let self_clone = self.clone();
         let query_id_clone = query_id.to_string();
-        let query_clone = query.clone();
+        let query_result_timeout_secs = query.result_timeout_secs;
+
+        // downgrade to weak reference
+        // it may cannot destroy with final or kill when we hold ref of Arc<HttpQuery>
+        let http_query_weak = Arc::downgrade(&query);
+
         GlobalIORuntime::instance().spawn(query_id, async move {
             loop {
-                match query_clone.check_expire().await {
+                let expire_res = match http_query_weak.upgrade() {
+                    None => {
+                        break;
+                    }
+                    Some(query) => query.check_expire().await,
+                };
+
+                match expire_res {
                     ExpireResult::Expired => {
                         let msg = format!(
                             "http query {} timeout after {} s",
-                            &query_id_clone, query_clone.result_timeout_secs
+                            &query_id_clone, query_result_timeout_secs
                         );
                         if self_clone.remove_query(&query_id_clone).await.is_none() {
                             warn!("{msg}, but fail to remove");
                         } else {
                             warn!("{msg}");
-                            query.kill(&msg).await;
+                            if let Some(query) = http_query_weak.upgrade() {
+                                query.kill(&msg).await;
+                            }
                         };
                         break;
                     }