Skip to content

Commit

Permalink
Update MS redis (local dev server) to 2.8.4
Browse files Browse the repository at this point in the history
  • Loading branch information
mgravell committed Mar 27, 2014
1 parent 67cbc1a commit 82a112c
Show file tree
Hide file tree
Showing 28 changed files with 131 additions and 38 deletions.
3 changes: 2 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -11,4 +11,5 @@ Mono/
*.sln.ide
*.rdb
*.orig
redis-cli.exe
redis-cli.exe
Redis Configs/*.dat
3 changes: 2 additions & 1 deletion .hgignore
Original file line number Diff line number Diff line change
Expand Up @@ -16,4 +16,5 @@ Mono/
*.sln.ide
*.rdb
*.orig
redis-cli.exe
redis-cli.exe
Redis Configs/*.dat
2 changes: 1 addition & 1 deletion .nuget/packages.config
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<packages>
<package id="NuGet.CommandLine" version="2.8.0" />
<package id="Redis-64" version="2.6.12.1" />
<package id="Redis-64" version="2.8.4" />
</packages>
2 changes: 1 addition & 1 deletion Redis Configs/redis-cli 7000.cmd
Original file line number Diff line number Diff line change
@@ -1 +1 @@
@..\packages\Redis-64.2.6.12.1\tools\redis-cli.exe -h cluster -p 7000
@..\packages\Redis-64.2.8.4\redis-cli.exe -h cluster -p 7000
2 changes: 1 addition & 1 deletion Redis Configs/redis-cli 7001.cmd
Original file line number Diff line number Diff line change
@@ -1 +1 @@
@..\packages\Redis-64.2.6.12.1\tools\redis-cli.exe -h cluster -p 7001
@..\packages\Redis-64.2.8.4\redis-cli.exe -h cluster -p 7001
2 changes: 1 addition & 1 deletion Redis Configs/redis-cli 7002.cmd
Original file line number Diff line number Diff line change
@@ -1 +1 @@
@..\packages\Redis-64.2.6.12.1\tools\redis-cli.exe -h cluster -p 7002
@..\packages\Redis-64.2.8.4\redis-cli.exe -h cluster -p 7002
2 changes: 1 addition & 1 deletion Redis Configs/redis-cli 7003.cmd
Original file line number Diff line number Diff line change
@@ -1 +1 @@
@..\packages\Redis-64.2.6.12.1\tools\redis-cli.exe -h cluster -p 7003
@..\packages\Redis-64.2.8.4\redis-cli.exe -h cluster -p 7003
2 changes: 1 addition & 1 deletion Redis Configs/redis-cli 7004.cmd
Original file line number Diff line number Diff line change
@@ -1 +1 @@
@..\packages\Redis-64.2.6.12.1\tools\redis-cli.exe -h cluster -p 7004
@..\packages\Redis-64.2.8.4\redis-cli.exe -h cluster -p 7004
2 changes: 1 addition & 1 deletion Redis Configs/redis-cli 7005.cmd
Original file line number Diff line number Diff line change
@@ -1 +1 @@
@..\packages\Redis-64.2.6.12.1\tools\redis-cli.exe -h cluster -p 7005
@..\packages\Redis-64.2.8.4\redis-cli.exe -h cluster -p 7005
2 changes: 1 addition & 1 deletion Redis Configs/redis-cli master.cmd
Original file line number Diff line number Diff line change
@@ -1 +1 @@
@..\packages\Redis-64.2.6.12.1\tools\redis-cli.exe -p 6379
@..\packages\Redis-64.2.8.4\redis-cli.exe -p 6379
2 changes: 1 addition & 1 deletion Redis Configs/redis-cli secure.cmd
Original file line number Diff line number Diff line change
@@ -1 +1 @@
@..\packages\Redis-64.2.6.12.1\tools\redis-cli.exe -p 6381
@..\packages\Redis-64.2.8.4\redis-cli.exe -p 6381
2 changes: 1 addition & 1 deletion Redis Configs/redis-cli slave.cmd
Original file line number Diff line number Diff line change
@@ -1 +1 @@
@..\packages\Redis-64.2.6.12.1\tools\redis-cli.exe -p 6380
@..\packages\Redis-64.2.8.4\redis-cli.exe -p 6380
6 changes: 3 additions & 3 deletions Redis Configs/redis-server alll local.cmd
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
@start ..\packages\Redis-64.2.6.12.1\tools\redis-server.exe master.conf
@start ..\packages\Redis-64.2.6.12.1\tools\redis-server.exe slave.conf
@start ..\packages\Redis-64.2.6.12.1\tools\redis-server.exe secure.conf
@start ..\packages\Redis-64.2.8.4\redis-server.exe master.conf
@start ..\packages\Redis-64.2.8.4\redis-server.exe slave.conf
@start ..\packages\Redis-64.2.8.4\redis-server.exe secure.conf
2 changes: 1 addition & 1 deletion Redis Configs/redis-server master.cmd
Original file line number Diff line number Diff line change
@@ -1 +1 @@
@..\packages\Redis-64.2.6.12.1\tools\redis-server.exe master.conf
@..\packages\Redis-64.2.8.4\redis-server.exe master.conf
2 changes: 1 addition & 1 deletion Redis Configs/redis-server secure.cmd
Original file line number Diff line number Diff line change
@@ -1 +1 @@
@..\packages\Redis-64.2.6.12.1\tools\redis-server.exe secure.conf
@..\packages\Redis-64.2.8.4\redis-server.exe secure.conf
2 changes: 1 addition & 1 deletion Redis Configs/redis-server slave.cmd
Original file line number Diff line number Diff line change
@@ -1 +1 @@
@..\packages\Redis-64.2.6.12.1\tools\redis-server.exe slave.conf
@..\packages\Redis-64.2.8.4\redis-server.exe slave.conf
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file removed packages/Redis-64.2.6.12.1/tools/redis-cli.exe
Binary file not shown.
Binary file removed packages/Redis-64.2.6.12.1/tools/redis-server.exe
Binary file not shown.
Binary file added packages/Redis-64.2.8.4/APIBridge.dll
Binary file not shown.
Binary file added packages/Redis-64.2.8.4/Redis Release Notes.docx
Binary file not shown.
Binary file added packages/Redis-64.2.8.4/redis-benchmark.exe
Binary file not shown.
Binary file added packages/Redis-64.2.8.4/redis-check-aof.exe
Binary file not shown.
Binary file added packages/Redis-64.2.8.4/redis-check-dump.exe
Binary file not shown.
Binary file added packages/Redis-64.2.8.4/redis-server.exe
Binary file not shown.
Original file line number Diff line number Diff line change
Expand Up @@ -39,8 +39,24 @@ port 6379
# Close the connection after a client is idle for N seconds (0 to disable)
timeout 0

# Set server verbosity to 'debug'
# it can be one of:
# TCP keepalive.
#
# If non-zero, use SO_KEEPALIVE to send TCP ACKs to clients in absence
# of communication. This is useful for two reasons:
#
# 1) Detect dead peers.
# 2) Take the connection alive from the point of view of network
# equipment in the middle.
#
# On Linux, the specified value (in seconds) is the period used to send ACKs.
# Note that to close the connection the double of the time is needed.
# On other kernels the period depends on the kernel configuration.
#
# A reasonable value for this option is 60 seconds.
tcp-keepalive 0

# Specify the server verbosity level.
# This can be one of:
# debug (a lot of information, useful for development/testing)
# verbose (many rarely useful info, but not a mess like the debug level)
# notice (moderately verbose, what you want in production probably)
Expand All @@ -59,7 +75,7 @@ logfile stdout
# Specify the syslog identity.
# syslog-ident redis

# Specify the syslog facility. Must be USER or between LOCAL0-LOCAL7.
# Specify the syslog facility. Must be USER or between LOCAL0-LOCAL7.
# syslog-facility local0

# Set the number of databases. The default database is DB 0, you can select
Expand Down Expand Up @@ -114,7 +130,7 @@ stop-writes-on-bgsave-error yes
# the dataset will likely be bigger if you have compressible values or keys.
rdbcompression yes

# Since verison 5 of RDB a CRC64 checksum is placed at the end of the file.
# Since version 5 of RDB a CRC64 checksum is placed at the end of the file.
# This makes the format more resistant to corruption but there is a performance
# hit to pay (around 10%) when saving and loading RDB files, so you can disable it
# for maximum performances.
Expand All @@ -131,7 +147,7 @@ dbfilename dump.rdb
# The DB will be written inside this directory, with the filename specified
# above using the 'dbfilename' configuration directive.
#
# Also the Append Only File will be created inside this directory.
# The Append Only File will also be created inside this directory.
#
# Note that you must specify a directory here, not a file name.
dir ./
Expand All @@ -152,14 +168,14 @@ dir ./
#
# masterauth <master-password>

# When a slave lost the connection with the master, or when the replication
# When a slave loses its connection with the master, or when the replication
# is still in progress, the slave can act in two different ways:
#
# 1) if slave-serve-stale-data is set to 'yes' (the default) the slave will
# still reply to client requests, possibly with out of date data, or the
# data set may just be empty if this is the first synchronization.
#
# 2) if slave-serve-stale data is set to 'no' the slave will reply with
# 2) if slave-serve-stale-data is set to 'no' the slave will reply with
# an error "SYNC with master in progress" to all the kind of commands
# but to INFO and SLAVEOF.
#
Expand Down Expand Up @@ -196,6 +212,21 @@ slave-read-only yes
#
# repl-timeout 60

# Disable TCP_NODELAY on the slave socket after SYNC?
#
# If you select "yes" Redis will use a smaller number of TCP packets and
# less bandwidth to send data to slaves. But this can add a delay for
# the data to appear on the slave side, up to 40 milliseconds with
# Linux kernels using a default configuration.
#
# If you select "no" the delay for data to appear on the slave side will
# be reduced but more bandwidth will be used for replication.
#
# By default we optimize for low latency, but in very high traffic conditions
# or when the master and slaves are many hops away, turning this to "yes" may
# be a good idea.
repl-disable-tcp-nodelay no

# The slave priority is an integer number published by Redis in the INFO output.
# It is used by Redis Sentinel in order to select a slave to promote into a
# master if the master is no longer working correctly.
Expand Down Expand Up @@ -230,23 +261,26 @@ slave-priority 100
#
# It is possible to change the name of dangerous commands in a shared
# environment. For instance the CONFIG command may be renamed into something
# of hard to guess so that it will be still available for internal-use
# tools but not available for general clients.
# hard to guess so that it will still be available for internal-use tools
# but not available for general clients.
#
# Example:
#
# rename-command CONFIG b840fc02d524045429941cc15f59e41cb7be6c52
#
# It is also possible to completely kill a command renaming it into
# It is also possible to completely kill a command by renaming it into
# an empty string:
#
# rename-command CONFIG ""
#
# Please note that changing the name of commands that are logged into the
# AOF file or transmitted to slaves may cause problems.

################################### LIMITS ####################################

# Set the max number of connected clients at the same time. By default
# this limit is set to 10000 clients, however if the Redis server is not
# able ot configure the process file limit to allow for the specified limit
# able to configure the process file limit to allow for the specified limit
# the max number of allowed clients is set to the current file limit
# minus 32 (as Redis reserves a few file descriptors for internal uses).
#
Expand All @@ -255,6 +289,40 @@ slave-priority 100
#
# maxclients 10000

# The Linux version of Redis relies on the system call fork() to perform
# point-in-time snapshots of the heap. In addition to the AOF and RDB backup
# mechanism, the master-slave synchronization and clustering features are
# dependent on this behavior of fork(). In order for the Windows version to
# perform like the Linux version we had to simulate this aspect of fork().
# Doing so meant moving the Redis heap into a memory mapped file that can
# be shared with a child process.
#
# *** There must be disk space available for this file in order for Redis
# to launch. ***
#
# The maxheap flag controls the maximum size of this memory mapped file,
# as well as the total usable space for the Redis heap. Running Redis
# without either maxheap or maxmemory will result in a memory mapped file
# being created that is equal to the size of physical memory. During
# fork() operations the total page file commit will max out at around:
#
# (size of physical memory) + (2 * size of maxheap)
#
# For instance, on a machine with 8GB of physical RAM, the max page file
# commit with the default maxheap size will be (8)+(2*8) GB , or 24GB. The
# default page file sizing of Windows will allow for this without having
# to reconfigure the system. Larger heap sizes are possible, but the maximum
# page file size will have to be increased accordingly.
#
# The Redis heap must be larger than the value specified by the maxmemory
# flag, as the heap allocator has its own memory requirements and
# fragmentation of the heap is inevitable. If only the maxmemory flag is
# specified, maxheap will be set at 1.5*maxmemory. If the maxheap flag is
# specified along with maxmemory, the maxheap flag will be automatically
# increased if it is smaller than 1.5*maxmemory.
#
# maxheap <bytes>

# Don't use more memory than the specified amount of bytes.
# When the memory limit is reached Redis will try to remove keys
# accordingly to the eviction policy selected (see maxmemmory-policy).
Expand All @@ -281,7 +349,7 @@ slave-priority 100
# maxmemory <bytes>

# MAXMEMORY POLICY: how Redis will select what to remove when maxmemory
# is reached? You can select among five behavior:
# is reached. You can select among five behaviors:
#
# volatile-lru -> remove the key with an expire set using an LRU algorithm
# allkeys-lru -> remove any key accordingly to the LRU algorithm
Expand All @@ -290,7 +358,7 @@ slave-priority 100
# volatile-ttl -> remove the key with the nearest expire time (minor TTL)
# noeviction -> don't expire at all, just return an error on write operations
#
# Note: with all the kind of policies, Redis will return an error on write
# Note: with any of the above policies, Redis will return an error on write
# operations, when there are not suitable keys for eviction.
#
# At the date of writing this commands are: set setnx setex append
Expand Down Expand Up @@ -346,7 +414,7 @@ appendonly no
# always: fsync after every write to the append only log . Slow, Safest.
# everysec: fsync only one time every second. Compromise.
#
# The default is "everysec" that's usually the right compromise between
# The default is "everysec", as that's usually the right compromise between
# speed and data safety. It's up to you to understand if you can relax this to
# "no" that will let the operating system flush the output buffer when
# it wants, for better performances (but if you can live with the idea of
Expand Down Expand Up @@ -374,9 +442,9 @@ appendfsync everysec
# that will prevent fsync() from being called in the main process while a
# BGSAVE or BGREWRITEAOF is in progress.
#
# This means that while another child is saving the durability of Redis is
# the same as "appendfsync none", that in practical terms means that it is
# possible to lost up to 30 seconds of log in the worst scenario (with the
# This means that while another child is saving, the durability of Redis is
# the same as "appendfsync none". In practical terms, this means that it is
# possible to lose up to 30 seconds of log in the worst scenario (with the
# default Linux settings).
#
# If you have latency problems turn this to "yes". Otherwise leave it as
Expand All @@ -385,10 +453,10 @@ no-appendfsync-on-rewrite no

# Automatic rewrite of the append only file.
# Redis is able to automatically rewrite the log file implicitly calling
# BGREWRITEAOF when the AOF log size will growth by the specified percentage.
# BGREWRITEAOF when the AOF log size grows by the specified percentage.
#
# This is how it works: Redis remembers the size of the AOF file after the
# latest rewrite (or if no rewrite happened since the restart, the size of
# latest rewrite (if no rewrite has happened since the restart, the size of
# the AOF at startup is used).
#
# This base size is compared to the current size. If the current size is
Expand Down Expand Up @@ -524,11 +592,34 @@ activerehashing yes
# Instead there is a default limit for pubsub and slave clients, since
# subscribers and slaves receive data in a push fashion.
#
# Both the hard or the soft limit can be disabled just setting it to zero.
# Both the hard or the soft limit can be disabled by setting them to zero.
client-output-buffer-limit normal 0 0 0
client-output-buffer-limit slave 256mb 64mb 60
client-output-buffer-limit pubsub 32mb 8mb 60

# Redis calls an internal function to perform many background tasks, like
# closing connections of clients in timeot, purging expired keys that are
# never requested, and so forth.
#
# Not all tasks are perforemd with the same frequency, but Redis checks for
# tasks to perform accordingly to the specified "hz" value.
#
# By default "hz" is set to 10. Raising the value will use more CPU when
# Redis is idle, but at the same time will make Redis more responsive when
# there are many keys expiring at the same time, and timeouts may be
# handled with more precision.
#
# The range is between 1 and 500, however a value over 100 is usually not
# a good idea. Most users should use the default of 10 and raise this up to
# 100 only in environments where very low latency is required.
hz 10

# When a child rewrites the AOF file, if the following option is enabled
# the file will be fsync-ed every 32 MB of data generated. This is useful
# in order to commit the file to the disk more incrementally and avoid
# big latency spikes.
aof-rewrite-incremental-fsync yes

################################## INCLUDES ###################################

# Include one or more other config files here. This is useful if you
Expand Down

0 comments on commit 82a112c

Please sign in to comment.