xxq250
/
homework-jianmu
1
0
Fork 0
Code Issues Pull Requests 1 Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/3.0' into enh/opt-transport

This commit is contained in:
yihaoDeng 2024-10-11 17:24:38 +08:00
parent defe4bf6a8
commit 3b0d342793
1 changed files with 10 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
source/libs/transport/src/transCli.c
View File

@ -315,6 +315,7 @@ typedef struct {
// void* p; // void* p;
Heap* heap; Heap* heap;
int32_t (*cmpFunc)(const HeapNode* a, const HeapNode* b); int32_t (*cmpFunc)(const HeapNode* a, const HeapNode* b);
int64_t lastUpdateTs;
} SHeap; } SHeap;
int32_t compareHeapNode(const HeapNode* a, const HeapNode* b); int32_t compareHeapNode(const HeapNode* a, const HeapNode* b);
@ -3742,7 +3743,7 @@ static SCliConn* getConnFromHeapCache(SHashObj* pConnHeapCache, char* key) {
return NULL; return NULL;
} else { } else {
if (shouldSWitchToOtherConn(pConn, key)) { if (shouldSWitchToOtherConn(pConn, key)) {
if (pHeap->heap->nelts >= 16) { if (pHeap->heap->nelts >= 8) {
balanceConnHeapCache(pConnHeapCache, pConn); balanceConnHeapCache(pConnHeapCache, pConn);
} }
logConnMissHit(pConn); logConnMissHit(pConn);
@ -3793,7 +3794,14 @@ static int32_t delConnFromHeapCache(SHashObj* pConnHeapCache, SCliConn* pConn) {
static int32_t balanceConnHeapCache(SHashObj* pConnHeapCache, SCliConn* pConn) { static int32_t balanceConnHeapCache(SHashObj* pConnHeapCache, SCliConn* pConn) {
if (pConn->heap != NULL && pConn->inHeap != 0) { if (pConn->heap != NULL && pConn->inHeap != 0) {
return transHeapBalance(pConn->heap, pConn); SHeap* heap = pConn->heap;
tTrace("conn %p'heap have too many conn %d, should do balance", pConn, heap->heap->nelts);
int64_t now = taosGetTimestampMs();
if (((now - heap->lastUpdateTs) / 1000) > 30) {
heap->lastUpdateTs = now;
tTrace("conn %p'heap have too many conn %d, do balance", pConn, heap->heap->nelts);
return transHeapBalance(pConn->heap, pConn);
}
} }
return 0; return 0;
} }
@ -3872,9 +3880,6 @@ int32_t transHeapBalance(SHeap* heap, SCliConn* p) {
if (p->inHeap == 0 && heap == NULL || heap->heap == NULL) { if (p->inHeap == 0 && heap == NULL || heap->heap == NULL) {
return 0; return 0;
} }
if (heap->heap->nelts >= 32) {
tTrace("conn %p heap busy,heap size:%d", p, heap->heap->nelts);
}
heapRemove(heap->heap, &p->node); heapRemove(heap->heap, &p->node);
heapInsert(heap->heap, &p->node); heapInsert(heap->heap, &p->node);
return 0; return 0;