#4643

Committed 01 Aug 2025 02:04AM UTC coverage: 60.992% (-0.1%) from 61.105%

Build # #4643

Build Type

push

travis-ci

Committed by

web-flow

Commit Message

merge: from 3.3.6 to main branch (#32389)

* enh: grant support for data source ORC (#32378)

* fix: wrong col_id in ins_columns (#32358)

* test: remove un checked case (#32388)

* fix(parser): subquery use last_row can't found the colname (#32353)

* add col_id info in ins_columns

* fix: test case

---------

Co-authored-by: Kaili Xu <klxu@taosdata.com>
Co-authored-by: Tony Zhang <34825804+Tony2h@users.noreply.github.com>
Co-authored-by: hongzhenliu <wluckyjob@gmail.com>
Co-authored-by: Tony Zhang <tonyzhang@taosdata.com>

Run Details

139991 of 291593 branches covered (48.01%)

Branch coverage included in aggregate %.

10 of 10 new or added lines in 3 files covered. (100.0%)

3514 existing lines in 141 files now uncovered.

211118 of 284074 relevant lines covered (74.32%)

17514058.99 hits per line

Source File
Press 'n' to go to next uncovered line, 'b' for previous

69.42

/source/libs/sync/src/syncTimeout.c

/*
 * Copyright (c) 2019 TAOS Data, Inc. <jhtao@taosdata.com>
 *
 * This program is free software: you can use, redistribute, and/or modify
 * it under the terms of the GNU Affero General Public License, version 3
 * or later ("AGPL"), as published by the Free Software Foundation.
 *
 * This program is distributed in the hope that it will be useful, but WITHOUT
 * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
 * FITNESS FOR A PARTICULAR PURPOSE.
 *
 * You should have received a copy of the GNU Affero General Public License
 * along with this program. If not, see <http://www.gnu.org/licenses/>.
 */

#define _DEFAULT_SOURCE
#include "syncTimeout.h"
#include "syncElection.h"
#include "syncRaftCfg.h"
#include "syncRaftLog.h"
#include "syncReplication.h"
#include "syncRespMgr.h"
#include "syncSnapshot.h"
#include "syncUtil.h"

static void syncNodeCleanConfigIndex(SSyncNode* ths) {
#if 0
  int32_t   newArrIndex = 0;
  SyncIndex newConfigIndexArr[MAX_CONFIG_INDEX_COUNT] = {0};
  SSnapshot snapshot = {0};

  ths->pFsm->FpGetSnapshotInfo(ths->pFsm, &snapshot);
  if (snapshot.lastApplyIndex != SYNC_INDEX_INVALID) {
    for (int32_t i = 0; i < ths->raftCfg.configIndexCount; ++i) {
      if (ths->raftCfg.configIndexArr[i] < snapshot.lastConfigIndex) {
        // pass
      } else {
        // save
        newConfigIndexArr[newArrIndex] = ths->raftCfg.configIndexArr[i];
        ++newArrIndex;
      }
    }

    int32_t oldCnt = ths->raftCfg.configIndexCount;
    ths->raftCfg.configIndexCount = newArrIndex;
    memcpy(ths->raftCfg.configIndexArr, newConfigIndexArr, sizeof(newConfigIndexArr));

    int32_t code = syncWriteCfgFile(ths);
    if (code != 0) {
      sNFatal(ths, "failed to persist cfg");
    } else {
      sNTrace(ths, "clean config index arr, old-cnt:%d, new-cnt:%d", oldCnt, ths->raftCfg.configIndexCount);
    }
  }
#endif
}

static int32_t syncNodeTimerRoutine(SSyncNode* ths) {
  ths->tmrRoutineNum++;

  sDebug("vgId:%d, timer routine, status report", ths->vgId);
  if (ths->tmrRoutineNum % (tsRoutineReportInterval / (ths->pingTimerMS / 1000)) == 0) {
    sNInfo(ths, "timer routines");
  } else {
    sNTrace(ths, "timer routines");
  }

  // timer replicate
  sDebug("vgId:%d, timer routine, node replicate", ths->vgId);
  int32_t ret = 0;
  if((ret = syncNodeReplicate(ths)) != 0){
    sWarn("vgId:%d, failed to replicate node since %s", ths->vgId, tstrerror(ret));
  }

  // clean mnode index
  sDebug("vgId:%d, timer routine, clean config index", ths->vgId);
  if (syncNodeIsMnode(ths)) {
    syncNodeCleanConfigIndex(ths);
  }

  sDebug("vgId:%d, timer routine, snapshot resend", ths->vgId);
  int64_t timeNow = taosGetTimestampMs();

  for (int i = 0; i < ths->peersNum; ++i) {
    SSyncSnapshotSender* pSender = syncNodeGetSnapshotSender(ths, &(ths->peersId[i]));
    if (pSender != NULL) {
      if (ths->isStart && (ths->state == TAOS_SYNC_STATE_LEADER || ths->state == TAOS_SYNC_STATE_ASSIGNED_LEADER) &&
          pSender->start) {
        int64_t elapsedMs = timeNow - pSender->lastSendTime;
        if (elapsedMs < SYNC_SNAP_RESEND_MS) {
          continue;
        }

        if (elapsedMs > SYNC_SNAP_TIMEOUT_MS) {
          sSError(pSender, "snap replication timeout, terminate.");
          snapshotSenderStop(pSender, false);
        } else {
          sSWarn(pSender, "snap replication resend.");
          if((ret = snapshotReSend(pSender)) != 0){
            sWarn("vgId:%d, failed to snapshot resend in timer routine since %s", ths->vgId, tstrerror(ret));
          }
        }
      }
    }
  }

  sDebug("vgId:%d, timer routine, resp clean", ths->vgId);
  if (!syncNodeIsMnode(ths)) {
    syncRespClean(ths->pSyncRespMgr);
  }

  return 0;
}

int32_t syncNodeOnTimeout(SSyncNode* ths, const SRpcMsg* pRpc) {
  int32_t      ret = 0;
  SyncTimeout* pMsg = pRpc->pCont;

  syncLogRecvTimer(ths, pMsg, &pRpc->info.traceId);

  if (pMsg->timeoutType == SYNC_TIMEOUT_PING) {
    if (atomic_load_64(&ths->pingTimerLogicClockUser) <= pMsg->logicClock) {
      ++(ths->pingTimerCounter);

      TAOS_CHECK_RETURN(syncNodeTimerRoutine(ths));
    }

  } else if (pMsg->timeoutType == SYNC_TIMEOUT_ELECTION) {
    if (atomic_load_64(&ths->electTimerLogicClock) <= pMsg->logicClock) {
      ++(ths->electTimerCounter);

      TAOS_CHECK_RETURN(syncNodeElect(ths));
    }

  } else if (pMsg->timeoutType == SYNC_TIMEOUT_HEARTBEAT) {
    if (atomic_load_64(&ths->heartbeatTimerLogicClockUser) <= pMsg->logicClock) {
      ++(ths->heartbeatTimerCounter);
      sTrace("vgId:%d, sync timer, type:replicate count:%" PRIu64 ", lc-user:%" PRIu64, ths->vgId,
             ths->heartbeatTimerCounter, ths->heartbeatTimerLogicClockUser);
    }

  } else {
    sError("vgId:%d, recv unknown timer-type:%d", ths->vgId, pMsg->timeoutType);
  }

  return ret;
}

1	/*
2	* Copyright (c) 2019 TAOS Data, Inc. <jhtao@taosdata.com>
3	*
4	* This program is free software: you can use, redistribute, and/or modify
5	* it under the terms of the GNU Affero General Public License, version 3
6	* or later ("AGPL"), as published by the Free Software Foundation.
7	*
8	* This program is distributed in the hope that it will be useful, but WITHOUT
9	* ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
10	* FITNESS FOR A PARTICULAR PURPOSE.
11	*
12	* You should have received a copy of the GNU Affero General Public License
13	* along with this program. If not, see <http://www.gnu.org/licenses/>.
14	*/
15
16	#define _DEFAULT_SOURCE
17	#include "syncTimeout.h"
18	#include "syncElection.h"
19	#include "syncRaftCfg.h"
20	#include "syncRaftLog.h"
21	#include "syncReplication.h"
22	#include "syncRespMgr.h"
23	#include "syncSnapshot.h"
24	#include "syncUtil.h"
25
26	static void syncNodeCleanConfigIndex(SSyncNode* ths) {	15,935✔
27	#if 0
28	int32_t newArrIndex = 0;
29	SyncIndex newConfigIndexArr[MAX_CONFIG_INDEX_COUNT] = {0};
30	SSnapshot snapshot = {0};
31
32	ths->pFsm->FpGetSnapshotInfo(ths->pFsm, &snapshot);
33	if (snapshot.lastApplyIndex != SYNC_INDEX_INVALID) {
34	for (int32_t i = 0; i < ths->raftCfg.configIndexCount; ++i) {
35	if (ths->raftCfg.configIndexArr[i] < snapshot.lastConfigIndex) {
36	// pass
37	} else {
38	// save
39	newConfigIndexArr[newArrIndex] = ths->raftCfg.configIndexArr[i];
40	++newArrIndex;
41	}
42	}
43
44	int32_t oldCnt = ths->raftCfg.configIndexCount;
45	ths->raftCfg.configIndexCount = newArrIndex;
46	memcpy(ths->raftCfg.configIndexArr, newConfigIndexArr, sizeof(newConfigIndexArr));
47
48	int32_t code = syncWriteCfgFile(ths);
49	if (code != 0) {
50	sNFatal(ths, "failed to persist cfg");
51	} else {
52	sNTrace(ths, "clean config index arr, old-cnt:%d, new-cnt:%d", oldCnt, ths->raftCfg.configIndexCount);
53	}
54	}
55	#endif
56	}	15,935✔
57
58	static int32_t syncNodeTimerRoutine(SSyncNode* ths) {	252,100✔
59	ths->tmrRoutineNum++;	252,100✔
60
61	sDebug("vgId:%d, timer routine, status report", ths->vgId);	252,100✔
62	if (ths->tmrRoutineNum % (tsRoutineReportInterval / (ths->pingTimerMS / 1000)) == 0) {	252,207✔
63	sNInfo(ths, "timer routines");	3,052!
64	} else {
65	sNTrace(ths, "timer routines");	249,155✔
66	}
67
68	// timer replicate
69	sDebug("vgId:%d, timer routine, node replicate", ths->vgId);	252,209✔
70	int32_t ret = 0;	252,209✔
71	if((ret = syncNodeReplicate(ths)) != 0){	252,209✔
72	sWarn("vgId:%d, failed to replicate node since %s", ths->vgId, tstrerror(ret));	80!
73	}
74
75	// clean mnode index
76	sDebug("vgId:%d, timer routine, clean config index", ths->vgId);	252,303✔
77	if (syncNodeIsMnode(ths)) {	252,303✔
78	syncNodeCleanConfigIndex(ths);	15,935✔
79	}
80
81	sDebug("vgId:%d, timer routine, snapshot resend", ths->vgId);	251,916✔
82	int64_t timeNow = taosGetTimestampMs();	252,206✔
83
84	for (int i = 0; i < ths->peersNum; ++i) {	292,787✔
85	SSyncSnapshotSender* pSender = syncNodeGetSnapshotSender(ths, &(ths->peersId[i]));	40,581✔
86	if (pSender != NULL) {	40,582!
87	if (ths->isStart && (ths->state == TAOS_SYNC_STATE_LEADER \|\| ths->state == TAOS_SYNC_STATE_ASSIGNED_LEADER) &&	40,582!
88	pSender->start) {	12,384✔
89	int64_t elapsedMs = timeNow - pSender->lastSendTime;	3✔
90	if (elapsedMs < SYNC_SNAP_RESEND_MS) {	3!
91	continue;	3✔
92	}
93
UNCOV 94	if (elapsedMs > SYNC_SNAP_TIMEOUT_MS) {	×
95	sSError(pSender, "snap replication timeout, terminate.");	×
96	snapshotSenderStop(pSender, false);	×
97	} else {
UNCOV 98	sSWarn(pSender, "snap replication resend.");	×
UNCOV 99	if((ret = snapshotReSend(pSender)) != 0){	×
UNCOV 100	sWarn("vgId:%d, failed to snapshot resend in timer routine since %s", ths->vgId, tstrerror(ret));	×
101	}
102	}
103	}
104	}
105	}
106
107	sDebug("vgId:%d, timer routine, resp clean", ths->vgId);	252,206✔
108	if (!syncNodeIsMnode(ths)) {	252,206✔
109	syncRespClean(ths->pSyncRespMgr);	236,263✔
110	}
111
112	return 0;	252,450✔
113	}
114
115	int32_t syncNodeOnTimeout(SSyncNode* ths, const SRpcMsg* pRpc) {	253,847✔
116	int32_t ret = 0;	253,847✔
117	SyncTimeout* pMsg = pRpc->pCont;	253,847✔
118
119	syncLogRecvTimer(ths, pMsg, &pRpc->info.traceId);	253,847✔
120
121	if (pMsg->timeoutType == SYNC_TIMEOUT_PING) {	253,825✔
122	if (atomic_load_64(&ths->pingTimerLogicClockUser) <= pMsg->logicClock) {	251,955!
123	++(ths->pingTimerCounter);	252,342✔
124
125	TAOS_CHECK_RETURN(syncNodeTimerRoutine(ths));	252,342!
126	}
127
128	} else if (pMsg->timeoutType == SYNC_TIMEOUT_ELECTION) {	1,870!
129	if (atomic_load_64(&ths->electTimerLogicClock) <= pMsg->logicClock) {	1,870✔
130	++(ths->electTimerCounter);	1,866✔
131
132	TAOS_CHECK_RETURN(syncNodeElect(ths));	1,866✔
133	}
134
UNCOV 135	} else if (pMsg->timeoutType == SYNC_TIMEOUT_HEARTBEAT) {	×
UNCOV 136	if (atomic_load_64(&ths->heartbeatTimerLogicClockUser) <= pMsg->logicClock) {	×
UNCOV 137	++(ths->heartbeatTimerCounter);	×
138	sTrace("vgId:%d, sync timer, type:replicate count:%" PRIu64 ", lc-user:%" PRIu64, ths->vgId,	×
139	ths->heartbeatTimerCounter, ths->heartbeatTimerLogicClockUser);
140	}
141
142	} else {
UNCOV 143	sError("vgId:%d, recv unknown timer-type:%d", ths->vgId, pMsg->timeoutType);	×
144	}
145
146	return ret;	253,946✔
147	}

taosdata / TDengine / #4643

Source File Press 'n' to go to next uncovered line, 'b' for previous

Source File
Press 'n' to go to next uncovered line, 'b' for previous