Merge remote-tracking branch 'origin/enh/triggerCheckPoint2' into enh/triggerCheckPoint2

# Conflicts:
#	source/dnode/mnode/impl/src/mndStream.c

source/dnode/mnode/impl/src/mndStream.c

@@ -77,7 +77,7 @@ static int32_t mndBuildStreamCheckpointSourceReq2(void **pBuf, int32_t *pLen, in
                                                   int64_t streamId, int32_t taskId);
 static int32_t mndProcessNodeCheck(SRpcMsg *pReq);
 static int32_t mndProcessNodeCheckReq(SRpcMsg *pMsg);
-static void keepStreamTasksInBuf(SStreamObj* pStream, SStreamVnodeRevertIndex* pExecNode);
+static void    keepStreamTasksInBuf(SStreamObj *pStream, SStreamVnodeRevertIndex *pExecNode);
 
 static SArray           *doExtractNodeListFromStream(SMnode *pMnode);
 static SArray           *mndTakeVgroupSnapshot(SMnode *pMnode);
@@ -129,7 +129,12 @@ int32_t mndInitStream(SMnode *pMnode) {
   return sdbSetTable(pMnode->pSdb, table);
 }
 
-void mndCleanupStream(SMnode *pMnode) {}
+void mndCleanupStream(SMnode *pMnode) {
+  taosArrayDestroy(execNodeList.pTaskList);
+  taosHashCleanup(execNodeList.pTaskMap);
+  taosThreadMutexDestroy(&execNodeList.lock);
+  mDebug("mnd stream cleanup");
+}
 
 SSdbRaw *mndStreamActionEncode(SStreamObj *pStream) {
   terrno = TSDB_CODE_OUT_OF_MEMORY;
@@ -1167,12 +1172,12 @@ static int32_t mndProcessStreamDoCheckpoint(SRpcMsg *pReq) {
     }
   }
 
