Merge pull request #6284 from taosdata/feature/TD-1920

[TD-1920]load mininal modules,and disable sync wal when compact mnode wal

src/dnode/src/dnodeMain.c

@@ -86,6 +86,17 @@ static SStep tsDnodeSteps[] = {
   {"dnode-telemetry", dnodeInitTelemetry,  dnodeCleanupTelemetry},
 };
 
+static SStep tsDnodeCompactSteps[] = {
+  {"dnode-tfile",     tfInit,              tfCleanup},
+  {"dnode-storage",   dnodeInitStorage,    dnodeCleanupStorage},
+  {"dnode-eps",       dnodeInitEps,        dnodeCleanupEps},
+  {"dnode-wal",       walInit,             walCleanUp},
+  {"dnode-mread",     dnodeInitMRead,      NULL},
+  {"dnode-mwrite",    dnodeInitMWrite,     NULL},
+  {"dnode-mpeer",     dnodeInitMPeer,      NULL},
+  {"dnode-modules",   dnodeInitModules,    dnodeCleanupModules},
+};
+
 static int dnodeCreateDir(const char *dir) {
   if (mkdir(dir, 0755) != 0 && errno != EEXIST) {
     return -1;
@@ -95,13 +106,23 @@ static int dnodeCreateDir(const char *dir) {
 }
 
 static void dnodeCleanupComponents() {
-  int32_t stepSize = sizeof(tsDnodeSteps) / sizeof(SStep);
-  dnodeStepCleanup(tsDnodeSteps, stepSize);
+  if (!tsCompactMnodeWal) {
+    int32_t stepSize = sizeof(tsDnodeSteps) / sizeof(SStep);
+    dnodeStepCleanup(tsDnodeSteps, stepSize);
+  } else {
+    int32_t stepSize = sizeof(tsDnodeCompactSteps) / sizeof(SStep);
+    dnodeStepCleanup(tsDnodeCompactSteps, stepSize);
+  }
 }
 
 static int32_t dnodeInitComponents() {
-  int32_t stepSize = sizeof(tsDnodeSteps) / sizeof(SStep);
-  return dnodeStepInit(tsDnodeSteps, stepSize);
+  if (!tsCompactMnodeWal) {
+    int32_t stepSize = sizeof(tsDnodeSteps) / sizeof(SStep);
+    return dnodeStepInit(tsDnodeSteps, stepSize);
+  } else {
+    int32_t stepSize = sizeof(tsDnodeCompactSteps) / sizeof(SStep);
+    return dnodeStepInit(tsDnodeCompactSteps, stepSize);
+  }
 }
 
 static int32_t dnodeInitTmr() {

src/mnode/src/mnodeMain.c

@@ -121,7 +121,7 @@ int32_t mnodeStartSystem() {
 
 int32_t mnodeInitSystem() {
   mnodeInitTimer();
-  if (mnodeNeedStart()) {
+  if (mnodeNeedStart() || tsCompactMnodeWal) {
     return mnodeStartSystem();
   }
   return 0;

src/mnode/src/mnodeSdb.c

@@ -690,7 +690,7 @@ static int32_t sdbProcessWrite(void *wparam, void *hparam, int32_t qtype, void *
   pthread_mutex_unlock(&tsSdbMgmt.mutex);
 
   // from app, row is created
-  if (pRow != NULL) {
+  if (pRow != NULL && tsCompactMnodeWal != 1) {
     // forward to peers
     pRow->processedCount = 0;
     int32_t syncCode = syncForwardToPeer(tsSdbMgmt.sync, pHead, pRow, TAOS_QTYPE_RPC, false);
@@ -713,7 +713,9 @@ static int32_t sdbProcessWrite(void *wparam, void *hparam, int32_t qtype, void *
            actStr[action], sdbGetKeyStr(pTable, pHead->cont), pHead->version);
 
   // even it is WAL/FWD, it shall be called to update version in sync
-  syncForwardToPeer(tsSdbMgmt.sync, pHead, pRow, TAOS_QTYPE_RPC, false);
+  if (tsCompactMnodeWal != 1) {
+    syncForwardToPeer(tsSdbMgmt.sync, pHead, pRow, TAOS_QTYPE_RPC, false);
+  }
 
   // from wal or forward msg, row not created, should add into hash
   if (action == SDB_ACTION_INSERT) {

src/mnode/src/mnodeTable.c

@@ -3375,7 +3375,7 @@ static int32_t mnodeCompactSuperTables() {
       .rowSize = sizeof(SSTableObj) + schemaSize,
     };
 
-    mInfo("compact super %" PRIu64, pTable->uid);
+    //mInfo("compact super %" PRIu64, pTable->uid);
     
     sdbInsertCompactRow(&row);
   }
@@ -3401,7 +3401,7 @@ static int32_t mnodeCompactChildTables() {
       .pTable = tsChildTableSdb,
     };
 
-    mInfo("compact child %" PRIu64 ":%d", pTable->uid, pTable->tid);
+    //mInfo("compact child %" PRIu64 ":%d", pTable->uid, pTable->tid);
     
     sdbInsertCompactRow(&row);
   }

src/wal/src/walWrite.c

@@ -430,6 +430,8 @@ static int32_t walRestoreWalFile(SWal *pWal, void *pVnode, FWalWrite writeFp, ch
            pWal->vgId, fileId, pHead->version, pWal->version, pHead->len, offset);
 
     pWal->version = pHead->version;
+
+    //wInfo("writeFp: %ld", offset);
     (*writeFp)(pVnode, pHead, TAOS_QTYPE_WAL, NULL);
   }