From 1729a7e3f2a0d5fd362361b02e6f56a07fd8a6ed Mon Sep 17 00:00:00 2001
From: slzhou <slzhou@taosdata.com>
Date: Mon, 25 Apr 2022 07:56:01 +0800
Subject: [PATCH 1/2] modify jenkins file so that ctest output more info

---
 Jenkinsfile  | 2 +-
 Jenkinsfile2 | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/Jenkinsfile b/Jenkinsfile
index fc2b3562c1..4b84e1f88e 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -113,7 +113,7 @@ pipeline {
               '''
               sh'''
               cd ${WKC}/debug
-              ctest
+              ctest -VV
               '''
             }
           }
diff --git a/Jenkinsfile2 b/Jenkinsfile2
index cca886d4af..c9c9c3a7ca 100644
--- a/Jenkinsfile2
+++ b/Jenkinsfile2
@@ -121,7 +121,7 @@ pipeline {
               pre_test()
               sh'''
               cd ${WKC}/debug
-              ctest
+              ctest -VV
               '''
               sh'''
               export LD_LIBRARY_PATH=${WKC}/debug/build/lib

From 8062272cdea79cb817063aae27004c6debf056ea Mon Sep 17 00:00:00 2001
From: slzhou <slzhou@taosdata.com>
Date: Mon, 25 Apr 2022 08:22:54 +0800
Subject: [PATCH 2/2] fix test failure

---
 source/dnode/mgmt/implement/src/dmHandle.c | 15 ++++++++++++---
 1 file changed, 12 insertions(+), 3 deletions(-)

diff --git a/source/dnode/mgmt/implement/src/dmHandle.c b/source/dnode/mgmt/implement/src/dmHandle.c
index 40eebd883a..ca1b943fb2 100644
--- a/source/dnode/mgmt/implement/src/dmHandle.c
+++ b/source/dnode/mgmt/implement/src/dmHandle.c
@@ -323,8 +323,17 @@ static int32_t dmStartUdfd(SDnode *pDnode) {
   uv_barrier_init(&pData->barrier, 2);
   uv_thread_create(&pData->thread, dmWatchUdfd, pDnode);
   uv_barrier_wait(&pData->barrier);
-  pData->needCleanUp = true;
-  return pData->spawnErr;
+  int32_t err = atomic_load_32(&pData->spawnErr);
+  if (err != 0) {
+    uv_barrier_destroy(&pData->barrier);
+    uv_async_send(&pData->stopAsync);
+    uv_thread_join(&pData->thread);
+    pData->needCleanUp = false;
+    dInfo("dnode-mgmt udfd cleaned up after spawn err");
+  } else {
+    pData->needCleanUp = true;
+  }
+  return err;
 }
 
 static int32_t dmStopUdfd(SDnode *pDnode) {
@@ -339,7 +348,7 @@ static int32_t dmStopUdfd(SDnode *pDnode) {
   uv_barrier_destroy(&pData->barrier);
   uv_async_send(&pData->stopAsync);
   uv_thread_join(&pData->thread);
-
+  dInfo("dnode-mgmt udfd cleaned up");
   return 0;
 }