From 6a342edc5a827df40e9618cbfa2d18be6bbabc79 Mon Sep 17 00:00:00 2001 From: tinswzy Date: Tue, 19 Aug 2025 10:47:45 +0800 Subject: [PATCH] fix: empty error returned on append timeout when MinIO is unavailable (#43926) #43810 Fixed the issue where the result err returned by append timeout was empty when objectstorage was unavailable, causing the client to mistakenly believe that the write was successful. Signed-off-by: tinswzy --- go.mod | 2 +- go.sum | 6 +++--- pkg/go.mod | 2 +- pkg/go.sum | 4 ++-- pkg/streaming/walimpls/impls/wp/wal.go | 2 +- 5 files changed, 8 insertions(+), 8 deletions(-) diff --git a/go.mod b/go.mod index 460c938c3b..1a9b760f88 100644 --- a/go.mod +++ b/go.mod @@ -247,7 +247,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.1.4-0.20250811124743-7efbd20c3d31 // indirect + github.com/zilliztech/woodpecker v0.1.4-0.20250818130358-cfb64730fc90 // 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 50cf7cc405..d0e83f6f78 100644 --- a/go.sum +++ b/go.sum @@ -1079,8 +1079,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.1.4-0.20250811124743-7efbd20c3d31 h1:Y/XOJTAuRwItRXyRbsBYjYifFcqRS5V12aitcKSN4QQ= -github.com/zilliztech/woodpecker v0.1.4-0.20250811124743-7efbd20c3d31/go.mod h1:coEnEv3zqCUi6QFyhi7g+3FHkHb3D6gD6oNRxMjXnNk= +github.com/zilliztech/woodpecker v0.1.4-0.20250818130358-cfb64730fc90 h1:cT1uTCX+hdOMzbQ/Dok7ckthUay+XRq5+/QSE7nvJfE= +github.com/zilliztech/woodpecker v0.1.4-0.20250818130358-cfb64730fc90/go.mod h1:coEnEv3zqCUi6QFyhi7g+3FHkHb3D6gD6oNRxMjXnNk= 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= @@ -1734,4 +1734,4 @@ sigs.k8s.io/yaml v1.2.0/go.mod h1:yfXDCHCao9+ENCvLSE62v9VSji2MKu5jeNfTrofGhJc= sigs.k8s.io/yaml v1.3.0 h1:a2VclLzOGrwOHDiV8EfBGhvjHvP46CtW5j6POvhYGGo= sigs.k8s.io/yaml v1.3.0/go.mod h1:GeOyir5tyXNByN85N/dRIT9es5UQNerPYEKK56eTBm8= stathat.com/c/consistent v1.0.0 h1:ezyc51EGcRPJUxfHGSgJjWzJdj3NiMU9pNfLNGiXV0c= -stathat.com/c/consistent v1.0.0/go.mod h1:QkzMWzcbB+yQBL2AttO6sgsQS/JSTapcDISJalmCDS0= \ No newline at end of file +stathat.com/c/consistent v1.0.0/go.mod h1:QkzMWzcbB+yQBL2AttO6sgsQS/JSTapcDISJalmCDS0= diff --git a/pkg/go.mod b/pkg/go.mod index ee6e95e2ef..85313a156b 100644 --- a/pkg/go.mod +++ b/pkg/go.mod @@ -40,7 +40,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.1.4-0.20250811124743-7efbd20c3d31 + github.com/zilliztech/woodpecker v0.1.4-0.20250818130358-cfb64730fc90 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 54848a02d3..4ae5f85902 100644 --- a/pkg/go.sum +++ b/pkg/go.sum @@ -824,8 +824,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.1.4-0.20250811124743-7efbd20c3d31 h1:Y/XOJTAuRwItRXyRbsBYjYifFcqRS5V12aitcKSN4QQ= -github.com/zilliztech/woodpecker v0.1.4-0.20250811124743-7efbd20c3d31/go.mod h1:coEnEv3zqCUi6QFyhi7g+3FHkHb3D6gD6oNRxMjXnNk= +github.com/zilliztech/woodpecker v0.1.4-0.20250818130358-cfb64730fc90 h1:cT1uTCX+hdOMzbQ/Dok7ckthUay+XRq5+/QSE7nvJfE= +github.com/zilliztech/woodpecker v0.1.4-0.20250818130358-cfb64730fc90/go.mod h1:coEnEv3zqCUi6QFyhi7g+3FHkHb3D6gD6oNRxMjXnNk= 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= diff --git a/pkg/streaming/walimpls/impls/wp/wal.go b/pkg/streaming/walimpls/impls/wp/wal.go index a13c525e67..6871d3ddc8 100644 --- a/pkg/streaming/walimpls/impls/wp/wal.go +++ b/pkg/streaming/walimpls/impls/wp/wal.go @@ -33,7 +33,7 @@ func (w *walImpl) Append(ctx context.Context, msg message.MutableMessage) (messa } pb := msg.IntoMessageProto() r := w.p.Write(ctx, - &wp.WriterMessage{ + &wp.WriteMessage{ Payload: pb.Payload, Properties: pb.Properties, },