Merge branch 'feature/wal' of https://github.com/taosdata/TDengine into feature/wal

src/util/src/tnettest.c

@@ -156,7 +156,7 @@ static void *taosNetBindTcpPort(void *sarg) {
 
     int32_t ret = taosReadMsg(client, buffer, pinfo->pktLen);
     if (ret < 0 || ret != pinfo->pktLen) {
-      uError("TCP: failed to read %d bytes at port:%d since %s", port, strerror(errno));
+      uError("TCP: failed to read %d bytes at port:%d since %s", pinfo->pktLen, port, strerror(errno));
       taosCloseSocket(serverSocket);
       return NULL;
     }
@@ -165,7 +165,7 @@ static void *taosNetBindTcpPort(void *sarg) {
 
     ret = taosWriteMsg(client, buffer, pinfo->pktLen);
     if (ret < 0) {
-      uError("TCP: failed to write %d bytes at %d since %s", pinfo->pktLen, strerror(errno), port);
+      uError("TCP: failed to write %d bytes at %d since %s", pinfo->pktLen, port, strerror(errno));
       taosCloseSocket(serverSocket);
       return NULL;
     }
@@ -211,7 +211,7 @@ static int32_t taosNetCheckTcpPort(STestInfo *info) {
 
   int32_t ret = taosWriteMsg(clientSocket, buffer, info->pktLen);
   if (ret < 0) {
-    uError("TCP: failed to write msg to %s:%d since %s", info->port, taosIpStr(info->hostIp), strerror(errno));
+    uError("TCP: failed to write msg to %s:%d since %s", taosIpStr(info->hostIp), info->port, strerror(errno));
     return -1;
   }
 

src/vnode/src/vnodeMain.c

@@ -441,7 +441,6 @@ static int32_t vnodeProcessTsdbStatus(void *arg, int32_t status, int32_t eno) {
 
   if (status == TSDB_STATUS_COMMIT_START) {
     pVnode->isCommiting = 1;
-    pVnode->fversion = pVnode->version;
     vDebug("vgId:%d, start commit, fver:%" PRIu64 " vver:%" PRIu64, pVnode->vgId, pVnode->fversion, pVnode->version);
     if (!vnodeInInitStatus(pVnode)) {
       return walRenew(pVnode->wal);
@@ -450,9 +449,10 @@ static int32_t vnodeProcessTsdbStatus(void *arg, int32_t status, int32_t eno) {
   }
 
   if (status == TSDB_STATUS_COMMIT_OVER) {
-    vDebug("vgId:%d, commit over, fver:%" PRIu64 " vver:%" PRIu64, pVnode->vgId, pVnode->fversion, pVnode->version);
     pVnode->isCommiting = 0;
     pVnode->isFull = 0;
+    pVnode->fversion = pVnode->version;
+    vDebug("vgId:%d, commit over, fver:%" PRIu64 " vver:%" PRIu64, pVnode->vgId, pVnode->fversion, pVnode->version);
     if (!vnodeInInitStatus(pVnode)) {
       walRemoveOneOldFile(pVnode->wal);
     }