Merge pull request #23818 from taosdata/fix/TD-27455

fix:add O_CLOSEXEC for .running & process snode when drop stream
taosdata · Nov 27, 2023 · e85c634 · e85c634
2 parents d3ac79a + ff0828f
commit e85c634
Show file tree

Hide file tree

Showing 4 changed files with 13 additions and 4 deletions.
diff --git a/include/os/osFile.h b/include/os/osFile.h
@@ -64,6 +64,7 @@ typedef struct TdFile *TdFilePtr;
 #define TD_FILE_EXCL          0x0080
 #define TD_FILE_STREAM        0x0100  // Only support taosFprintfFile, taosGetLineFile, taosEOFFile
 #define TD_FILE_WRITE_THROUGH 0x0200
+#define TD_FILE_CLOEXEC       0x0400
 TdFilePtr taosOpenFile(const char *path, int32_t tdFileOptions);
 TdFilePtr taosCreateFile(const char *path, int32_t tdFileOptions);
 

diff --git a/source/dnode/mgmt/node_util/src/dmFile.c b/source/dnode/mgmt/node_util/src/dmFile.c
@@ -149,7 +149,7 @@ TdFilePtr dmCheckRunning(const char *dataDir) {
   char filepath[PATH_MAX] = {0};
   snprintf(filepath, sizeof(filepath), "%s%s.running", dataDir, TD_DIRSEP);
 
-  TdFilePtr pFile = taosOpenFile(filepath, TD_FILE_CREATE | TD_FILE_WRITE | TD_FILE_TRUNC);
+  TdFilePtr pFile = taosOpenFile(filepath, TD_FILE_CREATE | TD_FILE_WRITE | TD_FILE_TRUNC | TD_FILE_CLOEXEC);
   if (pFile == NULL) {
     terrno = TAOS_SYSTEM_ERROR(errno);
     dError("failed to open file:%s since %s", filepath, terrstr());

diff --git a/source/dnode/mnode/impl/src/mndStream.c b/source/dnode/mnode/impl/src/mndStream.c
@@ -18,6 +18,7 @@
 #include "mndDb.h"
 #include "mndDnode.h"
 #include "mndMnode.h"
+#include "mndSnode.h"
 #include "mndPrivilege.h"
 #include "mndScheduler.h"
 #include "mndShow.h"
@@ -697,9 +698,15 @@ static int32_t mndPersistTaskDropReq(SMnode* pMnode, STrans *pTrans, SStreamTask
   pReq->streamId = pTask->id.streamId;
 
   STransAction action = {0};
-  SVgObj *pVgObj = mndAcquireVgroup(pMnode, pTask->info.nodeId);
-  SEpSet  epset = mndGetVgroupEpset(pMnode, pVgObj);
-  mndReleaseVgroup(pMnode, pVgObj);
+  SEpSet  epset = {0};
+  if(pTask->info.nodeId == SNODE_HANDLE){
+    SSnodeObj* pObj = mndAcquireSnode(pMnode, pTask->info.nodeId);
+    addEpIntoEpSet(&epset, pObj->pDnode->fqdn, pObj->pDnode->port);
+  }else{
+    SVgObj *pVgObj = mndAcquireVgroup(pMnode, pTask->info.nodeId);
+    epset = mndGetVgroupEpset(pMnode, pVgObj);
+    mndReleaseVgroup(pMnode, pVgObj);
+  }
 
   // The epset of nodeId of this task may have been expired now, let's use the newest epset from mnode.
   initTransAction(&action, pReq, sizeof(SVDropStreamTaskReq), TDMT_STREAM_TASK_DROP, &epset, 0);

diff --git a/source/os/src/osFile.c b/source/os/src/osFile.c
@@ -647,6 +647,7 @@ int taosOpenFileNotStream(const char *path, int32_t tdFileOptions) {
   access |= (tdFileOptions & TD_FILE_APPEND) ? O_APPEND : 0;
   access |= (tdFileOptions & TD_FILE_TEXT) ? O_TEXT : 0;
   access |= (tdFileOptions & TD_FILE_EXCL) ? O_EXCL : 0;
+  access |= (tdFileOptions & TD_FILE_CLOEXEC) ? O_CLOEXEC : 0;
   int fd = open(path, access, S_IRWXU | S_IRWXG | S_IRWXO);
   return fd;
 }