enable filtering based on mode

grafana · Apr 6, 2022 · b66f4af · b66f4af
1 parent 69dfb30
commit b66f4af
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 1 deletion.
diff --git a/pkg/loki/modules.go b/pkg/loki/modules.go
@@ -823,8 +823,13 @@ func (t *Loki) initUsageReport() (services.Service, error) {
 }
 
 func (t *Loki) deleteRequestsStore() (deletion.DeleteRequestsStore, error) {
+	filteringEnabled, err := deletion.FilteringEnabled(t.Cfg.CompactorConfig.DeletionMode)
+	if err != nil {
+		return nil, err
+	}
+
 	deleteStore := deletion.NewNoOpDeleteRequestsStore()
-	if loki_storage.UsingBoltdbShipper(t.Cfg.SchemaConfig.Configs) {
+	if loki_storage.UsingBoltdbShipper(t.Cfg.SchemaConfig.Configs) && filteringEnabled {
 		indexClient, err := chunk_storage.NewIndexClient(shipper.BoltDBShipperType, t.Cfg.StorageConfig.Config, t.Cfg.SchemaConfig.SchemaConfig, t.overrides, prometheus.DefaultRegisterer)
 		if err != nil {
 			return nil, err

diff --git a/pkg/storage/stores/shipper/compactor/deletion/mode.go b/pkg/storage/stores/shipper/compactor/deletion/mode.go
@@ -48,3 +48,12 @@ func ParseMode(in string) (Mode, error) {
 	}
 	return 0, errUnknownMode
 }
+
+func FilteringEnabled(in string) (bool, error) {
+	deleteMode, err := ParseMode(in)
+	if err != nil {
+		return false, err
+	}
+
+	return deleteMode == FilterOnly || deleteMode == FilterAndDelete, nil
+}