Skip to content

fix: coredump when resize vnode buffer and recycle buffer pool #32520

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
guanshengliang merged 1 commit into from
Aug 12, 2025
Merged

fix: coredump when resize vnode buffer and recycle buffer pool #32520

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion source/dnode/vnode/src/inc/vnd.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -88,7 +88,7 @@ struct SVBufPoolNode {
SVBufPoolNode* prev;
SVBufPoolNode** pnext;
int64_t size;
uint8_t data[];
uint8_t* data;
};

struct SVBufPool {
Expand Down
49 changes: 35 additions & 14 deletions source/dnode/vnode/src/vnd/vnodeBufPool.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,11 +19,17 @@
static int32_t vnodeBufPoolCreate(SVnode *pVnode, int32_t id, int64_t size, SVBufPool **ppPool) {
SVBufPool *pPool;

pPool = taosMemoryMalloc(sizeof(SVBufPool) + size);
pPool = taosMemoryCalloc(1, sizeof(SVBufPool));
if (pPool == NULL) {
vError("vgId:%d, failed to allocate buffer pool", TD_VID(pVnode));
return terrno;
}
pPool->node.data = taosMemoryMalloc(size);
if (NULL == pPool->node.data) {
vError("vgId:%d, failed to allocate buffer pool data, size:%" PRId64, TD_VID(pVnode), size);
taosMemoryFree(pPool);
return terrno;
}
memset(pPool, 0, sizeof(SVBufPool));

// query handle list
(void)taosThreadMutexInit(&pPool->mutex, NULL);
Expand All @@ -42,11 +48,13 @@ static int32_t vnodeBufPoolCreate(SVnode *pVnode, int32_t id, int64_t size, SVBu
if (VND_IS_RSMA(pVnode)) {
pPool->lock = taosMemoryMalloc(sizeof(TdThreadSpinlock));
if (!pPool->lock) {
taosMemoryFree(pPool->node.data);
taosMemoryFree(pPool);
return terrno;
}
if (taosThreadSpinInit(pPool->lock, 0) != 0) {
taosMemoryFree((void *)pPool->lock);
taosMemoryFree(pPool->node.data);
taosMemoryFree(pPool);
return terrno = TAOS_SYSTEM_ERROR(ERRNO);
}
Expand All @@ -65,6 +73,7 @@ static void vnodeBufPoolDestroy(SVBufPool *pPool) {
taosMemoryFree((void *)pPool->lock);
}
(void)taosThreadMutexDestroy(&pPool->mutex);
taosMemoryFree(pPool->node.data);
taosMemoryFree(pPool);
}

Expand Down Expand Up @@ -148,6 +157,7 @@ void *vnodeBufPoolMallocAligned(SVBufPool *pPool, int size) {
}
return NULL;
}
pNode->data = (uint8_t *)&pNode[1];

p = pNode->data;
pNode->size = size;
Expand Down Expand Up @@ -184,6 +194,7 @@ void *vnodeBufPoolMalloc(SVBufPool *pPool, int size) {
if (pPool->lock) (void)taosThreadSpinUnlock(pPool->lock);
return NULL;
}
pNode->data = (uint8_t *)&pNode[1];

p = pNode->data;
pNode->size = size;
Expand Down Expand Up @@ -219,23 +230,33 @@ void vnodeBufPoolRef(SVBufPool *pPool) {
}
}

static void vnodeBufPoolResize(SVBufPool *pPool, int64_t size) {
if (pPool == NULL) return;

uint8_t *pDataNew = taosMemoryMalloc(size);
if (pDataNew == NULL) {
vError("vgId:%d, %s failed at %s:%d since %s", TD_VID(pPool->pVnode), __func__, __FILE__, __LINE__,
tstrerror(terrno));
return;
}

// Apply change
int64_t oldSize = pPool->node.size;
taosMemoryFree(pPool->node.data);
pPool->node.data = pDataNew;
pPool->node.size = size;

vInfo("vgId:%d, buffer pool %d resized from %" PRId64 " to %" PRId64, TD_VID(pPool->pVnode), pPool->id, oldSize,
size);
return;
}

void vnodeBufPoolAddToFreeList(SVBufPool *pPool) {
SVnode *pVnode = pPool->pVnode;

int64_t size = pVnode->config.szBuf / VNODE_BUFPOOL_SEGMENTS;
if (pPool->node.size != size) {
SVBufPool *pNewPool = NULL;
if (vnodeBufPoolCreate(pVnode, pPool->id, size, &pNewPool) < 0) {
vWarn("vgId:%d, failed to change buffer pool of id %d size from %" PRId64 " to %" PRId64 " since %s",
TD_VID(pVnode), pPool->id, pPool->node.size, size, tstrerror(ERRNO));
} else {
vInfo("vgId:%d, buffer pool of id %d size changed from %" PRId64 " to %" PRId64, TD_VID(pVnode), pPool->id,
pPool->node.size, size);

vnodeBufPoolDestroy(pPool);
pPool = pNewPool;
pVnode->aBufPool[pPool->id] = pPool;
}
vnodeBufPoolResize(pPool, size);
}

// add to free list
Expand Down
Loading