Merge pull request #11455 from taosdata/fix/ZhiqiangWang/TD-13254-fix-taosd-k

fix(grant): taosd -k.

include/os/osFile.h

@@ -79,7 +79,7 @@ int64_t taosPReadFile(TdFilePtr pFile, void *buf, int64_t count, int64_t offset)
 int64_t taosWriteFile(TdFilePtr pFile, const void *buf, int64_t count);
 void    taosFprintfFile(TdFilePtr pFile, const char *format, ...);
 
-int64_t taosGetLineFile(TdFilePtr pFile, char ** __restrict__ ptrBuf);
+int64_t taosGetLineFile(TdFilePtr pFile, char ** __restrict ptrBuf);
 
 int32_t taosEOFFile(TdFilePtr pFile);
  

include/os/osSystem.h

@@ -29,6 +29,13 @@ extern "C" {
     #define tcgetattr TCGETATTR_FUNC_TAOS_FORBID
 #endif
 
+typedef struct TdCmd *TdCmdPtr;
+
+TdCmdPtr taosOpenCmd(const char *cmd);
+int64_t taosGetLineCmd(TdCmdPtr pCmd, char ** __restrict ptrBuf);
+int32_t taosEOFCmd(TdCmdPtr pCmd);
+int64_t taosCloseCmd(TdCmdPtr *ppCmd);
+
 void* taosLoadDll(const char* filename);
 void* taosLoadSym(void* handle, char* name);
 void  taosCloseDll(void* handle);

source/dnode/mgmt/CMakeLists.txt

@@ -20,6 +20,7 @@ add_executable(taosd ${EXEC_SRC})
 target_include_directories(
     taosd
     PRIVATE "${CMAKE_CURRENT_SOURCE_DIR}/inc"
+    PRIVATE "${TD_SOURCE_DIR}/source/dnode/mnode/impl/inc"
 )
 target_link_libraries(taosd dnode)
 
@@ -28,7 +29,6 @@ IF (TD_GRANT)
 ENDIF ()
 IF (TD_USB_DONGLE)
   TARGET_LINK_LIBRARIES(taosd usb_dongle)
-else()
 ENDIF ()
 
 if(${BUILD_TEST})

source/dnode/mgmt/exe/dndMain.c

@@ -16,7 +16,7 @@
 #define _DEFAULT_SOURCE
 #include "dndInt.h"
 #include "tconfig.h"
-#include "tgrant.h"
+#include "mndGrant.h"
 
 static struct {
   bool     dumpConfig;

source/dnode/mnode/impl/CMakeLists.txt

@@ -9,6 +9,13 @@ target_link_libraries(
     mnode scheduler sdb wal transport cjson sync monitor executor qworker stream parser
 )
 
+IF (TD_GRANT)
+  TARGET_LINK_LIBRARIES(mnode grant)
+ENDIF ()
+IF (TD_USB_DONGLE)
+  TARGET_LINK_LIBRARIES(mnode usb_dongle)
+ENDIF ()
+
 if(${BUILD_TEST})
     add_subdirectory(test)
 endif(${BUILD_TEST})

include/common/tgrant.h → source/dnode/mnode/impl/inc/mndGrant.h

@@ -36,8 +36,8 @@ typedef enum {
   TSDB_GRANT_CPU_CORES,
 } EGrantType;
 
-int32_t grantInit();
-void    grantCleanUp();
+int32_t mndInitGrant();
+void    mndCleanupGrant();
 void    grantParseParameter();
 int32_t grantCheck(EGrantType grant);
 void    grantReset(EGrantType grant, uint64_t value);

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

@@ -17,11 +17,11 @@
 #ifndef _GRANT
 #include "os.h"
 #include "taoserror.h"
-#include "tgrant.h"
+#include "mndGrant.h"
 #include "mndInt.h"
 
-int32_t grantInit() { return TSDB_CODE_SUCCESS; }
-void    grantCleanUp() {}
+int32_t mndInitGrant(SMnode *pMnode) { return TSDB_CODE_SUCCESS; }
+void    mndCleanupGrant() {}
 void    grantParseParameter() { mError("can't parsed parameter k"); }
 int32_t grantCheck(EGrantType grant) { return TSDB_CODE_SUCCESS; }
 void    grantReset(EGrantType grant, uint64_t value) {}

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

@@ -40,6 +40,7 @@
 #include "mndUser.h"
 #include "mndVgroup.h"
 #include "mndQuery.h"
+#include "mndGrant.h"
 
 #define MQ_TIMER_MS    3000
 #define TRNAS_TIMER_MS 6000
@@ -197,6 +198,7 @@ static int32_t mndInitSteps(SMnode *pMnode, bool deploy) {
   if (mndAllocStep(pMnode, "mnode-qnode", mndInitBnode, mndCleanupBnode) != 0) return -1;
   if (mndAllocStep(pMnode, "mnode-dnode", mndInitDnode, mndCleanupDnode) != 0) return -1;
   if (mndAllocStep(pMnode, "mnode-user", mndInitUser, mndCleanupUser) != 0) return -1;
+  if (mndAllocStep(pMnode, "mnode-grant", mndInitGrant, mndCleanupGrant) != 0) return -1;
   if (mndAllocStep(pMnode, "mnode-auth", mndInitAuth, mndCleanupAuth) != 0) return -1;
   if (mndAllocStep(pMnode, "mnode-acct", mndInitAcct, mndCleanupAcct) != 0) return -1;
   if (mndAllocStep(pMnode, "mnode-stream", mndInitStream, mndCleanupStream) != 0) return -1;

source/os/src/osFile.c

@@ -768,7 +768,7 @@ int32_t taosUmaskFile(int32_t maskVal) {
 }
 
 int32_t taosGetErrorFile(TdFilePtr pFile) { return errno; }
-int64_t taosGetLineFile(TdFilePtr pFile, char **__restrict__ ptrBuf) {
+int64_t taosGetLineFile(TdFilePtr pFile, char **__restrict ptrBuf) {
   if (pFile == NULL) {
     return -1;
   }

source/os/src/osSystem.c

@@ -29,6 +29,8 @@
 struct termios oldtio;
 #endif
 
+typedef struct FILE TdCmd;
+
 void* taosLoadDll(const char* filename) {
 #if defined(WINDOWS)
   return NULL;
@@ -178,3 +180,33 @@ void resetTerminalMode() {
   }
 #endif
 }
+
+TdCmdPtr taosOpenCmd(const char *cmd) {
+  if (cmd == NULL) return NULL;
+  return (TdCmdPtr)popen(cmd, "r");
+}
+
+int64_t taosGetLineCmd(TdCmdPtr pCmd, char ** __restrict ptrBuf) {
+  if (pCmd == NULL) {
+    return -1;
+  }
+
+  size_t len = 0;
+  return getline(ptrBuf, &len, (FILE*)pCmd);
+}
+
+int32_t taosEOFCmd(TdCmdPtr pCmd) {
+  if (pCmd == NULL) {
+    return 0;
+  }
+  return feof((FILE*)pCmd);
+}
+
+int64_t taosCloseCmd(TdCmdPtr *ppCmd) {
+  if (ppCmd == NULL || *ppCmd == NULL) {
+    return 0;
+  }
+  pclose((FILE*)(*ppCmd));
+  *ppCmd = NULL;
+  return 0;
+}