Skip to content

Commit 77b6a80

Browse files
committed
fix the async work flag didn't take affect
Signed-off-by: Yi Jin <[email protected]>
1 parent bd6169c commit 77b6a80

File tree

2 files changed

+4
-8
lines changed

2 files changed

+4
-8
lines changed

cmd/thanos/receive.go

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -255,6 +255,8 @@ func runReceive(
255255
MaxBackoff: time.Duration(*conf.maxBackoff),
256256
TSDBStats: dbs,
257257
Limiter: limiter,
258+
259+
AsyncForwardWorkerCount: conf.asyncForwardWorkerCount,
258260
})
259261

260262
grpcProbe := prober.NewGRPC()

pkg/receive/handler.go

Lines changed: 2 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -142,6 +142,7 @@ func NewHandler(logger log.Logger, o *Options) *Handler {
142142
if workers == 0 {
143143
workers = 1
144144
}
145+
level.Info(logger).Log("msg", "Starting receive handler with async forward workers", "workers", workers)
145146

146147
h := &Handler{
147148
logger: logger,
@@ -163,7 +164,6 @@ func NewHandler(logger log.Logger, o *Options) *Handler {
163164
},
164165
),
165166
workers,
166-
logger,
167167
o.DialOpts...),
168168
receiverMode: o.ReceiverMode,
169169
Limiter: o.Limiter,
@@ -777,8 +777,6 @@ func (h *Handler) distributeTimeseriesToReplicas(
777777
var writeDestination = remoteWrites
778778
if endpoint == h.options.Endpoint {
779779
writeDestination = localWrites
780-
} else {
781-
endpointReplica.replica = 0
782780
}
783781
writeableSeries, ok := writeDestination[endpointReplica]
784782
if !ok {
@@ -1212,7 +1210,7 @@ type peerWorker struct {
12121210
forwardDelay prometheus.Histogram
12131211
}
12141212

1215-
func newPeerGroup(backoff backoff.Backoff, forwardDelay prometheus.Histogram, asyncForwardWorkersCount uint, log log.Logger, dialOpts ...grpc.DialOption) peersContainer {
1213+
func newPeerGroup(backoff backoff.Backoff, forwardDelay prometheus.Histogram, asyncForwardWorkersCount uint, dialOpts ...grpc.DialOption) peersContainer {
12161214
return &peerGroup{
12171215
dialOpts: dialOpts,
12181216
connections: map[string]*peerWorker{},
@@ -1222,7 +1220,6 @@ func newPeerGroup(backoff backoff.Backoff, forwardDelay prometheus.Histogram, as
12221220
expBackoff: backoff,
12231221
forwardDelay: forwardDelay,
12241222
asyncForwardWorkersCount: asyncForwardWorkersCount,
1225-
log: log,
12261223
}
12271224
}
12281225

@@ -1266,7 +1263,6 @@ type peerGroup struct {
12661263
expBackoff backoff.Backoff
12671264
forwardDelay prometheus.Histogram
12681265
asyncForwardWorkersCount uint
1269-
log log.Logger
12701266

12711267
m sync.RWMutex
12721268

@@ -1322,8 +1318,6 @@ func (p *peerGroup) getConnection(ctx context.Context, addr string) (WriteableSt
13221318
}
13231319

13241320
p.connections[addr] = newPeerWorker(conn, p.forwardDelay, p.asyncForwardWorkersCount)
1325-
log.With(p.log).Log("msg", "established connection to peer", "peer", addr,
1326-
"asyncForwardWorkersCount", p.asyncForwardWorkersCount, "poolSize", p.connections[addr].wp.Size())
13271321
return p.connections[addr], nil
13281322
}
13291323

0 commit comments

Comments
 (0)