Skip to content

Commit 21e8366

Browse files
authored
Release 1.15 (#5423)
* Do not reuse remote write requests in case of error (#5422) * Do not reuse remote write requests in case of error Signed-off-by: Alan Protasio <[email protected]> * Changelog Signed-off-by: Alan Protasio <[email protected]> --------- Signed-off-by: Alan Protasio <[email protected]> * Release and bump version to 1.15.3 Signed-off-by: Alan Protasio <[email protected]> * Fix Changelog Signed-off-by: Alan Protasio <[email protected]> --------- Signed-off-by: Alan Protasio <[email protected]>
1 parent 62e3836 commit 21e8366

File tree

3 files changed

+11
-2
lines changed

3 files changed

+11
-2
lines changed

CHANGELOG.md

+4
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,10 @@
22

33
## master / unreleased
44

5+
## 1.15.3 2023-06-22
6+
7+
* [BUGFIX] Distributor: Fix potential data corruption in cases of timeout between distributors and ingesters. #5422
8+
59
## 1.15.2 2023-05-09
610

711
* [ENHANCEMENT] Update Go version to 1.20.4. #5299

VERSION

+1-1
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
1.15.2
1+
1.15.3

pkg/distributor/distributor.go

+6-1
Original file line numberDiff line numberDiff line change
@@ -843,7 +843,12 @@ func (d *Distributor) send(ctx context.Context, ingester ring.InstanceDesc, time
843843
req.Source = source
844844

845845
_, err = c.PushPreAlloc(ctx, req)
846-
cortexpb.ReuseWriteRequest(req)
846+
847+
// We should not reuse the req in case of errors:
848+
// See: https://github.com/grpc/grpc-go/issues/6355
849+
if err == nil {
850+
cortexpb.ReuseWriteRequest(req)
851+
}
847852

848853
if len(metadata) > 0 {
849854
d.ingesterAppends.WithLabelValues(ingester.Addr, typeMetadata).Inc()

0 commit comments

Comments
 (0)