Skip to content

Commit

Permalink
Squashed 'vendor/github.com/performancecopilot/ansible-pcp/' changes …
Browse files Browse the repository at this point in the history
…from ff37aa2..b59dee6

b59dee6 fix: convert remaining keyserver save_to_disk variables
b310a1f fix: resolve github actions warning about yaml doc start line

git-subtree-dir: vendor/github.com/performancecopilot/ansible-pcp
git-subtree-split: b59dee6d8ac02ae99d5b7707c67eedfdd7394476
  • Loading branch information
natoscott committed Oct 14, 2024
1 parent e933ca3 commit 9173c3b
Show file tree
Hide file tree
Showing 4 changed files with 12 additions and 5 deletions.
1 change: 1 addition & 0 deletions .github/workflows/pr-title-lint.yml
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
---
name: PR Title Lint
on: # yamllint disable-line rule:truthy
pull_request:
Expand Down
2 changes: 1 addition & 1 deletion roles/keyserver/templates/redis_5.conf.j2
Original file line number Diff line number Diff line change
Expand Up @@ -215,7 +215,7 @@ always-show-logo yes
#
# save ""

{% if redis_save_to_disk %}
{% if keyserver_save_to_disk %}
save 900 1
save 300 10
save 60 10000
Expand Down
2 changes: 1 addition & 1 deletion roles/keyserver/templates/redis_6.conf.j2
Original file line number Diff line number Diff line change
Expand Up @@ -285,7 +285,7 @@ always-show-logo yes
#
# save ""

{% if redis_save_to_disk %}
{% if keyserver_save_to_disk %}
save 900 1
save 300 10
save 60 10000
Expand Down
12 changes: 9 additions & 3 deletions roles/keyserver/templates/valkey_7.conf.j2
Original file line number Diff line number Diff line change
Expand Up @@ -333,7 +333,7 @@ daemonize no
#
# When the server runs non daemonized, no pid file is created if none is
# specified in the configuration. When the server is daemonized, the pid file
# is used even if not specified, defaulting to "/var/run/redis.pid".
# is used even if not specified, defaulting to "/var/run/valkey.pid".
#
# Creating a pid file is best effort: if the server is not able to create it
# nothing bad happens, the server will start and run normally.
Expand Down Expand Up @@ -361,7 +361,7 @@ logfile /var/log/valkey/valkey.log
# syslog-enabled no

# Specify the syslog identity.
# syslog-ident redis
# syslog-ident valkey

# Specify the syslog facility. Must be USER or between LOCAL0-LOCAL7.
# syslog-facility local0
Expand Down Expand Up @@ -440,6 +440,12 @@ locale-collate ""
#
# save 3600 1 300 100 60 10000

{% if keyserver_save_to_disk %}
save 900 1 300 10 60 10000
{% else %}
save ""
{% endif %}

# By default the server will stop accepting writes if RDB snapshots are enabled
# (at least one save point) and the latest background save failed.
# This will make the user aware (in a hard way) that data is not persisting
Expand Down Expand Up @@ -2269,7 +2275,7 @@ jemalloc-bg-thread yes
# the bgsave child process. The syntax to specify the cpu list is the same as
# the taskset command:
#
# Set redis server/io threads to cpu affinity 0,2,4,6:
# Set valkey server/io threads to cpu affinity 0,2,4,6:
# server_cpulist 0-7:2
#
# Set bio threads to cpu affinity 1,3:
Expand Down

0 comments on commit 9173c3b

Please sign in to comment.