From 74432db50357a229883cfef0713a321d65eb6853 Mon Sep 17 00:00:00 2001 From: tinswzy Date: Thu, 5 Jun 2025 10:02:32 +0800 Subject: [PATCH] fix stuck insert by binding buffer and chan to ensure proper notification (#42505) #41918 #42482 #42049 #42513 cherrypick: sn release memory after pop from heap wp: Encapsulate buffer and chan into a single item for one-to-one management and cleanup Signed-off-by: tinswzy Co-authored-by: chyezh --- go.mod | 2 +- go.sum | 4 ++-- pkg/go.mod | 2 +- pkg/go.sum | 4 ++-- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/go.mod b/go.mod index 11e0e9cd1a..51c8d074de 100644 --- a/go.mod +++ b/go.mod @@ -243,7 +243,7 @@ require ( github.com/x448/float16 v0.8.4 // indirect github.com/xiang90/probing v0.0.0-20190116061207-43a291ad63a2 // indirect github.com/yusufpapurcu/wmi v1.2.4 // indirect - github.com/zilliztech/woodpecker v0.0.0-20250602050237-2822b5a11b22 // indirect + github.com/zilliztech/woodpecker v0.0.0-20250604125910-d6f4a5e53049 // indirect go.etcd.io/bbolt v1.3.6 // indirect go.etcd.io/etcd/client/pkg/v3 v3.5.5 // indirect go.etcd.io/etcd/client/v2 v2.305.5 // indirect diff --git a/go.sum b/go.sum index a5845a58fb..f1253b5054 100644 --- a/go.sum +++ b/go.sum @@ -1064,8 +1064,8 @@ github.com/zeebo/assert v1.3.0 h1:g7C04CbJuIDKNPFHmsk4hwZDO5O+kntRxzaUoNXj+IQ= github.com/zeebo/assert v1.3.0/go.mod h1:Pq9JiuJQpG8JLJdtkwrJESF0Foym2/D9XMU5ciN/wJ0= github.com/zeebo/xxh3 v1.0.2 h1:xZmwmqxHZA8AI603jOQ0tMqmBr9lPeFwGg6d+xy9DC0= github.com/zeebo/xxh3 v1.0.2/go.mod h1:5NWz9Sef7zIDm2JHfFlcQvNekmcEl9ekUZQQKCYaDcA= -github.com/zilliztech/woodpecker v0.0.0-20250602050237-2822b5a11b22 h1:Yb1t/yyELWoFyVde0AWIsjF+fwqYdo1VVv7yqhHhIvM= -github.com/zilliztech/woodpecker v0.0.0-20250602050237-2822b5a11b22/go.mod h1:MeyFx9vsAzxEysO2wzMC5d1QcSknbfVZOAhEmyxgQbo= +github.com/zilliztech/woodpecker v0.0.0-20250604125910-d6f4a5e53049 h1:tZvSZqKW+I/ihgHp+Ogzg96i6NgaW/+NIlMGxETDXUQ= +github.com/zilliztech/woodpecker v0.0.0-20250604125910-d6f4a5e53049/go.mod h1:MeyFx9vsAzxEysO2wzMC5d1QcSknbfVZOAhEmyxgQbo= go.etcd.io/bbolt v1.3.2/go.mod h1:IbVyRI1SCnLcuJnV2u8VeU0CEYM7e686BmAb1XKL+uU= go.etcd.io/bbolt v1.3.5/go.mod h1:G5EMThwa9y8QZGBClrRx5EY+Yw9kAhnjy3bSjsnlVTQ= go.etcd.io/bbolt v1.3.6 h1:/ecaJf0sk1l4l6V4awd65v2C3ILy7MSj+s/x1ADCIMU= diff --git a/pkg/go.mod b/pkg/go.mod index 5a0152d8fa..bc7f4067ea 100644 --- a/pkg/go.mod +++ b/pkg/go.mod @@ -39,7 +39,7 @@ require ( github.com/tikv/client-go/v2 v2.0.4 github.com/uber/jaeger-client-go v2.30.0+incompatible github.com/x448/float16 v0.8.4 - github.com/zilliztech/woodpecker v0.0.0-20250602050237-2822b5a11b22 + github.com/zilliztech/woodpecker v0.0.0-20250604125910-d6f4a5e53049 go.etcd.io/etcd/api/v3 v3.5.5 go.etcd.io/etcd/client/v3 v3.5.5 go.etcd.io/etcd/server/v3 v3.5.5 diff --git a/pkg/go.sum b/pkg/go.sum index 723d12bcea..ce0b695a66 100644 --- a/pkg/go.sum +++ b/pkg/go.sum @@ -822,8 +822,8 @@ github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9dec github.com/yuin/goldmark v1.3.5/go.mod h1:mwnBkeHKe2W/ZEtQ+71ViKU8L12m81fl3OWwC1Zlc8k= github.com/yusufpapurcu/wmi v1.2.3 h1:E1ctvB7uKFMOJw3fdOW32DwGE9I7t++CRUEMKvFoFiw= github.com/yusufpapurcu/wmi v1.2.3/go.mod h1:SBZ9tNy3G9/m5Oi98Zks0QjeHVDvuK0qfxQmPyzfmi0= -github.com/zilliztech/woodpecker v0.0.0-20250602050237-2822b5a11b22 h1:Yb1t/yyELWoFyVde0AWIsjF+fwqYdo1VVv7yqhHhIvM= -github.com/zilliztech/woodpecker v0.0.0-20250602050237-2822b5a11b22/go.mod h1:MeyFx9vsAzxEysO2wzMC5d1QcSknbfVZOAhEmyxgQbo= +github.com/zilliztech/woodpecker v0.0.0-20250604125910-d6f4a5e53049 h1:tZvSZqKW+I/ihgHp+Ogzg96i6NgaW/+NIlMGxETDXUQ= +github.com/zilliztech/woodpecker v0.0.0-20250604125910-d6f4a5e53049/go.mod h1:MeyFx9vsAzxEysO2wzMC5d1QcSknbfVZOAhEmyxgQbo= go.etcd.io/bbolt v1.3.2/go.mod h1:IbVyRI1SCnLcuJnV2u8VeU0CEYM7e686BmAb1XKL+uU= go.etcd.io/bbolt v1.3.6 h1:/ecaJf0sk1l4l6V4awd65v2C3ILy7MSj+s/x1ADCIMU= go.etcd.io/bbolt v1.3.6/go.mod h1:qXsaaIqmgQH0T+OPdb99Bf+PKfBBQVAdyD6TY9G8XM4=