Skip to content

Commit 954af22

Browse files
committed
Change to expose header at Distributor side
Signed-off-by: SungJin1212 <tjdwls1201@gmail.com>
1 parent 0c2e313 commit 954af22

File tree

5 files changed

+3
-113
lines changed

5 files changed

+3
-113
lines changed

integration/remote_write_v2_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ import (
2626

2727
func TestIngesterRollingUpdate(t *testing.T) {
2828
// Test ingester rolling update situation: when -distributor.remote-write2-enabled is true, and ingester uses the v1.19.0 image.
29-
// Expected: remote write 2.0 push success, but response header values are set to "0".
29+
// Expected: remote write 2.0 push success
3030
const blockRangePeriod = 5 * time.Second
3131
ingesterImage := "quay.io/cortexproject/cortex:v1.19.0"
3232

pkg/distributor/distributor.go

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1199,14 +1199,13 @@ func (d *Distributor) send(ctx context.Context, ingester ring.InstanceDesc, time
11991199
d.inflightClientRequests.Inc()
12001200
defer d.inflightClientRequests.Dec()
12011201

1202-
var resp *cortexpb.WriteResponse
12031202
if d.cfg.UseStreamPush {
12041203
req := &cortexpb.WriteRequest{
12051204
Timeseries: timeseries,
12061205
Metadata: metadata,
12071206
Source: source,
12081207
}
1209-
resp, err = c.PushStreamConnection(ctx, req)
1208+
_, err = c.PushStreamConnection(ctx, req)
12101209
} else {
12111210
req := cortexpb.PreallocWriteRequestFromPool()
12121211
req.Timeseries = timeseries

pkg/distributor/write_stats.go

Lines changed: 0 additions & 62 deletions
This file was deleted.

pkg/distributor/write_stats_test.go

Lines changed: 0 additions & 41 deletions
This file was deleted.

pkg/ingester/ingester.go

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1579,13 +1579,7 @@ func (i *Ingester) Push(ctx context.Context, req *cortexpb.WriteRequest) (*corte
15791579
return &cortexpb.WriteResponse{}, httpgrpc.Errorf(code, "%s", wrapWithUser(firstPartialErr, userID).Error())
15801580
}
15811581

1582-
writeResponse := &cortexpb.WriteResponse{
1583-
Samples: int64(succeededSamplesCount),
1584-
Histograms: int64(succeededHistogramsCount),
1585-
Exemplars: int64(succeededExemplarsCount),
1586-
}
1587-
1588-
return writeResponse, nil
1582+
return &cortexpb.WriteResponse{}, nil
15891583
}
15901584

15911585
func (i *Ingester) PushStream(srv client.Ingester_PushStreamServer) error {

0 commit comments

Comments
 (0)