Redis 2.8.1.

Deprecate redis copy script 2.8

00-RELEASENOTES

@@ -14,7 +14,25 @@ HIGH:     There is a critical bug that may affect a subset of users. Upgrade!
 CRITICAL: There is a critical bug affecting MOST USERS. Upgrade ASAP.
 --------------------------------------------------------------------------------
 
---[ Redis 2.8 Release Candidate 5 (2.7.106) ] Release date: 6 Nov 2013
+--[ Redis 2.8.1 ] Release date: 25 Nov 2013
+
+# UPGRADE URGENCY: LOW for Redis, CRITICAL for Senitnel. You don't need to
+                   upgrade your Redis instances but it is highly recommended
+                   to upgrade and restart all the Sentinel processes.
+
+* [FIX] Fixed a bug in "new Sentinel" config propagation.
+* [FIX] Fixed a false positive in Redis tests.
+
+--[ Redis 2.8.0 ] Release date: 22 Nov 2013
+
+# UPGRADE URGENCY: LOW, unless you want to upgrade to new Sentinel code.
+
+* [FIX] Fixed an error in rdbWriteRaw() that should have no practical impact.
+* [NEW] Log the new master when SLAVEOF command is used.
+* [NEW] Sentinel code synchronized with the unstable branch, the new Sentinel
+        is a reimplementation that uses more reliable algorithms.
+
+--[ Redis 2.8 Release Candidate 6 (2.7.106) ] Release date: 6 Nov 2013
 
 This is the 6th release candidate of Redis 2.8 (official version is 2.7.106).
 

sentinel.conf

@@ -9,6 +9,10 @@ port 26379
 # Tells Sentinel to monitor this slave, and to consider it in O_DOWN
 # (Objectively Down) state only if at least <quorum> sentinels agree.
 #
+# Note that whatever is the ODOWN quorum, a Sentinel will require to
+# be elected by the majority of the known Sentinels in order to
+# start a failover, so no failover can be performed in minority.
+#
 # Note: master name should not include special characters or spaces.
 # The valid charset is A-z 0-9 and the three characters ".-_".
 sentinel monitor mymaster 127.0.0.1 6379 2
@@ -42,11 +46,6 @@ sentinel monitor mymaster 127.0.0.1 6379 2
 # Default is 30 seconds.
 sentinel down-after-milliseconds mymaster 30000
 
-# sentinel can-failover <master-name> <yes|no>
-#
-# Specify if this Sentinel can start the failover for this master.
-sentinel can-failover mymaster yes
-
 # sentinel parallel-syncs <master-name> <numslaves>
 #
 # How many slaves we can reconfigure to point to the new slave simultaneously
@@ -57,19 +56,28 @@ sentinel parallel-syncs mymaster 1
 
 # sentinel failover-timeout <master-name> <milliseconds>
 #
-# Specifies the failover timeout in milliseconds. When this time has elapsed
-# without any progress in the failover process, it is considered concluded by
-# the sentinel even if not all the attached slaves were correctly configured
-# to replicate with the new master (however a "best effort" SLAVEOF command
-# is sent to all the slaves before).
+# Specifies the failover timeout in milliseconds. It is used in many ways:
 #
-# Also when 25% of this time has elapsed without any advancement, and there
-# is a leader switch (the sentinel did not started the failover but is now
-# elected as leader), the sentinel will continue the failover doing a
-# "takeover".
+# - The time needed to re-start a failover after a previous failover was
+#   already tried against the same master by a given Sentinel, is two
+#   times the failover timeout.
 #
-# Default is 15 minutes.
-sentinel failover-timeout mymaster 900000
+# - The time needed for a slave replicating to a wrong master according
+#   to a Sentinel currnet configuration, to be forced to replicate
+#   with the right master, is exactly the failover timeout (counting since
+#   the moment a Sentinel detected the misconfiguration).
+#
+# - The time needed to cancel a failover that is already in progress but
+#   did not produced any configuration change (SLAVEOF NO ONE yet not
+#   acknowledged by the promoted slave).
+#
+# - The maximum time a failover in progress waits for all the slaves to be
+#   reconfigured as slaves of the new master. However even after this time
+#   the slaves will be reconfigured by the Sentinels anyway, but not with
+#   the exact parallel-syncs progression as specified.
+#
+# Default is 3 minutes.
+sentinel failover-timeout mymaster 180000
 
 # SCRIPTS EXECUTION
 #
@@ -114,32 +122,20 @@ sentinel failover-timeout mymaster 900000
 #
 # sentinel client-reconfig-script <master-name> <script-path>
 #
-# When the failover starts, ends, or is aborted, a script can be called in
+# When the master changed because of a failover a script can be called in
 # order to perform application-specific tasks to notify the clients that the
 # configuration has changed and the master is at a different address.
 # 
