From b99fc77bd3a7804b388b15a587807a087de6a2c0 Mon Sep 17 00:00:00 2001
From: Nick Dokos <ndokos@redhat.com>
Date: Wed, 7 Jun 2023 21:21:39 -0400
Subject: [PATCH] Disable redis protected mode (#3434) (#3458)

Fixes #3403.

Fedora 37 and Fedora 38 run it in protected mode by default. We
probably should be doing that everywhere but for the time being,
we turn it off everywhere instead.

Fix the util-scripts tool-meister tests

PBENCH-1163
---
 agent/util-scripts/gold/test-client-tool-meister/test-53.txt     | 1 +
 agent/util-scripts/gold/test-client-tool-meister/test-56.txt     | 1 +
 agent/util-scripts/gold/test-client-tool-meister/test-57.txt     | 1 +
 agent/util-scripts/gold/test-client-tool-meister/test-61.txt     | 1 +
 agent/util-scripts/gold/test-start-stop-tool-meister/test-51.txt | 1 +
 agent/util-scripts/gold/test-start-stop-tool-meister/test-52.txt | 1 +
 lib/pbench/agent/tool_meister_start.py                           | 1 +
 7 files changed, 7 insertions(+)

diff --git a/agent/util-scripts/gold/test-client-tool-meister/test-53.txt b/agent/util-scripts/gold/test-client-tool-meister/test-53.txt
index 05f0e7ee19..874b98c587 100644
--- a/agent/util-scripts/gold/test-client-tool-meister/test-53.txt
+++ b/agent/util-scripts/gold/test-client-tool-meister/test-53.txt
@@ -155,6 +155,7 @@ daemonize yes
 dir /var/tmp/pbench-test-utils/pbench/mock-run/tm
 save ""
 appendonly no
+protected-mode no
 dbfilename pbench-redis.rdb
 logfile /var/tmp/pbench-test-utils/pbench/mock-run/tm/redis.log
 loglevel notice
diff --git a/agent/util-scripts/gold/test-client-tool-meister/test-56.txt b/agent/util-scripts/gold/test-client-tool-meister/test-56.txt
index 50400a3c5c..34f50228e5 100644
--- a/agent/util-scripts/gold/test-client-tool-meister/test-56.txt
+++ b/agent/util-scripts/gold/test-client-tool-meister/test-56.txt
@@ -434,6 +434,7 @@ daemonize yes
 dir /var/tmp/pbench-test-utils/pbench/mock-run/tm
 save ""
 appendonly no
+protected-mode no
 dbfilename pbench-redis.rdb
 logfile /var/tmp/pbench-test-utils/pbench/mock-run/tm/redis.log
 loglevel notice
diff --git a/agent/util-scripts/gold/test-client-tool-meister/test-57.txt b/agent/util-scripts/gold/test-client-tool-meister/test-57.txt
index 28795b8513..4af5ea4e09 100644
--- a/agent/util-scripts/gold/test-client-tool-meister/test-57.txt
+++ b/agent/util-scripts/gold/test-client-tool-meister/test-57.txt
@@ -404,6 +404,7 @@ daemonize yes
 dir /var/tmp/pbench-test-utils/pbench/mock-run/tm
 save ""
 appendonly no
+protected-mode no
 dbfilename pbench-redis.rdb
 logfile /var/tmp/pbench-test-utils/pbench/mock-run/tm/redis.log
 loglevel notice
diff --git a/agent/util-scripts/gold/test-client-tool-meister/test-61.txt b/agent/util-scripts/gold/test-client-tool-meister/test-61.txt
index a718eafd21..8a55de3ac1 100644
--- a/agent/util-scripts/gold/test-client-tool-meister/test-61.txt
+++ b/agent/util-scripts/gold/test-client-tool-meister/test-61.txt
@@ -267,6 +267,7 @@ daemonize yes
 dir /var/tmp/pbench-test-utils/pbench/mock-run/tm
 save ""
 appendonly no
+protected-mode no
 dbfilename pbench-redis.rdb
 logfile /var/tmp/pbench-test-utils/pbench/mock-run/tm/redis.log
 loglevel notice
diff --git a/agent/util-scripts/gold/test-start-stop-tool-meister/test-51.txt b/agent/util-scripts/gold/test-start-stop-tool-meister/test-51.txt
index 9534eacc71..d499594e89 100644
--- a/agent/util-scripts/gold/test-start-stop-tool-meister/test-51.txt
+++ b/agent/util-scripts/gold/test-start-stop-tool-meister/test-51.txt
@@ -181,6 +181,7 @@ daemonize yes
 dir /var/tmp/pbench-test-utils/pbench/mock-run/tm
 save ""
 appendonly no
+protected-mode no
 dbfilename pbench-redis.rdb
 logfile /var/tmp/pbench-test-utils/pbench/mock-run/tm/redis.log
 loglevel notice
diff --git a/agent/util-scripts/gold/test-start-stop-tool-meister/test-52.txt b/agent/util-scripts/gold/test-start-stop-tool-meister/test-52.txt
index 1bf69ec45c..c1201bc643 100644
--- a/agent/util-scripts/gold/test-start-stop-tool-meister/test-52.txt
+++ b/agent/util-scripts/gold/test-start-stop-tool-meister/test-52.txt
@@ -181,6 +181,7 @@ daemonize yes
 dir /var/tmp/pbench-test-utils/pbench/mock-run/tm
 save ""
 appendonly no
+protected-mode no
 dbfilename pbench-redis.rdb
 logfile /var/tmp/pbench-test-utils/pbench/mock-run/tm/redis.log
 loglevel notice
diff --git a/lib/pbench/agent/tool_meister_start.py b/lib/pbench/agent/tool_meister_start.py
index 638ab8fbe6..67bc692cb3 100644
--- a/lib/pbench/agent/tool_meister_start.py
+++ b/lib/pbench/agent/tool_meister_start.py
@@ -586,6 +586,7 @@ class RedisServer(RedisServerCommon):
 dir {tm_dir}
 save ""
 appendonly no
+protected-mode no
 dbfilename pbench-redis.rdb
 logfile {tm_dir}/redis.log
 loglevel notice