enh: add more code
This commit is contained in:
parent
541f98037f
commit
e2b48e4397
|
@ -488,6 +488,7 @@ struct SVnode {
|
||||||
SVATaskID commitTask;
|
SVATaskID commitTask;
|
||||||
|
|
||||||
struct {
|
struct {
|
||||||
|
TdThreadRwlock metaRWLock;
|
||||||
SMeta* pMeta;
|
SMeta* pMeta;
|
||||||
SMeta* pNewMeta;
|
SMeta* pNewMeta;
|
||||||
SVATaskID metaCompactTask;
|
SVATaskID metaCompactTask;
|
||||||
|
|
|
@ -449,6 +449,7 @@ SVnode *vnodeOpen(const char *path, int32_t diskPrimary, STfs *pTfs, SMsgCb msgC
|
||||||
}
|
}
|
||||||
|
|
||||||
// open meta
|
// open meta
|
||||||
|
(void)taosThreadRwlockInit(&pVnode->metaRWLock, NULL);
|
||||||
vInfo("vgId:%d, start to open vnode meta", TD_VID(pVnode));
|
vInfo("vgId:%d, start to open vnode meta", TD_VID(pVnode));
|
||||||
if (metaOpen(pVnode, &pVnode->pMeta, rollback) < 0) {
|
if (metaOpen(pVnode, &pVnode->pMeta, rollback) < 0) {
|
||||||
vError("vgId:%d, failed to open vnode meta since %s", TD_VID(pVnode), tstrerror(terrno));
|
vError("vgId:%d, failed to open vnode meta since %s", TD_VID(pVnode), tstrerror(terrno));
|
||||||
|
@ -548,6 +549,7 @@ _err:
|
||||||
if (pVnode->pMeta) metaClose(&pVnode->pMeta);
|
if (pVnode->pMeta) metaClose(&pVnode->pMeta);
|
||||||
if (pVnode->freeList) vnodeCloseBufPool(pVnode);
|
if (pVnode->freeList) vnodeCloseBufPool(pVnode);
|
||||||
|
|
||||||
|
(void)taosThreadRwlockDestroy(&pVnode->metaRWLock);
|
||||||
taosMemoryFree(pVnode);
|
taosMemoryFree(pVnode);
|
||||||
return NULL;
|
return NULL;
|
||||||
}
|
}
|
||||||
|
|
|
@ -71,13 +71,12 @@ void vnodePrintTableMeta(STableMetaRsp* pMeta) {
|
||||||
if (pMeta->pSchemas) {
|
if (pMeta->pSchemas) {
|
||||||
for (int32_t i = 0; i < (pMeta->numOfColumns + pMeta->numOfTags); ++i) {
|
for (int32_t i = 0; i < (pMeta->numOfColumns + pMeta->numOfTags); ++i) {
|
||||||
SSchema *pSchema = pMeta->pSchemas + i;
|
SSchema *pSchema = pMeta->pSchemas + i;
|
||||||
qDebug("%d col/tag: type:%d, flags:%d, colId:%d, bytes:%d, name:%s", i, pSchema->type, pSchema->flags, pSchema->colId, pSchema->bytes, pSchema->name);
|
qDebug("%d col/tag: type:%d, flags:%d, colId:%d, bytes:%d, name:%s", i, pSchema->type, pSchema->flags,
|
||||||
|
pSchema->colId, pSchema->bytes, pSchema->name);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
int32_t vnodeGetTableMeta(SVnode *pVnode, SRpcMsg *pMsg, bool direct) {
|
int32_t vnodeGetTableMeta(SVnode *pVnode, SRpcMsg *pMsg, bool direct) {
|
||||||
STableInfoReq infoReq = {0};
|
STableInfoReq infoReq = {0};
|
||||||
STableMetaRsp metaRsp = {0};
|
STableMetaRsp metaRsp = {0};
|
||||||
|
@ -528,6 +527,13 @@ _exit:
|
||||||
return code;
|
return code;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
#define VNODE_DO_META_QUERY(pVnode, cmd) \
|
||||||
|
do { \
|
||||||
|
(void)taosThreadRwlockRdlock(&(pVnode)->metaRWLock); \
|
||||||
|
cmd; \
|
||||||
|
(void)taosThreadRwlockUnlock(&(pVnode)->metaRWLock); \
|
||||||
|
} while (0)
|
||||||
|
|
||||||
int32_t vnodeGetLoad(SVnode *pVnode, SVnodeLoad *pLoad) {
|
int32_t vnodeGetLoad(SVnode *pVnode, SVnodeLoad *pLoad) {
|
||||||
SSyncState state = syncGetState(pVnode->sync);
|
SSyncState state = syncGetState(pVnode->sync);
|
||||||
pLoad->syncAppliedIndex = pVnode->state.applied;
|
pLoad->syncAppliedIndex = pVnode->state.applied;
|
||||||
|
@ -543,8 +549,8 @@ int32_t vnodeGetLoad(SVnode *pVnode, SVnodeLoad *pLoad) {
|
||||||
pLoad->learnerProgress = state.progress;
|
pLoad->learnerProgress = state.progress;
|
||||||
pLoad->cacheUsage = tsdbCacheGetUsage(pVnode);
|
pLoad->cacheUsage = tsdbCacheGetUsage(pVnode);
|
||||||
pLoad->numOfCachedTables = tsdbCacheGetElems(pVnode);
|
pLoad->numOfCachedTables = tsdbCacheGetElems(pVnode);
|
||||||
pLoad->numOfTables = metaGetTbNum(pVnode->pMeta);
|
VNODE_DO_META_QUERY(pVnode, pLoad->numOfTables = metaGetTbNum(pVnode->pMeta));
|
||||||
pLoad->numOfTimeSeries = metaGetTimeSeriesNum(pVnode->pMeta, 1);
|
VNODE_DO_META_QUERY(pVnode, pLoad->numOfTimeSeries = metaGetTimeSeriesNum(pVnode->pMeta, 1));
|
||||||
pLoad->totalStorage = (int64_t)3 * 1073741824;
|
pLoad->totalStorage = (int64_t)3 * 1073741824;
|
||||||
pLoad->compStorage = (int64_t)2 * 1073741824;
|
pLoad->compStorage = (int64_t)2 * 1073741824;
|
||||||
pLoad->pointsWritten = 100;
|
pLoad->pointsWritten = 100;
|
||||||
|
|
Loading…
Reference in New Issue