From 09a67abbefb5c7a0c53596e0a5cf557a2fae3664 Mon Sep 17 00:00:00 2001
From: Noel Kwan <47273164+kwannoel@users.noreply.github.com>
Date: Wed, 25 Oct 2023 16:49:08 +0800
Subject: [PATCH] fix: `WAIT` should return error if timeout (#13045)

---
 src/meta/service/src/ddl_service.rs | 2 +-
 src/meta/src/rpc/ddl_controller.rs  | 5 +++--
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/src/meta/service/src/ddl_service.rs b/src/meta/service/src/ddl_service.rs
index 061ff93589163..fac8f89e17b11 100644
--- a/src/meta/service/src/ddl_service.rs
+++ b/src/meta/service/src/ddl_service.rs
@@ -734,7 +734,7 @@ impl DdlService for DdlServiceImpl {
     }
 
     async fn wait(&self, _request: Request<WaitRequest>) -> Result<Response<WaitResponse>, Status> {
-        self.ddl_controller.wait().await;
+        self.ddl_controller.wait().await?;
         Ok(Response::new(WaitResponse {}))
     }
 }
diff --git a/src/meta/src/rpc/ddl_controller.rs b/src/meta/src/rpc/ddl_controller.rs
index 36615bd93b757..9886121bc03c2 100644
--- a/src/meta/src/rpc/ddl_controller.rs
+++ b/src/meta/src/rpc/ddl_controller.rs
@@ -1097,7 +1097,7 @@ impl DdlController {
         }
     }
 
-    pub async fn wait(&self) {
+    pub async fn wait(&self) -> MetaResult<()> {
         for _ in 0..30 * 60 {
             if self
                 .catalog_manager
@@ -1105,9 +1105,10 @@ impl DdlController {
                 .await
                 .is_empty()
             {
-                break;
+                return Ok(());
             }
             sleep(Duration::from_secs(1)).await;
         }
+        Err(MetaError::cancelled("timeout".into()))
     }
 }