From 42913d778e4db4dbba7aa106ef369cfce6201475 Mon Sep 17 00:00:00 2001 From: Aditi Ahuja Date: Sat, 6 Aug 2022 09:46:14 +0530 Subject: [PATCH] minor fixes Signed-off-by: Aditi Ahuja --- cmd/thanos/query.go | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/cmd/thanos/query.go b/cmd/thanos/query.go index 9663bbf7b1..53d2080626 100644 --- a/cmd/thanos/query.go +++ b/cmd/thanos/query.go @@ -764,8 +764,7 @@ func engineFactory( lookbackDelta = time.Duration(r) * time.Millisecond } - var queryTracker *promql.ActiveQueryTracker - newEngingOpts := promql.EngineOpts{ + newEngineOpts := promql.EngineOpts{ Logger: eo.Logger, Reg: wrapReg(i), MaxSamples: eo.MaxSamples, @@ -775,15 +774,16 @@ func engineFactory( EnableAtModifier: eo.EnableAtModifier, EnableNegativeOffset: eo.EnableNegativeOffset, } + // An active query tracker will be added only if the user specifies a non-default path. + // Otherwise, the nil active query tracker from existing engine options will be used. if activeQueryDir != "" { resActiveQueryDir := filepath.Join(activeQueryDir, getActiveQueryDirBasedOnResolution(r)) - queryTracker = promql.NewActiveQueryTracker(resActiveQueryDir, maxConcurrentQueries, logger) - newEngingOpts.ActiveQueryTracker = queryTracker + newEngineOpts.ActiveQueryTracker = promql.NewActiveQueryTracker(resActiveQueryDir, maxConcurrentQueries, logger) } else { - newEngingOpts.ActiveQueryTracker = eo.ActiveQueryTracker + newEngineOpts.ActiveQueryTracker = eo.ActiveQueryTracker } - engines[i] = newEngine(newEngingOpts) + engines[i] = newEngine(newEngineOpts) } return func(maxSourceResolutionMillis int64) *promql.Engine { for i := len(resolutions) - 1; i >= 1; i-- {