From a08fd29a33c50e19bb8da73024fcc722fda34411 Mon Sep 17 00:00:00 2001
From: Enrico Giordani <enrico.giordani@gmail.com>
Date: Wed, 22 Jul 2015 11:26:07 +0200
Subject: [PATCH] [Setup] Windows release notes, sample configuration files.

---
 .../Redis on Windows Release Notes.docx       | Bin 12578 -> 12618 bytes
 .../documentation/redis.windows-service.conf  | 108 ++++++++++++++++++
 msvs/setups/documentation/redis.windows.conf  | 108 ++++++++++++++++++
 3 files changed, 216 insertions(+)

diff --git a/msvs/setups/documentation/Redis on Windows Release Notes.docx b/msvs/setups/documentation/Redis on Windows Release Notes.docx
index 54c67e044424cfa194243c45231e01d7cfebfebb..c74750d0098726ee87fb91139a4090c2834d58d2 100644
GIT binary patch
delta 3493
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
MD#-)(7yl>qf24zed;kCd

delta 3438
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
Q0V$IrF(L*_E&u=k03hgK<NyEw

diff --git a/msvs/setups/documentation/redis.windows-service.conf b/msvs/setups/documentation/redis.windows-service.conf
index 4510bfb5..430ad27c 100644
--- a/msvs/setups/documentation/redis.windows-service.conf
+++ b/msvs/setups/documentation/redis.windows-service.conf
@@ -667,6 +667,114 @@ aof-load-truncated yes
 # Set it to 0 or a negative value for unlimited execution without warnings.
 lua-time-limit 5000
 
+################################ REDIS CLUSTER  ###############################
+#
+# ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
+# WARNING EXPERIMENTAL: Redis Cluster is considered to be stable code, however
+# in order to mark it as "mature" we need to wait for a non trivial percentage
+# of users to deploy it in production.
+# ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
+#
+# Normal Redis instances can't be part of a Redis Cluster; only nodes that are
+# started as cluster nodes can. In order to start a Redis instance as a
+# cluster node enable the cluster support uncommenting the following:
+#
+# cluster-enabled yes
+
+# Every cluster node has a cluster configuration file. This file is not
+# intended to be edited by hand. It is created and updated by Redis nodes.
+# Every Redis Cluster node requires a different cluster configuration file.
+# Make sure that instances running in the same system do not have
+# overlapping cluster configuration file names.
+#
+# cluster-config-file nodes-6379.conf
+
+# Cluster node timeout is the amount of milliseconds a node must be unreachable
+# for it to be considered in failure state.
+# Most other internal time limits are multiple of the node timeout.
+#
+# cluster-node-timeout 15000
+
+# A slave of a failing master will avoid to start a failover if its data
+# looks too old.
+#
+# There is no simple way for a slave to actually have a exact measure of
+# its "data age", so the following two checks are performed:
+#
+# 1) If there are multiple slaves able to failover, they exchange messages
+#    in order to try to give an advantage to the slave with the best
+#    replication offset (more data from the master processed).
+#    Slaves will try to get their rank by offset, and apply to the start
+#    of the failover a delay proportional to their rank.
+#
+# 2) Every single slave computes the time of the last interaction with
+#    its master. This can be the last ping or command received (if the master
+#    is still in the "connected" state), or the time that elapsed since the
+#    disconnection with the master (if the replication link is currently down).
+#    If the last interaction is too old, the slave will not try to failover
+#    at all.
+#
+# The point "2" can be tuned by user. Specifically a slave will not perform
+# the failover if, since the last interaction with the master, the time
+# elapsed is greater than:
+#
+#   (node-timeout * slave-validity-factor) + repl-ping-slave-period
+#
+# So for example if node-timeout is 30 seconds, and the slave-validity-factor
+# is 10, and assuming a default repl-ping-slave-period of 10 seconds, the
+# slave will not try to failover if it was not able to talk with the master
+# for longer than 310 seconds.
+#
+# A large slave-validity-factor may allow slaves with too old data to failover
+# a master, while a too small value may prevent the cluster from being able to
+# elect a slave at all.
+#
+# For maximum availability, it is possible to set the slave-validity-factor
+# to a value of 0, which means, that slaves will always try to failover the
+# master regardless of the last time they interacted with the master.
+# (However they'll always try to apply a delay proportional to their
+# offset rank).
+#
+# Zero is the only value able to guarantee that when all the partitions heal
+# the cluster will always be able to continue.
+#
+# cluster-slave-validity-factor 10
+
+# Cluster slaves are able to migrate to orphaned masters, that are masters
+# that are left without working slaves. This improves the cluster ability
+# to resist to failures as otherwise an orphaned master can't be failed over
+# in case of failure if it has no working slaves.
+#
+# Slaves migrate to orphaned masters only if there are still at least a
+# given number of other working slaves for their old master. This number
+# is the "migration barrier". A migration barrier of 1 means that a slave
+# will migrate only if there is at least 1 other working slave for its master
+# and so forth. It usually reflects the number of slaves you want for every
+# master in your cluster.
+#
+# Default is 1 (slaves migrate only if their masters remain with at least
+# one slave). To disable migration just set it to a very large value.
+# A value of 0 can be set but is useful only for debugging and dangerous
+# in production.
+#
+# cluster-migration-barrier 1
+
+# By default Redis Cluster nodes stop accepting queries if they detect there
+# is at least an hash slot uncovered (no available node is serving it).
+# This way if the cluster is partially down (for example a range of hash slots
+# are no longer covered) all the cluster becomes, eventually, unavailable.
+# It automatically returns available as soon as all the slots are covered again.
+#
+# However sometimes you want the subset of the cluster which is working,
+# to continue to accept queries for the part of the key space that is still
+# covered. In order to do so, just set the cluster-require-full-coverage
+# option to no.
+#
+# cluster-require-full-coverage yes
+
+# In order to setup your cluster make sure to read the documentation
+# available at http://redis.io web site.
+
 ################################## SLOW LOG ###################################
 
 # The Redis Slow Log is a system to log queries that exceeded a specified
diff --git a/msvs/setups/documentation/redis.windows.conf b/msvs/setups/documentation/redis.windows.conf
index 4e85f895..34bff683 100644
--- a/msvs/setups/documentation/redis.windows.conf
+++ b/msvs/setups/documentation/redis.windows.conf
@@ -667,6 +667,114 @@ aof-load-truncated yes
 # Set it to 0 or a negative value for unlimited execution without warnings.
 lua-time-limit 5000
 
+################################ REDIS CLUSTER  ###############################
+#
+# ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
+# WARNING EXPERIMENTAL: Redis Cluster is considered to be stable code, however
+# in order to mark it as "mature" we need to wait for a non trivial percentage
+# of users to deploy it in production.
+# ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
+#
+# Normal Redis instances can't be part of a Redis Cluster; only nodes that are
+# started as cluster nodes can. In order to start a Redis instance as a
+# cluster node enable the cluster support uncommenting the following:
+#
+# cluster-enabled yes
+
+# Every cluster node has a cluster configuration file. This file is not
+# intended to be edited by hand. It is created and updated by Redis nodes.
+# Every Redis Cluster node requires a different cluster configuration file.
+# Make sure that instances running in the same system do not have
+# overlapping cluster configuration file names.
+#
+# cluster-config-file nodes-6379.conf
+
+# Cluster node timeout is the amount of milliseconds a node must be unreachable
+# for it to be considered in failure state.
+# Most other internal time limits are multiple of the node timeout.
+#
+# cluster-node-timeout 15000
+
+# A slave of a failing master will avoid to start a failover if its data
+# looks too old.
+#
+# There is no simple way for a slave to actually have a exact measure of
+# its "data age", so the following two checks are performed:
+#
+# 1) If there are multiple slaves able to failover, they exchange messages
+#    in order to try to give an advantage to the slave with the best
+#    replication offset (more data from the master processed).
+#    Slaves will try to get their rank by offset, and apply to the start
+#    of the failover a delay proportional to their rank.
+#
+# 2) Every single slave computes the time of the last interaction with
+#    its master. This can be the last ping or command received (if the master
+#    is still in the "connected" state), or the time that elapsed since the
+#    disconnection with the master (if the replication link is currently down).
+#    If the last interaction is too old, the slave will not try to failover
+#    at all.
+#
+# The point "2" can be tuned by user. Specifically a slave will not perform
+# the failover if, since the last interaction with the master, the time
+# elapsed is greater than:
+#
+#   (node-timeout * slave-validity-factor) + repl-ping-slave-period
+#
+# So for example if node-timeout is 30 seconds, and the slave-validity-factor
+# is 10, and assuming a default repl-ping-slave-period of 10 seconds, the
+# slave will not try to failover if it was not able to talk with the master
+# for longer than 310 seconds.
+#
+# A large slave-validity-factor may allow slaves with too old data to failover
+# a master, while a too small value may prevent the cluster from being able to
+# elect a slave at all.
+#
+# For maximum availability, it is possible to set the slave-validity-factor
+# to a value of 0, which means, that slaves will always try to failover the
+# master regardless of the last time they interacted with the master.
+# (However they'll always try to apply a delay proportional to their
+# offset rank).
+#
+# Zero is the only value able to guarantee that when all the partitions heal
+# the cluster will always be able to continue.
+#
+# cluster-slave-validity-factor 10
+
+# Cluster slaves are able to migrate to orphaned masters, that are masters
+# that are left without working slaves. This improves the cluster ability
+# to resist to failures as otherwise an orphaned master can't be failed over
+# in case of failure if it has no working slaves.
+#
+# Slaves migrate to orphaned masters only if there are still at least a
+# given number of other working slaves for their old master. This number
+# is the "migration barrier". A migration barrier of 1 means that a slave
+# will migrate only if there is at least 1 other working slave for its master
+# and so forth. It usually reflects the number of slaves you want for every
+# master in your cluster.
+#
+# Default is 1 (slaves migrate only if their masters remain with at least
+# one slave). To disable migration just set it to a very large value.
+# A value of 0 can be set but is useful only for debugging and dangerous
+# in production.
+#
+# cluster-migration-barrier 1
+
+# By default Redis Cluster nodes stop accepting queries if they detect there
+# is at least an hash slot uncovered (no available node is serving it).
+# This way if the cluster is partially down (for example a range of hash slots
+# are no longer covered) all the cluster becomes, eventually, unavailable.
+# It automatically returns available as soon as all the slots are covered again.
+#
+# However sometimes you want the subset of the cluster which is working,
+# to continue to accept queries for the part of the key space that is still
+# covered. In order to do so, just set the cluster-require-full-coverage
+# option to no.
+#
+# cluster-require-full-coverage yes
+
+# In order to setup your cluster make sure to read the documentation
+# available at http://redis.io web site.
+
 ################################## SLOW LOG ###################################
 
 # The Redis Slow Log is a system to log queries that exceeded a specified