#3562

Committed 20 Dec 2024 09:57AM UTC coverage: 26.655% (-32.2%) from 58.812%

Build # #3562

Build Type

push

travis-ci

Committed by

web-flow

Commit Message

Merge pull request #29229 from taosdata/enh/TS-5749-3.0

enh: seperate tsdb async tasks to different thread pools

Run Details

21498 of 109421 branches covered (19.65%)

Branch coverage included in aggregate %.

66 of 96 new or added lines in 7 files covered. (68.75%)

39441 existing lines in 157 files now uncovered.

35007 of 102566 relevant lines covered (34.13%)

53922.97 hits per line

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

65.79

/source/dnode/vnode/src/tsdb/tsdbOpen.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/>.
 */

#include "tsdb.h"
#include "tsdbFS2.h"

extern int32_t tsdbOpenCompMonitor(STsdb *tsdb);
extern void    tsdbCloseCompMonitor(STsdb *tsdb);

void tsdbSetKeepCfg(STsdb *pTsdb, STsdbCfg *pCfg) {
  STsdbKeepCfg *pKeepCfg = &pTsdb->keepCfg;
  pKeepCfg->precision = pCfg->precision;
  pKeepCfg->days = pCfg->days;
  pKeepCfg->keep0 = pCfg->keep0;
  pKeepCfg->keep1 = pCfg->keep1;
  pKeepCfg->keep2 = pCfg->keep2;
  pKeepCfg->keepTimeOffset = pCfg->keepTimeOffset;
}

int64_t tsdbGetEarliestTs(STsdb *pTsdb) {
  STsdbKeepCfg *pCfg = &pTsdb->keepCfg;

  int64_t now = taosGetTimestamp(pCfg->precision);
  int64_t ts = now - (tsTickPerMin[pCfg->precision] * pCfg->keep2) + 1;  // needs to add one tick
  return ts;
}

int32_t tsdbOpen(SVnode *pVnode, STsdb **ppTsdb, const char *dir, STsdbKeepCfg *pKeepCfg, int8_t rollback, bool force) {
  STsdb  *pTsdb = NULL;
  int     slen = 0;
  int32_t code;
  int32_t lino;

  *ppTsdb = NULL;
  slen = strlen(pVnode->path) + strlen(dir) + 2;

  // create handle
  pTsdb = (STsdb *)taosMemoryCalloc(1, sizeof(*pTsdb) + slen);
  if (pTsdb == NULL) {
    TAOS_CHECK_RETURN(terrno);
  }

  pTsdb->path = (char *)&pTsdb[1];
  snprintf(pTsdb->path, TD_PATH_MAX, "%s%s%s", pVnode->path, TD_DIRSEP, dir);
  // taosRealPath(pTsdb->path, NULL, slen);
  pTsdb->pVnode = pVnode;
  (void)taosThreadMutexInit(&pTsdb->mutex, NULL);
  if (!pKeepCfg) {
    tsdbSetKeepCfg(pTsdb, &pVnode->config.tsdbCfg);
  } else {
    memcpy(&pTsdb->keepCfg, pKeepCfg, sizeof(STsdbKeepCfg));
  }

  // create dir
  if (pVnode->pTfs) {
    code = tfsMkdir(pVnode->pTfs, pTsdb->path);
    TSDB_CHECK_CODE(code, lino, _exit);
  } else {
    code = taosMkDir(pTsdb->path);
    TSDB_CHECK_CODE(code, lino, _exit);
  }

  // open tsdb
  code = tsdbOpenFS(pTsdb, &pTsdb->pFS, rollback);
  TSDB_CHECK_CODE(code, lino, _exit);

  if (pTsdb->pFS->fsstate == TSDB_FS_STATE_INCOMPLETE && force == false) {
    TAOS_CHECK_GOTO(TSDB_CODE_NEED_RETRY, &lino, _exit);
  }

  code = tsdbOpenCache(pTsdb);
  TSDB_CHECK_CODE(code, lino, _exit);

#ifdef TD_ENTERPRISE
  TAOS_CHECK_GOTO(tsdbOpenCompMonitor(pTsdb), &lino, _exit);
#endif

_exit:
  if (code) {
    tsdbError("vgId:%d %s failed at %s:%d since %s", TD_VID(pVnode), __func__, __FILE__, lino, tstrerror(code));
    tsdbCloseFS(&pTsdb->pFS);
    (void)taosThreadMutexDestroy(&pTsdb->mutex);
    taosMemoryFree(pTsdb);
  } else {
    tsdbDebug("vgId:%d, tsdb is opened at %s, days:%d, keep:%d,%d,%d, keepTimeoffset:%d", TD_VID(pVnode), pTsdb->path,
              pTsdb->keepCfg.days, pTsdb->keepCfg.keep0, pTsdb->keepCfg.keep1, pTsdb->keepCfg.keep2,
              pTsdb->keepCfg.keepTimeOffset);
    *ppTsdb = pTsdb;
  }
  return code;
}

