From 79cf4d60270705a11edb4d001e6a7926a83bddda Mon Sep 17 00:00:00 2001
From: Shengliang Guan <slguan@taosdata.com>
Date: Sun, 15 Nov 2020 11:37:17 +0800
Subject: [PATCH] TD-1924

---
 src/sync/src/syncMain.c     | 1 +
 src/sync/src/syncRetrieve.c | 2 ++
 src/util/src/tsocket.c      | 4 ++--
 3 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/src/sync/src/syncMain.c b/src/sync/src/syncMain.c
index 93739ca3d1..302f08bdb9 100644
--- a/src/sync/src/syncMain.c
+++ b/src/sync/src/syncMain.c
@@ -578,6 +578,7 @@ static void syncChooseMaster(SSyncNode *pNode) {
 
 #if 0
       for (int32_t i = 0; i < pNode->replica; ++i) {
+        if (i == index) continue;
         pPeer = pNode->peerInfo[i];
         if (pPeer->version == nodeVersion) {
           pPeer->role = TAOS_SYNC_ROLE_SLAVE;
diff --git a/src/sync/src/syncRetrieve.c b/src/sync/src/syncRetrieve.c
index 968f5becad..21151f1199 100644
--- a/src/sync/src/syncRetrieve.c
+++ b/src/sync/src/syncRetrieve.c
@@ -182,6 +182,8 @@ static int32_t syncReadOneWalRecord(int32_t sfd, SWalHead *pHead, uint32_t *pEve
     return 0;
   }
 
+  assert(pHead->len <= TSDB_MAX_WAL_SIZE);
+
   ret = read(sfd, pHead->cont, pHead->len);
   if (ret < 0) return -1;
 
diff --git a/src/util/src/tsocket.c b/src/util/src/tsocket.c
index 1003bc6178..11932ac03a 100644
--- a/src/util/src/tsocket.c
+++ b/src/util/src/tsocket.c
@@ -107,7 +107,7 @@ int32_t taosWriteMsg(SOCKET fd, void *buf, int32_t nbytes) {
   while (nleft > 0) {
     nwritten = (int32_t)taosWriteSocket(fd, (char *)ptr, (size_t)nleft);
     if (nwritten <= 0) {
-      if (errno == EINTR)
+      if (errno == EINTR || errno == EAGAIN || errno == EWOULDBLOCK)
         continue;
       else
         return -1;
@@ -133,7 +133,7 @@ int32_t taosReadMsg(SOCKET fd, void *buf, int32_t nbytes) {
     if (nread == 0) {
       break;
     } else if (nread < 0) {
-      if (errno == EINTR) {
+      if (errno == EINTR || errno == EAGAIN || errno == EWOULDBLOCK) {
         continue;
       } else {
         return -1;
-- 
GitLab