Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Disable activity log for self managed #31403

Merged
merged 1 commit into from
Feb 10, 2025
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 4 additions & 1 deletion misc/helm-charts/operator/templates/deployment.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -40,6 +40,9 @@ spec:
- "--cloud-provider={{ .Values.operator.cloudProvider.type }}"
- "--region={{ .Values.operator.cloudProvider.region }}"
- "--secrets-controller={{ .Values.operator.secretsController }}"
# (SangJunBak) For self-managed, we disable statement logging due to performance issues
# https://github.com/MaterializeInc/cloud/issues/10755
- "--disable-statement-logging"
{{- range $key, $value := include "materialize-operator.selectorLabels" . | fromYaml }}
- "--orchestratord-pod-selector-labels={{ $key }}={{ $value }}"
{{- end }}
Expand Down Expand Up @@ -69,7 +72,7 @@ spec:
{{- if .Values.operator.features.createConsole }}
- "--create-console"
{{- end }}
- "--console-image-tag-default=25.1.0-beta.3"
- "--console-image-tag-default=25.1.1"
{{- range $key, $value := .Values.operator.features.consoleImageTagMapOverride }}
- "--console-image-tag-map={{ $key }}={{ $value }}"
{{- end }}
Expand Down
8 changes: 4 additions & 4 deletions misc/helm-charts/operator/tests/deployment_test.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -64,21 +64,21 @@ tests:
storage.storageClass.name: ""
asserts:
- matchRegex:
path: spec.template.spec.containers[0].args[12] # Index of the environmentd-cluster-replica-sizes argument
path: spec.template.spec.containers[0].args[13] # Index of the environmentd-cluster-replica-sizes argument
pattern: disk_limit":"0"
- matchRegex:
path: spec.template.spec.containers[0].args[12]
path: spec.template.spec.containers[0].args[13]
pattern: is_cc":true

- it: should have a cluster with disk limit to 1552MiB when storage class is configured
set:
storage.storageClass.name: "my-storage-class"
asserts:
- matchRegex:
path: spec.template.spec.containers[0].args[12]
path: spec.template.spec.containers[0].args[13]
pattern: disk_limit":"1552MiB"
- matchRegex:
path: spec.template.spec.containers[0].args[12]
path: spec.template.spec.containers[0].args[13]
pattern: is_cc":true

- it: should configure for AWS provider correctly
Expand Down
2 changes: 1 addition & 1 deletion misc/images/materialized-base/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
# deployed to production, but the version needs to be bumped whenever features
# that the console depends upon are removed (to a version of the console that
# doesn't depend on those features).
FROM materialize/console:25.1.0-beta.3 AS console
FROM materialize/console:25.1.1 AS console

MZFROM ubuntu-base

Expand Down
2 changes: 2 additions & 0 deletions src/orchestratord/src/controller/materialize.rs
Original file line number Diff line number Diff line change
Expand Up @@ -76,6 +76,8 @@ pub struct MaterializeControllerArgs {
enable_security_context: bool,
#[clap(long)]
enable_internal_statement_logging: bool,
#[clap(long, default_value = "false")]
disable_statement_logging: bool,

#[clap(long)]
orchestratord_pod_selector_labels: Vec<KeyValueArg<String, String>>,
Expand Down
5 changes: 5 additions & 0 deletions src/orchestratord/src/controller/materialize/environmentd.rs
Original file line number Diff line number Diff line change
Expand Up @@ -893,6 +893,11 @@ fn create_environmentd_statefulset_object(
if config.enable_internal_statement_logging {
args.push("--system-parameter-default=enable_internal_statement_logging=true".into());
}

if config.disable_statement_logging {
args.push("--system-parameter-default=statement_logging_max_sample_rate=0".into());
}

if config.disable_authentication {
args.push("--system-parameter-default=enable_rbac_checks=false".into());
}
Expand Down