Skip to content

Commit a3be6dd

Browse files
authored
Remove vm_memory_high_watermark_paging_ratio (#1714)
This setting is not used anymore in CQ v2. Relates rabbitmq/rabbitmq-server#12140
1 parent bc95eb5 commit a3be6dd

File tree

2 files changed

+1
-4
lines changed

2 files changed

+1
-4
lines changed

docs/examples/production-ready/rabbitmq.yaml

-1
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,6 @@ spec:
1414
rabbitmq:
1515
additionalConfig: |
1616
cluster_partition_handling = pause_minority
17-
vm_memory_high_watermark_paging_ratio = 0.99
1817
disk_free_limit.relative = 1.0
1918
collect_statistics_interval = 10000
2019
persistence:

system_tests/system_test.go

+1-3
Original file line numberDiff line numberDiff line change
@@ -205,8 +205,7 @@ var _ = Describe("Operator", func() {
205205

206206
By("updating the userDefinedConfiguration.conf file when additionalConfig are modified", func() {
207207
Expect(updateRabbitmqCluster(ctx, rmqClusterClient, cluster.Name, cluster.Namespace, func(cluster *rabbitmqv1beta1.RabbitmqCluster) {
208-
cluster.Spec.Rabbitmq.AdditionalConfig = `vm_memory_high_watermark_paging_ratio = 0.5
209-
cluster_partition_handling = ignore
208+
cluster.Spec.Rabbitmq.AdditionalConfig = `cluster_partition_handling = ignore
210209
cluster_keepalive_interval = 10000`
211210
})).To(Succeed())
212211

@@ -216,7 +215,6 @@ cluster_keepalive_interval = 10000`
216215
// verify that rabbitmq.conf contains provided configurations
217216
cfgMap := getConfigFileFromPod(namespace, cluster, "/etc/rabbitmq/conf.d/90-userDefinedConfiguration.conf")
218217
Expect(cfgMap).To(SatisfyAll(
219-
HaveKeyWithValue("vm_memory_high_watermark_paging_ratio", "0.5"),
220218
HaveKeyWithValue("cluster_keepalive_interval", "10000"),
221219
HaveKeyWithValue("cluster_partition_handling", "ignore"),
222220
))

0 commit comments

Comments
 (0)