From 542e450f0a1704e3672a184fa1147cc22218f207 Mon Sep 17 00:00:00 2001
From: Bomin Zhang <bmzhang@taosdata.com>
Date: Fri, 21 Aug 2020 08:45:26 +0000
Subject: [PATCH] fix two case of 'unexpected generic error in RPC'

log an error message if failed to call `gethostname`.
don't update epset if peer returns empty epset.
---
 src/rpc/src/rpcMain.c  | 11 +++++++----
 src/util/src/tsocket.c | 21 ++++++++++-----------
 2 files changed, 17 insertions(+), 15 deletions(-)

diff --git a/src/rpc/src/rpcMain.c b/src/rpc/src/rpcMain.c
index 777e4f8240..348f4bda9a 100644
--- a/src/rpc/src/rpcMain.c
+++ b/src/rpc/src/rpcMain.c
@@ -1114,10 +1114,13 @@ static void rpcProcessIncomingMsg(SRpcConn *pConn, SRpcHead *pHead) {
 
     if (pHead->code == TSDB_CODE_RPC_REDIRECT) {
       pContext->numOfTry = 0;
-      memcpy(&pContext->epSet, pHead->content, sizeof(pContext->epSet));
-      tDebug("%s, redirect is received, numOfEps:%d", pConn->info, pContext->epSet.numOfEps);
-      for (int i=0; i<pContext->epSet.numOfEps; ++i) 
-        pContext->epSet.port[i] = htons(pContext->epSet.port[i]);
+      SRpcEpSet *pEpSet = (SRpcEpSet*)pHead->content;
+      if (pEpSet->numOfEps > 0) {
+        memcpy(&pContext->epSet, pHead->content, sizeof(pContext->epSet));
+        tDebug("%s, redirect is received, numOfEps:%d", pConn->info, pContext->epSet.numOfEps);
+        for (int i=0; i<pContext->epSet.numOfEps; ++i) 
+          pContext->epSet.port[i] = htons(pContext->epSet.port[i]);
+      }
       rpcSendReqToServer(pRpc, pContext);
       rpcFreeCont(rpcMsg.pCont);
     } else if (pHead->code == TSDB_CODE_RPC_NOT_READY || pHead->code == TSDB_CODE_APP_NOT_READY) {
diff --git a/src/util/src/tsocket.c b/src/util/src/tsocket.c
index f4778f50ce..61896a86df 100644
--- a/src/util/src/tsocket.c
+++ b/src/util/src/tsocket.c
@@ -19,26 +19,25 @@
 #include "tutil.h"
 
 int taosGetFqdn(char *fqdn) {
-  int  code = 0;
   char hostname[1024];
   hostname[1023] = '\0';
-  gethostname(hostname, 1023);
+  if (gethostname(hostname, 1023) == -1) {
+    uError("failed to get hostname, reason:%s", strerror(errno));
+    return -1;
+  }
 
   struct addrinfo hints = {0};
   struct addrinfo *result = NULL;
-
   hints.ai_flags = AI_CANONNAME;
-
-  int32_t ret = getaddrinfo(hostname, NULL, &hints, &result);
-  if (result) {
-    strcpy(fqdn, result->ai_canonname);
-    freeaddrinfo(result);
-  } else {
+  int ret = getaddrinfo(hostname, NULL, &hints, &result);
+  if (!result) {
     uError("failed to get fqdn, code:%d, reason:%s", ret, gai_strerror(ret));
-    code = -1;
+    return -1;
   }
 
-  return code;
+  strcpy(fqdn, result->ai_canonname);
+  freeaddrinfo(result);
+  return 0;
 }
 
 uint32_t taosGetIpFromFqdn(const char *fqdn) {
-- 
GitLab