From 311c56c1d7ea4bb80809d0b5242dbd9e6914091c Mon Sep 17 00:00:00 2001
From: slguan <slguan@taosdata.com>
Date: Wed, 1 Apr 2020 12:28:03 +0800
Subject: [PATCH] [TD-63] fix bug in grant module

---
 src/dnode/src/dnodeMain.c | 16 +++++++---------
 src/mnode/src/mgmtMain.c  |  2 ++
 2 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/src/dnode/src/dnodeMain.c b/src/dnode/src/dnodeMain.c
index 80b4338df6..3dde3f8d50 100644
--- a/src/dnode/src/dnodeMain.c
+++ b/src/dnode/src/dnodeMain.c
@@ -37,7 +37,6 @@ static void dnodeSetRunStatus(SDnodeRunStatus status);
 static void signal_handler(int32_t signum, siginfo_t *sigInfo, void *context);
 static void dnodeCheckDataDirOpenned(char *dir);
 static SDnodeRunStatus tsDnodeRunStatus = TSDB_DNODE_RUN_STATUS_STOPPED;
-void (*dnodeParseParameterKFp)() = NULL;
 
 int32_t main(int32_t argc, char *argv[]) {
   // Set global configuration file
@@ -57,25 +56,24 @@ int32_t main(int32_t argc, char *argv[]) {
       printf("buildinfo: %s\n", buildinfo);
       exit(EXIT_SUCCESS);
     } else if (strcmp(argv[i], "-k") == 0) {
-      if (dnodeParseParameterKFp) {
-        dnodeParseParameterKFp();
-        exit(EXIT_SUCCESS);
-      }
+      grantParseParameter();
+      exit(EXIT_SUCCESS);
+    }
 #ifdef TAOS_MEM_CHECK
-    } else if (strcmp(argv[i], "--alloc-random-fail") == 0) {
-      if ((i < argc - 1) && (argv[i+1][0] != '-')) {
+    else if (strcmp(argv[i], "--alloc-random-fail") == 0) {
+      if ((i < argc - 1) && (argv[i + 1][0] != '-')) {
         taosSetAllocMode(TAOS_ALLOC_MODE_RANDOM_FAIL, argv[++i], true);
       } else {
         taosSetAllocMode(TAOS_ALLOC_MODE_RANDOM_FAIL, NULL, true);
       }
     } else if (strcmp(argv[i], "--detect-mem-leak") == 0) {
-      if ((i < argc - 1) && (argv[i+1][0] != '-')) {
+      if ((i < argc - 1) && (argv[i + 1][0] != '-')) {
         taosSetAllocMode(TAOS_ALLOC_MODE_DETECT_LEAK, argv[++i], true);
       } else {
         taosSetAllocMode(TAOS_ALLOC_MODE_DETECT_LEAK, NULL, true);
       }
-#endif
     }
+#endif
   }
 
   /* Set termination handler. */
diff --git a/src/mnode/src/mgmtMain.c b/src/mnode/src/mgmtMain.c
index 657bad966c..4a81c9b691 100644
--- a/src/mnode/src/mgmtMain.c
+++ b/src/mnode/src/mgmtMain.c
@@ -126,6 +126,8 @@ int32_t mgmtStartSystem() {
     mError("failed to init dnode balance")
   }
 
+  grantReset(TSDB_GRANT_ALL, 0);
+
   mPrint("TDengine mgmt is initialized successfully");
 
   return 0;
-- 
GitLab