Revert "Receive: Reload tenant limit configuration on file change (th…

…anos-io#5673)"

This reverts commit 24e1cc0.

Signed-off-by: utukj <utukphd@gmail.com>

CHANGELOG.md

@@ -29,7 +29,6 @@ We use *breaking :warning:* to mark changes that are not backward compatible (re
 - [#5734](https://github.com/thanos-io/thanos/pull/5734) Store: Support disable block viewer UI.
 - [#5411](https://github.com/thanos-io/thanos/pull/5411) Tracing: Add OpenTelemetry Protocol exporter.
 - [#5779](https://github.com/thanos-io/thanos/pull/5779) Objstore: Support specifying S3 storage class.
-- [#5673](https://github.com/thanos-io/thanos/pull/5673) Receive: Reload tenant limit configuration on file change.
 
 ### Changed
 

cmd/thanos/receive.go

@@ -192,19 +192,6 @@ func runReceive(
 		return errors.Wrap(err, "parse relabel configuration")
 	}
 
-	dbs := receive.NewMultiTSDB(
-		conf.dataDir,
-		logger,
-		reg,
-		tsdbOpts,
-		lset,
-		conf.tenantLabelName,
-		bkt,
-		conf.allowOutOfOrderUpload,
-		hashFunc,
-	)
-	writer := receive.NewWriter(log.With(logger, "component", "receive-writer"), dbs)
-
 	var limitsConfig *receive.RootLimitsConfig
 	if conf.limitsConfig != nil {
 		limitsContentYaml, err := conf.limitsConfig.Content()
@@ -216,11 +203,20 @@ func runReceive(
 			return errors.Wrap(err, "parse limit configuration")
 		}
 	}
-	limiter, err := receive.NewLimiter(conf.limitsConfig, reg, receiveMode, log.With(logger, "component", "receive-limiter"))
-	if err != nil {
-		return errors.Wrap(err, "creating limiter")
-	}
+	limiter := receive.NewLimiter(limitsConfig, reg, receiveMode, log.With(logger, "component", "receive-limiter"))
 
+	dbs := receive.NewMultiTSDB(
+		conf.dataDir,
+		logger,
+		reg,
+		tsdbOpts,
+		lset,
+		conf.tenantLabelName,
+		bkt,
+		conf.allowOutOfOrderUpload,
+		hashFunc,
+	)
+	writer := receive.NewWriter(log.With(logger, "component", "receive-writer"), dbs)
 	webHandler := receive.NewHandler(log.With(logger, "component", "receive-handler"), &receive.Options{
 		Writer:            writer,
 		ListenAddress:     conf.rwAddress,
@@ -403,22 +399,6 @@ func runReceive(
 		})
 	}
 
-	{
-		if limiter.CanReload() {
-			ctx, cancel := context.WithCancel(context.Background())
-			g.Add(func() error {
-				level.Debug(logger).Log("msg", "limits config initialized with file watcher.")
-				if err := limiter.StartConfigReloader(ctx); err != nil {
-					return err
-				}
-				<-ctx.Done()
-				return nil
-			}, func(err error) {
-				cancel()
-			})
-		}
-	}
-
 	level.Info(logger).Log("msg", "starting receiver")
 	return nil
 }

docs/components/receive.md

@@ -86,7 +86,7 @@ Thanos Receive has some limits and gates that can be configured to control resou
 
 To configure the gates and limits you can use one of the two options:
 
-- `--receive.limits-config-file=<file-path>`: where `<file-path>` is the path to the YAML file. Any modification to the indicated file will trigger a configuration reload. If the updated configuration is invalid an error will be logged and it won't replace the previous valid configuration.
+- `--receive.limits-config-file=<file-path>`: where `<file-path>` is the path to the YAML file.
 - `--receive.limits-config=<content>`: where `<content>` is the content of YAML file.
 
 By default all the limits and gates are **disabled**.

go.mod

@@ -19,7 +19,7 @@ require (
 	github.com/davecgh/go-spew v1.1.1
 	github.com/dustin/go-humanize v1.0.0
 	github.com/efficientgo/e2e v0.13.1-0.20220923082810-8fa9daa8af8a
-	github.com/efficientgo/tools/extkingpin v0.0.0-20220817170617-6c25e3b627dd
+	github.com/efficientgo/tools/extkingpin v0.0.0-20220801101838-3312908f6a9d
 	github.com/facette/natsort v0.0.0-20181210072756-2cd4dd1e2dcb
 	github.com/fatih/structtag v1.2.0
 	github.com/felixge/fgprof v0.9.2
@@ -108,7 +108,6 @@ require (
 
 require (
 	github.com/efficientgo/core v1.0.0-rc.0
-	github.com/efficientgo/tools/core v0.0.0-20220817170617-6c25e3b627dd
 	github.com/minio/sha256-simd v1.0.0
 )
 
@@ -128,7 +127,10 @@ require (
 	go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracehttp v1.10.0
 )
 
-require go.opentelemetry.io/contrib/propagators/autoprop v0.34.0
+require (
+	github.com/efficientgo/tools/core v0.0.0-20220817170617-6c25e3b627dd
+	go.opentelemetry.io/contrib/propagators/autoprop v0.34.0
+)
 
 require (
 	github.com/GoogleCloudPlatform/opentelemetry-operations-go/internal/resourcemapping v0.32.3 // indirect

go.sum

@@ -252,8 +252,8 @@ github.com/efficientgo/e2e v0.13.1-0.20220923082810-8fa9daa8af8a h1:cnJajqeh/Hjv
 github.com/efficientgo/e2e v0.13.1-0.20220923082810-8fa9daa8af8a/go.mod h1:Hi+sz0REtlhVZ8zcdeTC3j6LUEEpJpPtNjOaOKuNcgI=
 github.com/efficientgo/tools/core v0.0.0-20220817170617-6c25e3b627dd h1:svR6KxSP1xiPw10RN4Pd7g6BAVkEcNN628PAqZH31mM=
 github.com/efficientgo/tools/core v0.0.0-20220817170617-6c25e3b627dd/go.mod h1:OmVcnJopJL8d3X3sSXTiypGoUSgFq1aDGmlrdi9dn/M=
-github.com/efficientgo/tools/extkingpin v0.0.0-20220817170617-6c25e3b627dd h1:VaYzzXeUbC5fVheskcKVNOyJMEYD+HgrJNzIAg/mRIM=
-github.com/efficientgo/tools/extkingpin v0.0.0-20220817170617-6c25e3b627dd/go.mod h1:ZV0utlglOczUWv3ih2AbqPSoLoFzdplUYxwV62eZi6Q=
+github.com/efficientgo/tools/extkingpin v0.0.0-20220801101838-3312908f6a9d h1:WZV/mrUyKS9w9r+Jdw+zq/tdGAb5LwB+H37EkMLhEMA=
+github.com/efficientgo/tools/extkingpin v0.0.0-20220801101838-3312908f6a9d/go.mod h1:ZV0utlglOczUWv3ih2AbqPSoLoFzdplUYxwV62eZi6Q=
 github.com/elastic/go-sysinfo v1.1.1/go.mod h1:i1ZYdU10oLNfRzq4vq62BEwD2fH8KaWh6eh0ikPT9F0=
 github.com/elastic/go-sysinfo v1.8.1 h1:4Yhj+HdV6WjbCRgGdZpPJ8lZQlXZLKDAeIkmQ/VRvi4=
 github.com/elastic/go-sysinfo v1.8.1/go.mod h1:JfllUnzoQV/JRYymbH3dO1yggI3mV2oTKSXsDHM+uIM=