From 8fdf0351aa310b0aded5702ba3e2e391413844ee Mon Sep 17 00:00:00 2001 From: Philip Gough <philip.p.gough@gmail.com> Date: Wed, 26 Mar 2025 11:15:25 +0000 Subject: [PATCH] Adjust flags on prod compactors --- magefiles/cr.go | 13 +++++++------ .../rhobs-thanos-operator/production/rhobs.yaml | 13 +++++++------ 2 files changed, 14 insertions(+), 12 deletions(-) diff --git a/magefiles/cr.go b/magefiles/cr.go index 020a5d0242..9de7f3d438 100644 --- a/magefiles/cr.go +++ b/magefiles/cr.go @@ -1107,16 +1107,16 @@ func compactTempProduction() []runtime.Object { OneHour: v1alpha1.Duration("3650d"), }, DownsamplingConfig: &v1alpha1.DownsamplingConfig{ - Concurrency: ptr.To(int32(1)), + Concurrency: ptr.To(int32(4)), Disable: ptr.To(true), }, CompactConfig: &v1alpha1.CompactConfig{ - CompactConcurrency: ptr.To(int32(1)), + CompactConcurrency: ptr.To(int32(4)), }, DebugConfig: &v1alpha1.DebugConfig{ AcceptMalformedIndex: ptr.To(true), HaltOnError: ptr.To(true), - MaxCompactionLevel: ptr.To(int32(1)), + MaxCompactionLevel: ptr.To(int32(4)), }, StorageSize: v1alpha1.StorageSize("50Gi"), FeatureGates: &v1alpha1.FeatureGates{ @@ -1157,16 +1157,17 @@ func compactTempProduction() []runtime.Object { OneHour: v1alpha1.Duration("3650d"), }, DownsamplingConfig: &v1alpha1.DownsamplingConfig{ - Concurrency: ptr.To(int32(1)), + Concurrency: ptr.To(int32(4)), Disable: ptr.To(false), }, CompactConfig: &v1alpha1.CompactConfig{ - CompactConcurrency: ptr.To(int32(1)), + BlockFetchConcurrency: ptr.To(int32(4)), + CompactConcurrency: ptr.To(int32(4)), }, DebugConfig: &v1alpha1.DebugConfig{ AcceptMalformedIndex: ptr.To(true), HaltOnError: ptr.To(true), - MaxCompactionLevel: ptr.To(int32(1)), + MaxCompactionLevel: ptr.To(int32(4)), }, StorageSize: v1alpha1.StorageSize("500Gi"), FeatureGates: &v1alpha1.FeatureGates{ diff --git a/resources/services/rhobs-thanos-operator/production/rhobs.yaml b/resources/services/rhobs-thanos-operator/production/rhobs.yaml index 34dc85bdcb..933d486a2f 100755 --- a/resources/services/rhobs-thanos-operator/production/rhobs.yaml +++ b/resources/services/rhobs-thanos-operator/production/rhobs.yaml @@ -106,13 +106,14 @@ objects: - --deduplication.replica-label=replica baseImage: quay.io/redhat-user-workloads/rhobs-mco-tenant/rhobs-thanos compactConfig: - compactConcurrency: 1 + blockFetchConcurrency: 4 + compactConcurrency: 4 debugConfig: acceptMalformedIndex: true haltOnError: true - maxCompactionLevel: 1 + maxCompactionLevel: 4 downsamplingConfig: - downsamplingConcurrency: 1 + downsamplingConcurrency: 4 downsamplingEnabled: false featureGates: serviceMonitor: @@ -144,13 +145,13 @@ objects: - --deduplication.replica-label=replica baseImage: quay.io/redhat-user-workloads/rhobs-mco-tenant/rhobs-thanos compactConfig: - compactConcurrency: 1 + compactConcurrency: 4 debugConfig: acceptMalformedIndex: true haltOnError: true - maxCompactionLevel: 1 + maxCompactionLevel: 4 downsamplingConfig: - downsamplingConcurrency: 1 + downsamplingConcurrency: 4 downsamplingEnabled: true featureGates: serviceMonitor: