Merge pull request #16815 from taosdata/enh/handleSchedError

enh(tsc): handle schedule error

include/util/tsched.h

@@ -31,7 +31,6 @@ typedef struct SSchedMsg {
   void *thandle;
 } SSchedMsg;
 
-
 typedef struct {
   char          label[TSDB_LABEL_LEN];
   tsem_t        emptySem;
@@ -48,7 +47,6 @@ typedef struct {
   void         *pTimer;
 } SSchedQueue;
 
-
 /**
  * Create a thread-safe ring-buffer based task queue and return the instance. A thread
  * pool will be created to consume the messages in the queue.
@@ -57,7 +55,7 @@ typedef struct {
  * @param label the label of the queue
  * @return the created queue scheduler
  */
-void *taosInitScheduler(int32_t capacity, int32_t numOfThreads, const char *label, SSchedQueue* pSched);
+void *taosInitScheduler(int32_t capacity, int32_t numOfThreads, const char *label, SSchedQueue *pSched);
 
 /**
  * Create a thread-safe ring-buffer based task queue and return the instance.
@@ -83,7 +81,7 @@ void taosCleanUpScheduler(void *queueScheduler);
  * @param queueScheduler the queue scheduler instance
  * @param pMsg the message for the task
  */
-void taosScheduleTask(void *queueScheduler, SSchedMsg *pMsg);
+int taosScheduleTask(void *queueScheduler, SSchedMsg *pMsg);
 
 #ifdef __cplusplus
 }

source/client/src/clientImpl.c

@@ -1399,7 +1399,12 @@ void processMsgFromServer(void* parent, SRpcMsg* pMsg, SEpSet* pEpSet) {
   arg->msg = *pMsg;
   arg->pEpset = tEpSet;
 
-  taosAsyncExec(doProcessMsgFromServer, arg, NULL);
+  if (0 != taosAsyncExec(doProcessMsgFromServer, arg, NULL)) {
+    tscError("failed to sched msg to tsc, tsc ready to quit");
+    rpcFreeCont(pMsg->pCont);
+    taosMemoryFree(arg->pEpset);
+    taosMemoryFree(arg);
+  }
 }
 
 TAOS* taos_connect_auth(const char* ip, const char* user, const char* auth, const char* db, uint16_t port) {

source/libs/qcom/src/queryUtil.c

@@ -134,8 +134,7 @@ int32_t taosAsyncExec(__async_exec_fn_t execFn, void* execParam, int32_t* code)
   schedMsg.thandle = execParam;
   schedMsg.msg = code;
 
-  taosScheduleTask(&pTaskQueue, &schedMsg);
-  return 0;
+  return taosScheduleTask(&pTaskQueue, &schedMsg);
 }
 
 void destroySendMsgInfo(SMsgSendInfo* pMsgBody) {
@@ -472,5 +471,3 @@ int32_t cloneDbVgInfo(SDBVgInfo* pSrc, SDBVgInfo** pDst) {
 
   return TSDB_CODE_SUCCESS;
 }
-
-

source/libs/transport/src/transCli.c

@@ -374,10 +374,12 @@ void cliHandleResp(SCliConn* conn) {
 
   if (pCtx == NULL && CONN_NO_PERSIST_BY_APP(conn)) {
     tDebug("%s except, conn %p read while cli ignore it", CONN_GET_INST_LABEL(conn), conn);
+    transFreeMsg(transMsg.pCont);
     return;
   }
   if (CONN_RELEASE_BY_SERVER(conn) && transMsg.info.ahandle == NULL) {
     tDebug("%s except, conn %p read while cli ignore it", CONN_GET_INST_LABEL(conn), conn);
+    transFreeMsg(transMsg.pCont);
     return;
   }
 
@@ -393,7 +395,7 @@ void cliHandleResp(SCliConn* conn) {
   }
 
   if (CONN_NO_PERSIST_BY_APP(conn)) {
-    addConnToPool(pThrd->pool, conn);
+    return addConnToPool(pThrd->pool, conn);
   }
 
   uv_read_start((uv_stream_t*)conn->stream, cliAllocRecvBufferCb, cliRecvCb);

source/util/src/tsched.c

@@ -149,18 +149,18 @@ void *taosProcessSchedQueue(void *scheduler) {
   return NULL;
 }
 
-void taosScheduleTask(void *queueScheduler, SSchedMsg *pMsg) {
+int taosScheduleTask(void *queueScheduler, SSchedMsg *pMsg) {
   SSchedQueue *pSched = (SSchedQueue *)queueScheduler;
   int32_t      ret = 0;
 
   if (pSched == NULL) {
     uError("sched is not ready, msg:%p is dropped", pMsg);
-    return;
+    return -1;
   }
 
   if (atomic_load_8(&pSched->stop)) {
     uError("sched is already stopped, msg:%p is dropped", pMsg);
-    return;
+    return -1;
   }
 
   if ((ret = tsem_wait(&pSched->emptySem)) != 0) {
@@ -185,6 +185,7 @@ void taosScheduleTask(void *queueScheduler, SSchedMsg *pMsg) {
     uFatal("post %s fullSem failed(%s)", pSched->label, strerror(errno));
     ASSERT(0);
   }
+  return ret;
 }
 
 void taosCleanUpScheduler(void *param) {
@@ -220,7 +221,7 @@ void taosCleanUpScheduler(void *param) {
 
   if (pSched->queue) taosMemoryFree(pSched->queue);
   if (pSched->qthread) taosMemoryFree(pSched->qthread);
-  //taosMemoryFree(pSched);
+  // taosMemoryFree(pSched);
 }
 
 // for debug purpose, dump the scheduler status every 1min.