Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Restrict aof-load-truncated to redis 3+ #343

Merged
merged 1 commit into from
May 10, 2017
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 0 additions & 2 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -53,5 +53,3 @@ matrix:
- env: CMD="kitchen verify" OPTIONS="redis-package-centos-6"
# https://github.com/brianbianco/redisio/issues/336
- env: CMD="kitchen verify" OPTIONS="redis-package-debian-7"
# https://github.com/brianbianco/redisio/issues/337
- env: CMD="kitchen verify" OPTIONS="redis-package-ubuntu-1404"
2 changes: 2 additions & 0 deletions templates/default/redis.conf.erb
Original file line number Diff line number Diff line change
Expand Up @@ -603,6 +603,7 @@ no-appendfsync-on-rewrite <%=@noappendfsynconrewrite%>
auto-aof-rewrite-percentage <%=@aofrewritepercentage%>
auto-aof-rewrite-min-size <%=@aofrewriteminsize%>

<% if @version[:major].to_i >= 3 %>
# An AOF file may be found to be truncated at the end during the Redis
# startup process, when the AOF data gets loaded back into memory.
# This may happen when the system where Redis is running
Expand All @@ -626,6 +627,7 @@ auto-aof-rewrite-min-size <%=@aofrewriteminsize%>
# Redis will try to read more data from the AOF file but not enough bytes
# will be found.
aof-load-truncated <%= @aofloadtruncated %>
<% end %>

################################ LUA SCRIPTING ###############################

Expand Down