void tsdbClose(STsdb **pTsdb) {
  if (*pTsdb) {
    STsdb *pdb = *pTsdb;
    tsdbDebug("vgId:%d, tsdb is close at %s, days:%d, keep:%d,%d,%d, keepTimeOffset:%d", TD_VID(pdb->pVnode), pdb->path,
              pdb->keepCfg.days, pdb->keepCfg.keep0, pdb->keepCfg.keep1, pdb->keepCfg.keep2,
              pdb->keepCfg.keepTimeOffset);
    (void)taosThreadMutexLock(&(*pTsdb)->mutex);
    tsdbMemTableDestroy((*pTsdb)->mem, true);
    (*pTsdb)->mem = NULL;
    (void)taosThreadMutexUnlock(&(*pTsdb)->mutex);

    tsdbCloseFS(&(*pTsdb)->pFS);
    tsdbCloseCache(*pTsdb);
#ifdef TD_ENTERPRISE
    tsdbCloseCompMonitor(*pTsdb);
#endif
    (void)taosThreadMutexDestroy(&(*pTsdb)->mutex);
    taosMemoryFreeClear(*pTsdb);
  }
  return;
}

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	#include "tsdb.h"
17	#include "tsdbFS2.h"
18
19	extern int32_t tsdbOpenCompMonitor(STsdb *tsdb);
20	extern void tsdbCloseCompMonitor(STsdb *tsdb);
21
22	void tsdbSetKeepCfg(STsdb pTsdb, STsdbCfg pCfg) {	553✔
23	STsdbKeepCfg *pKeepCfg = &pTsdb->keepCfg;	553✔
24	pKeepCfg->precision = pCfg->precision;	553✔
25	pKeepCfg->days = pCfg->days;	553✔
26	pKeepCfg->keep0 = pCfg->keep0;	553✔
27	pKeepCfg->keep1 = pCfg->keep1;	553✔
28	pKeepCfg->keep2 = pCfg->keep2;	553✔
29	pKeepCfg->keepTimeOffset = pCfg->keepTimeOffset;	553✔
30	}	553✔
31
32	int64_t tsdbGetEarliestTs(STsdb *pTsdb) {	21,774✔
33	STsdbKeepCfg *pCfg = &pTsdb->keepCfg;	21,774✔
34
35	int64_t now = taosGetTimestamp(pCfg->precision);	21,774!
36	int64_t ts = now - (tsTickPerMin[pCfg->precision] * pCfg->keep2) + 1; // needs to add one tick	21,835✔
37	return ts;	21,835✔
38	}
39
40	int32_t tsdbOpen(SVnode pVnode, STsdb ppTsdb, const char dir, STsdbKeepCfg *pKeepCfg, int8_t rollback, bool force) {	553✔
41	STsdb *pTsdb = NULL;	553✔
42	int slen = 0;	553✔
43	int32_t code;
44	int32_t lino;
45
46	*ppTsdb = NULL;	553✔
47	slen = strlen(pVnode->path) + strlen(dir) + 2;	553✔
48
49	// create handle
50	pTsdb = (STsdb )taosMemoryCalloc(1, sizeof(pTsdb) + slen);	553!
51	if (pTsdb == NULL) {	553!
52	TAOS_CHECK_RETURN(terrno);	×
53	}
54
55	pTsdb->path = (char *)&pTsdb[1];	553✔
56	snprintf(pTsdb->path, TD_PATH_MAX, "%s%s%s", pVnode->path, TD_DIRSEP, dir);	553✔
57	// taosRealPath(pTsdb->path, NULL, slen);
58	pTsdb->pVnode = pVnode;	553✔
59	(void)taosThreadMutexInit(&pTsdb->mutex, NULL);	553✔
60	if (!pKeepCfg) {	553!
61	tsdbSetKeepCfg(pTsdb, &pVnode->config.tsdbCfg);	553✔
62	} else {
UNCOV 63	memcpy(&pTsdb->keepCfg, pKeepCfg, sizeof(STsdbKeepCfg));	×
64	}
65
66	// create dir
67	if (pVnode->pTfs) {	553!
68	code = tfsMkdir(pVnode->pTfs, pTsdb->path);	553✔
69	TSDB_CHECK_CODE(code, lino, _exit);	553!
70	} else {
71	code = taosMkDir(pTsdb->path);	×
72	TSDB_CHECK_CODE(code, lino, _exit);	×
73	}
74
75	// open tsdb
76	code = tsdbOpenFS(pTsdb, &pTsdb->pFS, rollback);	553✔
77	TSDB_CHECK_CODE(code, lino, _exit);	553!
78
79	if (pTsdb->pFS->fsstate == TSDB_FS_STATE_INCOMPLETE && force == false) {	553!
80	TAOS_CHECK_GOTO(TSDB_CODE_NEED_RETRY, &lino, _exit);	×
81	}
82
83	code = tsdbOpenCache(pTsdb);	553✔
84	TSDB_CHECK_CODE(code, lino, _exit);	553!
85
86	#ifdef TD_ENTERPRISE
87	TAOS_CHECK_GOTO(tsdbOpenCompMonitor(pTsdb), &lino, _exit);	553!
88	#endif
89
90	_exit:	553✔
91	if (code) {	553!
92	tsdbError("vgId:%d %s failed at %s:%d since %s", TD_VID(pVnode), __func__, __FILE__, lino, tstrerror(code));	×
93	tsdbCloseFS(&pTsdb->pFS);	×
94	(void)taosThreadMutexDestroy(&pTsdb->mutex);	×
95	taosMemoryFree(pTsdb);	×
96	} else {
97	tsdbDebug("vgId:%d, tsdb is opened at %s, days:%d, keep:%d,%d,%d, keepTimeoffset:%d", TD_VID(pVnode), pTsdb->path,	553✔
98	pTsdb->keepCfg.days, pTsdb->keepCfg.keep0, pTsdb->keepCfg.keep1, pTsdb->keepCfg.keep2,
99	pTsdb->keepCfg.keepTimeOffset);
100	*ppTsdb = pTsdb;	553✔
101	}
102	return code;	553✔
103	}
104
105	void tsdbClose(STsdb **pTsdb) {	553✔
106	if (*pTsdb) {	553!
107	STsdb pdb = pTsdb;	553✔
108	tsdbDebug("vgId:%d, tsdb is close at %s, days:%d, keep:%d,%d,%d, keepTimeOffset:%d", TD_VID(pdb->pVnode), pdb->path,	553✔
109	pdb->keepCfg.days, pdb->keepCfg.keep0, pdb->keepCfg.keep1, pdb->keepCfg.keep2,
110	pdb->keepCfg.keepTimeOffset);
111	(void)taosThreadMutexLock(&(*pTsdb)->mutex);	553✔
112	tsdbMemTableDestroy((*pTsdb)->mem, true);	553✔
113	(*pTsdb)->mem = NULL;	553✔
114	(void)taosThreadMutexUnlock(&(*pTsdb)->mutex);	553✔
115
116	tsdbCloseFS(&(*pTsdb)->pFS);	553✔
117	tsdbCloseCache(*pTsdb);	553✔
118	#ifdef TD_ENTERPRISE
119	tsdbCloseCompMonitor(*pTsdb);	553✔
120	#endif
121	(void)taosThreadMutexDestroy(&(*pTsdb)->mutex);	553✔
122	taosMemoryFreeClear(*pTsdb);	553!
123	}
124	return;	553✔
125	}

taosdata / TDengine / #3562

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