diff --git a/src/client/src/tscLocal.c b/src/client/src/tscLocal.c
index 7208dc4d72269069a1e3aa5bcc6e8122954f09c1..b7e3c7199dade648fb3a4c45c8712e6ca8fb439a 100644
--- a/src/client/src/tscLocal.c
+++ b/src/client/src/tscLocal.c
@@ -434,6 +434,17 @@ static void tscProcessServStatus(SSqlObj *pSql) {
     if (pObj->pHb->res.code == TSDB_CODE_NETWORK_UNAVAIL) {
       pSql->res.code = TSDB_CODE_NETWORK_UNAVAIL;
       return;
+    } else {
+      int32_t* data = (int32_t*) pObj->pHb->res.data;
+      
+      int32_t totalDnode = data[0];
+      int32_t onlineDnode = data[1];
+      assert(onlineDnode <= totalDnode);
+      
+      if (onlineDnode < totalDnode) {
+        pSql->res.code = TSDB_CODE_NETWORK_UNAVAIL;
+        return;
+      }
     }
   } else {
     if (pSql->res.code == TSDB_CODE_NETWORK_UNAVAIL) {
diff --git a/src/client/src/tscServer.c b/src/client/src/tscServer.c
index 08ea7f77ba7f31f53feb5c3ccf6dd950819d7b5b..ea42f32cf65c53ccecf748459b3ea0aa8f776bdf 100644
--- a/src/client/src/tscServer.c
+++ b/src/client/src/tscServer.c
@@ -106,12 +106,12 @@ static int32_t tscGetMgmtConnMaxRetryTimes() {
   return tscMgmtIpList.numOfIps * factor;
 }
 
-void tscProcessHeartBeatRsp(void *param, TAOS_RES *tres, int code) {
+int32_t tscProcessHeartBeatRsp(void *param, TAOS_RES *tres, int code) {
   STscObj *pObj = (STscObj *)param;
-  if (pObj == NULL) return;
+  if (pObj == NULL) return TSDB_CODE_APP_ERROR;
   if (pObj != pObj->signature) {
     tscError("heart beat msg, pObj:%p, signature:%p invalid", pObj, pObj->signature);
-    return;
+    return TSDB_CODE_APP_ERROR;
   }
 
   SSqlObj *pSql = pObj->pHb;
@@ -128,11 +128,19 @@ void tscProcessHeartBeatRsp(void *param, TAOS_RES *tres, int code) {
       if (pRsp->queryId) tscKillQuery(pObj, pRsp->queryId);
       if (pRsp->streamId) tscKillStream(pObj, pRsp->streamId);
     }
+    
+    if (pRes->data == NULL) {
+      pRes->data = calloc(2, sizeof(int32_t));
+    }
+    
+    ((int32_t*)pRes->data)[0] = htonl(pRsp->totalDnodes);
+    ((int32_t*)pRes->data)[1] = htonl(pRsp->onlineDnodes);
   } else {
     tscTrace("heart beat failed, code:%d", code);
   }
 
   taosTmrReset(tscProcessActivityTimer, tsShellActivityTimer * 500, pObj, tscTmr, &pObj->pTimer);
+  return code;
 }
 
 void tscProcessActivityTimer(void *handle, void *tmrId) {