-  {// check if all tasks are in TASK_STATUS__NORMAL status
+  {  // check if all tasks are in TASK_STATUS__NORMAL status
     bool ready = true;
 
     taosThreadMutexLock(&execNodeList.lock);
-    for(int32_t i = 0; i < taosArrayGetSize(execNodeList.pTaskList); ++i) {
-      STaskStatusEntry* p = taosArrayGet(execNodeList.pTaskList, i);
+    for (int32_t i = 0; i < taosArrayGetSize(execNodeList.pTaskList); ++i) {
+      STaskStatusEntry *p = taosArrayGet(execNodeList.pTaskList, i);
       if (p->status != TASK_STATUS__NORMAL) {
         mDebug("s-task:0x%" PRIx64 "-0x%x (nodeId:%d) status:%s not ready, create checkpoint msg not issued",
                p->streamId, p->taskId, 0, streamGetTaskStatusStr(p->status));
@@ -1197,9 +1202,9 @@ static int32_t mndProcessStreamDoCheckpoint(SRpcMsg *pReq) {
   }
   mDebug("start to trigger checkpoint, checkpointId: %" PRId64 "", checkpointId);
 
-  const char* pDb = mndGetStreamDB(pMnode);
+  const char *pDb = mndGetStreamDB(pMnode);
   mndTransSetDbName(pTrans, pDb, "checkpoint");
-  taosMemoryFree((void*)pDb);
+  taosMemoryFree((void *)pDb);
 
   if (mndTransCheckConflict(pMnode, pTrans) != 0) {
     mError("failed to trigger checkpoint, checkpointId: %" PRId64 ", reason:%s", checkpointId,
@@ -2226,7 +2231,7 @@ static int32_t mndProcessNodeCheck(SRpcMsg *pReq) {
   return 0;
 }
 
-static void keepStreamTasksInBuf(SStreamObj* pStream, SStreamVnodeRevertIndex* pExecNode) {
+static void keepStreamTasksInBuf(SStreamObj *pStream, SStreamVnodeRevertIndex *pExecNode) {
   int32_t level = taosArrayGetSize(pStream->tasks);
   for (int32_t i = 0; i < level; i++) {
     SArray *pLevel = taosArrayGetP(pStream->tasks, i);
@@ -2236,7 +2241,7 @@ static void keepStreamTasksInBuf(SStreamObj* pStream, SStreamVnodeRevertIndex* p
       SStreamTask *pTask = taosArrayGetP(pLevel, j);
       int64_t      keys[2] = {pTask->id.streamId, pTask->id.taskId};
 
-      void* p = taosHashGet(pExecNode->pTaskMap, keys, sizeof(keys));
+      void *p = taosHashGet(pExecNode->pTaskMap, keys, sizeof(keys));
       if (p == NULL) {
         STaskStatusEntry entry = {
             .streamId = pTask->id.streamId, .taskId = pTask->id.taskId, .status = TASK_STATUS__STOP};
@@ -2250,7 +2255,7 @@ static void keepStreamTasksInBuf(SStreamObj* pStream, SStreamVnodeRevertIndex* p
 }
 
 // todo: this process should be executed by the write queue worker of the mnode
- int32_t mndProcessStreamHb(SRpcMsg *pReq) {
+int32_t mndProcessStreamHb(SRpcMsg *pReq) {
   SMnode *pMnode = pReq->info.node;
 
   SStreamHbMsg req = {0};
@@ -2260,11 +2265,13 @@ static void keepStreamTasksInBuf(SStreamObj* pStream, SStreamVnodeRevertIndex* p
   tDecoderInit(&decoder, pReq->pCont, pReq->contLen);
 
   if (tDecodeStreamHbMsg(&decoder, &req) < 0) {
+    tDecoderClear(&decoder);
     terrno = TSDB_CODE_INVALID_MSG;
     return -1;
   }
+  tDecoderClear(&decoder);
 
-//  int64_t now = taosGetTimestampSec();
+  //  int64_t now = taosGetTimestampSec();
   mTrace("receive stream-meta hb from vgId:%d, active numOfTasks:%d", req.vgId, req.numOfTasks);
 
   taosThreadMutexLock(&execNodeList.lock);
@@ -2273,7 +2280,6 @@ static void keepStreamTasksInBuf(SStreamObj* pStream, SStreamVnodeRevertIndex* p
     doExtractTasksFromStream(pMnode);
   }
 
-  // todo remove it when drop stream
   for(int32_t i = 0; i < req.numOfTasks; ++i) {
     STaskStatusEntry* p = taosArrayGet(req.pTaskStatus, i);
     int64_t k[2] = {p->streamId, p->taskId};
@@ -2287,9 +2293,11 @@ static void keepStreamTasksInBuf(SStreamObj* pStream, SStreamVnodeRevertIndex* p
   }
   taosThreadMutexUnlock(&execNodeList.lock);
 
+  taosArrayDestroy(req.pTaskStatus);
+
   //  bool nodeChanged = false;
-//  SArray* pList = taosArrayInit(4, sizeof(int32_t));
-/*
+  //  SArray* pList = taosArrayInit(4, sizeof(int32_t));
+  /*
     // record the timeout node
     for(int32_t i = 0; i < taosArrayGetSize(execNodeList.pNodeEntryList); ++i) {
       SNodeEntry* pEntry = taosArrayGet(execNodeList.pNodeEntryList, i);
@@ -2308,10 +2316,10 @@ static void keepStreamTasksInBuf(SStreamObj* pStream, SStreamVnodeRevertIndex* p
 
       // check epset to identify whether the node has been transferred to other dnodes.
       // node the epset is changed, which means the node transfer has occurred for this node.
-//    if (!isEpsetEqual(&pEntry->epset, &req.epset)) {
-//      nodeChanged = true;
-//      break;
-//    }
+  //    if (!isEpsetEqual(&pEntry->epset, &req.epset)) {
+  //      nodeChanged = true;
+  //      break;
+  //    }
     }
 
     // todo handle the node timeout case. Once the vnode is off-line, we should check the dnode status from mnode,
@@ -2335,16 +2343,16 @@ static void keepStreamTasksInBuf(SStreamObj* pStream, SStreamVnodeRevertIndex* p
 
         // update the related upstream and downstream tasks, todo remove this, no need this function
         taosWLockLatch(&pStream->lock);
-//      streamTaskUpdateEpInfo(pStream->tasks, req.vgId, &req.epset);
-//      streamTaskUpdateEpInfo(pStream->pHTasksList, req.vgId, &req.epset);
+  //      streamTaskUpdateEpInfo(pStream->tasks, req.vgId, &req.epset);
+  //      streamTaskUpdateEpInfo(pStream->pHTasksList, req.vgId, &req.epset);
         taosWUnLockLatch(&pStream->lock);
 
-//      code = createStreamUpdateTrans(pMnode, pStream, nodeId, );
-//      if (code != TSDB_CODE_SUCCESS) {
-//         todo
-////      }
-//    }
+  //      code = createStreamUpdateTrans(pMnode, pStream, nodeId, );
+  //      if (code != TSDB_CODE_SUCCESS) {
+  //         todo
+  ////      }
+  //    }
     }
-*/
+  */
   return TSDB_CODE_SUCCESS;
 }

source/libs/stream/src/streamBackendRocksdb.c

@@ -790,14 +790,13 @@ int32_t chkpGetAllDbCfHandle(SStreamMeta* pMeta, rocksdb_column_family_handle_t*
     for (int i = 0; i < sizeof(ginitDict) / sizeof(ginitDict[0]); i++) {
       if (wrapper->pHandle[i]) {
         rocksdb_column_family_handle_t* p = wrapper->pHandle[i];
-        size_t                          len = 0;
-        char*                           name = rocksdb_column_family_handle_get_name(p, &len);
+        taosArrayPush(pHandle, &p);
+        //  size_t                          len = 0;
+        //  char*                           name = rocksdb_column_family_handle_get_name(p, &len);
         //   char                            buf[64] = {0};
         //   memcpy(buf, name, len);
         //   qError("column name: name: %s, len: %d", buf, (int)len);
         //   taosMemoryFree(name);
-
-        taosArrayPush(pHandle, &p);
       }
     }
     taosThreadRwlockUnlock(&wrapper->rwLock);