From d8f1671f3bedfbdbe7331f23f1e210fc597a8f45 Mon Sep 17 00:00:00 2001
From: slguan <slguan@taosdata.com>
Date: Tue, 5 May 2020 22:20:08 +0800
Subject: [PATCH 1/2] change wal path

---
 src/mnode/src/mgmtSdb.c | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

diff --git a/src/mnode/src/mgmtSdb.c b/src/mnode/src/mgmtSdb.c
index 3717277992..51f8984b48 100644
--- a/src/mnode/src/mgmtSdb.c
+++ b/src/mnode/src/mgmtSdb.c
@@ -143,7 +143,9 @@ static void *sdbGetTableFromId(int32_t tableId) {
 
 static int32_t sdbInitWal() {
   SWalCfg walCfg = {.commitLog = 2, .wals = 2, .keep = 1};
-  tsSdbObj.wal = walOpen(tsMnodeDir, &walCfg);
+  char temp[TSDB_FILENAME_LEN];
+  sprintf(temp, "%s/wal", tsMnodeDir);
+  tsSdbObj.wal = walOpen(temp, &walCfg);
   if (tsSdbObj.wal == NULL) {
     sdbError("failed to open sdb wal in %s", tsMnodeDir);
     return -1;
@@ -195,10 +197,12 @@ static uint32_t sdbGetFileInfo(void *ahandle, char *name, uint32_t *index, int32
   return 0;
 }
 
+#if 0
 static int sdbGetWalInfo(void *ahandle, char *name, uint32_t *index) {
   strcpy(name, "wal0");
   return 0;
 }
+#endif
 
 static void sdbNotifyRole(void *ahandle, int8_t role) {
   sdbPrint("mnode role changed from %s to %s", mgmtGetMnodeRoleStr(tsSdbObj.role), mgmtGetMnodeRoleStr(role));
@@ -281,9 +285,9 @@ void sdbUpdateSync() {
   syncInfo.vgId = 1;
   syncInfo.version = sdbGetVersion();
   syncInfo.syncCfg = syncCfg;
-  sprintf(syncInfo.path, "%s/", tsMnodeDir);
-  syncInfo.ahandle = NULL;
-  syncInfo.getWalInfo = sdbGetWalInfo;
+  sprintf(syncInfo.path, "%s", tsMnodeDir);
+  syncInfo.ahandle = tsSdbObj.wal;
+  syncInfo.getWalInfo = walGetWalFile;
   syncInfo.getFileInfo = sdbGetFileInfo;
   syncInfo.writeToCache = sdbWrite;
   syncInfo.confirmForward = sdbConfirmForward; 

From 54a704a467e8e0ef17e42b7f523c42b6503c8616 Mon Sep 17 00:00:00 2001
From: slguan <slguan@taosdata.com>
Date: Tue, 5 May 2020 22:28:33 +0800
Subject: [PATCH 2/2] a small change

---
 src/mnode/src/mgmtSdb.c | 9 +++------
 1 file changed, 3 insertions(+), 6 deletions(-)

diff --git a/src/mnode/src/mgmtSdb.c b/src/mnode/src/mgmtSdb.c
index 51f8984b48..a55869222d 100644
--- a/src/mnode/src/mgmtSdb.c
+++ b/src/mnode/src/mgmtSdb.c
@@ -197,12 +197,9 @@ static uint32_t sdbGetFileInfo(void *ahandle, char *name, uint32_t *index, int32
   return 0;
 }
 
-#if 0
 static int sdbGetWalInfo(void *ahandle, char *name, uint32_t *index) {
-  strcpy(name, "wal0");
-  return 0;
+  return walGetWalFile(tsSdbObj.wal, name, index);
 }
-#endif
 
 static void sdbNotifyRole(void *ahandle, int8_t role) {
   sdbPrint("mnode role changed from %s to %s", mgmtGetMnodeRoleStr(tsSdbObj.role), mgmtGetMnodeRoleStr(role));
@@ -286,8 +283,8 @@ void sdbUpdateSync() {
   syncInfo.version = sdbGetVersion();
   syncInfo.syncCfg = syncCfg;
   sprintf(syncInfo.path, "%s", tsMnodeDir);
-  syncInfo.ahandle = tsSdbObj.wal;
-  syncInfo.getWalInfo = walGetWalFile;
+  syncInfo.ahandle = NULL;
+  syncInfo.getWalInfo = sdbGetWalInfo;
   syncInfo.getFileInfo = sdbGetFileInfo;
   syncInfo.writeToCache = sdbWrite;
   syncInfo.confirmForward = sdbConfirmForward;