Skip to content

Commit e544c6d

Browse files
committed
Disable activity log for self-managed
1 parent ef6628f commit e544c6d

File tree

5 files changed

+16
-6
lines changed

5 files changed

+16
-6
lines changed

misc/helm-charts/operator/templates/deployment.yaml

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,6 +40,9 @@ spec:
4040
- "--cloud-provider={{ .Values.operator.cloudProvider.type }}"
4141
- "--region={{ .Values.operator.cloudProvider.region }}"
4242
- "--secrets-controller={{ .Values.operator.secretsController }}"
43+
# (SangJunBak) For self-managed, we disable statement logging due to performance issues
44+
# https://github.com/MaterializeInc/cloud/issues/10755
45+
- "--disable-statement-logging"
4346
{{- range $key, $value := include "materialize-operator.selectorLabels" . | fromYaml }}
4447
- "--orchestratord-pod-selector-labels={{ $key }}={{ $value }}"
4548
{{- end }}
@@ -69,7 +72,7 @@ spec:
6972
{{- if .Values.operator.features.createConsole }}
7073
- "--create-console"
7174
{{- end }}
72-
- "--console-image-tag-default=25.1.0-beta.3"
75+
- "--console-image-tag-default=25.1.1"
7376
{{- range $key, $value := .Values.operator.features.consoleImageTagMapOverride }}
7477
- "--console-image-tag-map={{ $key }}={{ $value }}"
7578
{{- end }}

misc/helm-charts/operator/tests/deployment_test.yaml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -64,21 +64,21 @@ tests:
6464
storage.storageClass.name: ""
6565
asserts:
6666
- matchRegex:
67-
path: spec.template.spec.containers[0].args[12] # Index of the environmentd-cluster-replica-sizes argument
67+
path: spec.template.spec.containers[0].args[13] # Index of the environmentd-cluster-replica-sizes argument
6868
pattern: disk_limit":"0"
6969
- matchRegex:
70-
path: spec.template.spec.containers[0].args[12]
70+
path: spec.template.spec.containers[0].args[13]
7171
pattern: is_cc":true
7272

7373
- it: should have a cluster with disk limit to 1552MiB when storage class is configured
7474
set:
7575
storage.storageClass.name: "my-storage-class"
7676
asserts:
7777
- matchRegex:
78-
path: spec.template.spec.containers[0].args[12]
78+
path: spec.template.spec.containers[0].args[13]
7979
pattern: disk_limit":"1552MiB"
8080
- matchRegex:
81-
path: spec.template.spec.containers[0].args[12]
81+
path: spec.template.spec.containers[0].args[13]
8282
pattern: is_cc":true
8383

8484
- it: should configure for AWS provider correctly

misc/images/materialized-base/Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
# deployed to production, but the version needs to be bumped whenever features
1616
# that the console depends upon are removed (to a version of the console that
1717
# doesn't depend on those features).
18-
FROM materialize/console:25.1.0-beta.3 AS console
18+
FROM materialize/console:25.1.1 AS console
1919

2020
MZFROM ubuntu-base
2121

src/orchestratord/src/controller/materialize.rs

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -76,6 +76,8 @@ pub struct MaterializeControllerArgs {
7676
enable_security_context: bool,
7777
#[clap(long)]
7878
enable_internal_statement_logging: bool,
79+
#[clap(long, default_value = "false")]
80+
disable_statement_logging: bool,
7981

8082
#[clap(long)]
8183
orchestratord_pod_selector_labels: Vec<KeyValueArg<String, String>>,

src/orchestratord/src/controller/materialize/environmentd.rs

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -893,6 +893,11 @@ fn create_environmentd_statefulset_object(
893893
if config.enable_internal_statement_logging {
894894
args.push("--system-parameter-default=enable_internal_statement_logging=true".into());
895895
}
896+
897+
if config.disable_statement_logging {
898+
args.push("--system-parameter-default=statement_logging_max_sample_rate=0".into());
899+
}
900+
896901
if config.disable_authentication {
897902
args.push("--system-parameter-default=enable_rbac_checks=false".into());
898903
}

0 commit comments

Comments
 (0)