From 7ff0969f79c4ff9f6a579111961680ff2f2661da Mon Sep 17 00:00:00 2001 From: David Ansari Date: Thu, 29 Aug 2024 08:31:30 +0200 Subject: [PATCH] Remove vm_memory_high_watermark_paging_ratio This setting is not used anymore in CQ v2. Relates https://github.com/rabbitmq/rabbitmq-server/pull/12140 --- docs/examples/production-ready/rabbitmq.yaml | 1 - system_tests/system_test.go | 4 +--- 2 files changed, 1 insertion(+), 4 deletions(-) diff --git a/docs/examples/production-ready/rabbitmq.yaml b/docs/examples/production-ready/rabbitmq.yaml index 59a44e63d..68a3264c5 100644 --- a/docs/examples/production-ready/rabbitmq.yaml +++ b/docs/examples/production-ready/rabbitmq.yaml @@ -14,7 +14,6 @@ spec: rabbitmq: additionalConfig: | cluster_partition_handling = pause_minority - vm_memory_high_watermark_paging_ratio = 0.99 disk_free_limit.relative = 1.0 collect_statistics_interval = 10000 persistence: diff --git a/system_tests/system_test.go b/system_tests/system_test.go index 211982cd6..b61f52726 100644 --- a/system_tests/system_test.go +++ b/system_tests/system_test.go @@ -205,8 +205,7 @@ var _ = Describe("Operator", func() { By("updating the userDefinedConfiguration.conf file when additionalConfig are modified", func() { Expect(updateRabbitmqCluster(ctx, rmqClusterClient, cluster.Name, cluster.Namespace, func(cluster *rabbitmqv1beta1.RabbitmqCluster) { - cluster.Spec.Rabbitmq.AdditionalConfig = `vm_memory_high_watermark_paging_ratio = 0.5 -cluster_partition_handling = ignore + cluster.Spec.Rabbitmq.AdditionalConfig = `cluster_partition_handling = ignore cluster_keepalive_interval = 10000` })).To(Succeed()) @@ -216,7 +215,6 @@ cluster_keepalive_interval = 10000` // verify that rabbitmq.conf contains provided configurations cfgMap := getConfigFileFromPod(namespace, cluster, "/etc/rabbitmq/conf.d/90-userDefinedConfiguration.conf") Expect(cfgMap).To(SatisfyAll( - HaveKeyWithValue("vm_memory_high_watermark_paging_ratio", "0.5"), HaveKeyWithValue("cluster_keepalive_interval", "10000"), HaveKeyWithValue("cluster_partition_handling", "ignore"), ))