diff --git a/src/util/src/tnettest.c b/src/util/src/tnettest.c index 0481fe61d31c2f0235d82a70b53735f7663ae67d..40e5e198a820a5838914dad2d4977ed6c9982df0 100644 --- a/src/util/src/tnettest.c +++ b/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; } diff --git a/src/vnode/src/vnodeMain.c b/src/vnode/src/vnodeMain.c index e286a972dc97f94613614fdefea273cae7459f26..36983c1cf0e4b7bc3f86eb11132cc844f2a7e9be 100644 --- a/src/vnode/src/vnodeMain.c +++ b/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); }