summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorfumingwei <[email protected]>2022-10-31 17:55:43 +0800
committerfumingwei <[email protected]>2022-10-31 17:55:43 +0800
commitfb83add7743c990ac38d3783d9bfa31d1b229780 (patch)
tree1a1d0096188683b21340f63e3891f58028b94a3b
parent4ca01efd389cc3b07ff43fb66f34a618af65654b (diff)
bugfix:TSG-12481:修改maat-redis的TimeoutSec配置项和redis.conf的repl-timeout配置项v22.10-rc2v22.10rel-22.10dev-22.10
-rw-r--r--ansible/roles/maat-redis/files/maat-redis.service1
-rw-r--r--ansible/roles/maat-redis/templates/maat-redis.conf.j2.j22
2 files changed, 2 insertions, 1 deletions
diff --git a/ansible/roles/maat-redis/files/maat-redis.service b/ansible/roles/maat-redis/files/maat-redis.service
index 1a04aefe..588188e3 100644
--- a/ansible/roles/maat-redis/files/maat-redis.service
+++ b/ansible/roles/maat-redis/files/maat-redis.service
@@ -6,6 +6,7 @@ After=network.target
ExecStart=/usr/bin/redis-server /etc/maat-redis.conf --supervised systemd
ExecStop=/usr/libexec/redis-shutdown maat-redis
Type=notify
+TimeoutSec=300s
[Install]
WantedBy=multi-user.target
diff --git a/ansible/roles/maat-redis/templates/maat-redis.conf.j2.j2 b/ansible/roles/maat-redis/templates/maat-redis.conf.j2.j2
index ead513e6..023f4b14 100644
--- a/ansible/roles/maat-redis/templates/maat-redis.conf.j2.j2
+++ b/ansible/roles/maat-redis/templates/maat-redis.conf.j2.j2
@@ -610,7 +610,7 @@ repl-diskless-load disabled
# every time there is low traffic between the master and the replica. The default
# value is 60 seconds.
#
-# repl-timeout 60
+repl-timeout 300
# Disable TCP_NODELAY on the replica socket after SYNC?
#