-# The script is called in the following cases:
-#
-# Failover started (a slave is already promoted)
-# Failover finished (all the additional slaves already reconfigured)
-# Failover aborted (in that case the script was previously called when the
-#                   failover started, and now gets called again with swapped
-#                   addresses).
-#
 # The following arguments are passed to the script:
 #
 # <master-name> <role> <state> <from-ip> <from-port> <to-ip> <to-port>
 #
-# <state> is "start", "end" or "abort"
+# <state> is currently always "failover"
 # <role> is either "leader" or "observer"
 # 
 # The arguments from-ip, from-port, to-ip, to-port are used to communicate
 # the old address of the master and the new address of the elected slave
-# (now a master) in the case state is "start" or "end".
-#
-# For abort instead the "from" is the address of the promoted slave and
-# "to" is the address of the original master address, since the failover
-# was aborted.
+# (now a master).
 #
 # This script should be resistant to multiple invocations.
 #

src/config.c

@@ -1102,6 +1102,8 @@ void configGetCommand(redisClient *c) {
  * CONFIG REWRITE implementation
  *----------------------------------------------------------------------------*/
 
+#define REDIS_CONFIG_REWRITE_SIGNATURE "# Generated by CONFIG REWRITE"
+
 /* We use the following dictionary type to store where a configuration
  * option is mentioned in the old configuration file, so it's
  * like "maxmemory" -> list of line numbers (first line is zero). */
@@ -1110,6 +1112,10 @@ int dictSdsKeyCompare(void *privdata, const void *key1, const void *key2);
 void dictSdsDestructor(void *privdata, void *val);
 void dictListDestructor(void *privdata, void *val);
 
+/* Sentinel config rewriting is implemented inside sentinel.c by
+ * rewriteConfigSentinelOption(). */
+void rewriteConfigSentinelOption(struct rewriteConfigState *state);
+
 dictType optionToLineDictType = {
     dictSdsHash,                /* hash function */
     NULL,                       /* key dup */
@@ -1174,6 +1180,8 @@ struct rewriteConfigState *rewriteConfigReadOldFile(char *path) {
 
         /* Handle comments and empty lines. */
         if (line[0] == '#' || line[0] == '\0') {
+            if (!state->has_tail && !strcmp(line,REDIS_CONFIG_REWRITE_SIGNATURE))
+                state->has_tail = 1;
             rewriteConfigAppendLine(state,line);
             continue;
         }
@@ -1206,7 +1214,7 @@ struct rewriteConfigState *rewriteConfigReadOldFile(char *path) {
 
 /* Rewrite the specified configuration option with the new "line".
  * It progressively uses lines of the file that were already used for the same
- * configuraiton option in the old version of the file, removing that line from
+ * configuration option in the old version of the file, removing that line from
  * the map of options -> line numbers.
  *
  * If there are lines associated with a given configuration option and
@@ -1245,7 +1253,7 @@ void rewriteConfigRewriteLine(struct rewriteConfigState *state, char *option, sd
         /* Append a new line. */
         if (!state->has_tail) {
             rewriteConfigAppendLine(state,
-                sdsnew("# Generated by CONFIG REWRITE"));
+                sdsnew(REDIS_CONFIG_REWRITE_SIGNATURE));
             state->has_tail = 1;
         }
         rewriteConfigAppendLine(state,line);
@@ -1680,6 +1688,7 @@ int rewriteConfig(char *path) {
     rewriteConfigClientoutputbufferlimitOption(state);
     rewriteConfigNumericalOption(state,"hz",server.hz,REDIS_DEFAULT_HZ);
     rewriteConfigYesNoOption(state,"aof-rewrite-incremental-fsync",server.aof_rewrite_incremental_fsync,REDIS_DEFAULT_AOF_REWRITE_INCREMENTAL_FSYNC);
+    if (server.sentinel_mode) rewriteConfigSentinelOption(state);
 
     /* Step 3: remove all the orphaned lines in the old file, that is, lines
      * that were used by a config option and are no longer used, like in case

src/rdb.c

@@ -99,7 +99,7 @@ int rdbSaveLen(rio *rdb, uint32_t len) {
         buf[0] = (REDIS_RDB_32BITLEN<<6);
         if (rdbWriteRaw(rdb,buf,1) == -1) return -1;
         len = htonl(len);
-        if (rdbWriteRaw(rdb,&len,4) == -4) return -1;
+        if (rdbWriteRaw(rdb,&len,4) == -1) return -1;
         nwritten = 1+4;
     }
     return nwritten;

src/redis.c

@@ -3011,6 +3011,8 @@ int main(int argc, char **argv) {
             redisLog(REDIS_NOTICE,"The server is now ready to accept connections on port %d", server.port);
         if (server.sofd > 0)
             redisLog(REDIS_NOTICE,"The server is now ready to accept connections at %s", server.unixsocket);
+    } else {
+        sentinelIsRunning();
     }
 
     /* Warning the user about suspicious maxmemory setting. */

src/redis.h

@@ -1144,6 +1144,9 @@ sds keyspaceEventsFlagsToString(int flags);
 void loadServerConfig(char *filename, char *options);
 void appendServerSaveParams(time_t seconds, int changes);
 void resetServerSaveParams();
+struct rewriteConfigState; /* Forward declaration to export API. */
+void rewriteConfigRewriteLine(struct rewriteConfigState *state, char *option, sds line, int force);
+int rewriteConfig(char *path);
 
 /* db.c -- Keyspace access API */
 int removeExpire(redisDb *db, robj *key);
@@ -1184,6 +1187,7 @@ void initSentinelConfig(void);
 void initSentinel(void);
 void sentinelTimer(void);
 char *sentinelHandleConfiguration(char **argv, int argc);
+void sentinelIsRunning(void);
 
 /* Scripting */
 void scriptingInit(void);

src/replication.c

@@ -1499,7 +1499,8 @@ void replicationCron(void) {
 
     /* Check if we should connect to a MASTER */
     if (server.repl_state == REDIS_REPL_CONNECT) {
-        redisLog(REDIS_NOTICE,"Connecting to MASTER...");
+        redisLog(REDIS_NOTICE,"Connecting to MASTER %s:%d",
+            server.masterhost, server.masterport);
         if (connectWithMaster() == REDIS_OK) {
             redisLog(REDIS_NOTICE,"MASTER <-> SLAVE sync started");
         }

src/version.h

@@ -1 +1 @@
-#define REDIS_VERSION "2.7.106"
+#define REDIS_VERSION "2.8.1"

tests/unit/memefficiency.tcl

@@ -22,7 +22,7 @@ start_server {tags {"memefficiency"}} {
         64    0.25
         128   0.35
         1024  0.75
-        16384 0.90
+        16384 0.82
     } {
         test "Memory efficiency with values in range $size_range" {
             set efficiency [test_memory_efficiency $size_range]

utils/redis-copy.rb

@@ -3,66 +3,23 @@
 #
 # Copy the whole dataset from one Redis instance to another one
 #
-# WARNING: currently hashes and sorted sets are not supported! This
-#          program should be updated.
+# WARNING: this utility is deprecated and serves as a legacy adapter
+#          for the more-robust redis-copy gem.
 
-require 'rubygems'
-require 'redis'
-require 'digest/sha1'
+require 'shellwords'
 
 def redisCopy(opts={})
-    sha1=""
-    src = Redis.new(:host => opts[:srchost], :port => opts[:srcport])
-    dst = Redis.new(:host => opts[:dsthost], :port => opts[:dstport])
-    puts "Loading key names..."
-    keys = src.keys('*')
-    puts "Copying #{keys.length} keys..."
-    c = 0
-    keys.each{|k|
-        vtype = src.type?(k)
-        ttl = src.ttl(k).to_i if vtype != "none"
-
-        if vtype == "string"
-            dst[k] = src[k]
-        elsif vtype == "list"
-            list = src.lrange(k,0,-1)
-            if list.length == 0
-                # Empty list special case
-                dst.lpush(k,"")
-                dst.lpop(k)
-            else
-                list.each{|ele|
-                    dst.rpush(k,ele)
-                }
-            end
-        elsif vtype == "set"
-            set = src.smembers(k)
-            if set.length == 0
-                # Empty set special case
-                dst.sadd(k,"")
-                dst.srem(k,"")
-            else
-                set.each{|ele|
-                    dst.sadd(k,ele)
-                }
-            end
-        elsif vtype == "none"
-            puts "WARNING: key '#{k}' was removed in the meanwhile."
-        end
-
-        # Handle keys with an expire time set
-        if ttl != -1 and vtype != "none"
-            dst.expire(k,ttl)
-        end
-
-        c = c+1
-        if (c % 1000) == 0
-            puts "#{c}/#{keys.length} completed"
-        end
-    }
-    puts "DONE!"
+  src = "#{opts[:srchost]}:#{opts[:srcport]}"
+  dst = "#{opts[:dsthost]}:#{opts[:dstport]}"
+  `redis-copy #{src.shellescape} #{dst.shellescape}`
+rescue Errno::ENOENT
+  $stderr.puts 'This utility requires the redis-copy executable',
+               'from the redis-copy gem on https://rubygems.org',
+               'To install it, run `gem install redis-copy`.'
+  exit 1
 end
 
+$stderr.puts "This utility is deprecated. Use the redis-copy gem instead."
 if ARGV.length != 4
     puts "Usage: redis-copy.rb <srchost> <srcport> <dsthost> <dstport>"
     exit 1