extern: synced with the upstream redis/3.2 @c9ab43e

Author: spinlock

extern/redis-3.2.8/patch/redis/0001-Don-t-leak-file-descriptor-on-syncWithMaster.patch

@@ -1,7 +1,7 @@
 From 10dbb5cd33cdc78edc70c1827e5c7c7f46eb9538 Mon Sep 17 00:00:00 2001
 From: antirez <antirez@gmail.com>
 Date: Mon, 20 Feb 2017 10:18:41 +0100
-Subject: [PATCH 01/19] Don't leak file descriptor on syncWithMaster().
+Subject: [PATCH 01/37] Don't leak file descriptor on syncWithMaster().
 
 Close #3804.
 ---
@@ -30,5 +30,5 @@ index e7194e59..8d9bcfbf 100644
      server.repl_transfer_s = -1;
      server.repl_state = REPL_STATE_CONNECT;
 -- 
-2.13.1
+2.14.0.rc1.383.gd1ce394fe2-goog
 

extern/redis-3.2.8/patch/redis/0002-fix-2883-2857-pipe-fds-leak-when-fork-failed-on-bg-a.patch

@@ -1,7 +1,7 @@
 From b83f9fea81411c4809218bd7c51f974e4c4ad7a8 Mon Sep 17 00:00:00 2001
 From: "John.Koepi" <john.koepi@gmail.com>
 Date: Sat, 23 Jul 2016 16:31:56 +0200
-Subject: [PATCH 02/19] fix #2883, #2857 pipe fds leak when fork() failed on bg
+Subject: [PATCH 02/37] fix #2883, #2857 pipe fds leak when fork() failed on bg
  aof rw
 
 ---
@@ -21,5 +21,5 @@ index c6fbbb82..862b5e13 100644
          }
          serverLog(LL_NOTICE,
 -- 
-2.13.1
+2.14.0.rc1.383.gd1ce394fe2-goog
 

extern/redis-3.2.8/patch/redis/0003-Implement-getKeys-procedure-for-georadius-and-georad.patch

@@ -1,7 +1,7 @@
 From bacb04f89fe22b98881f86523ce8f7b8b6542084 Mon Sep 17 00:00:00 2001
 From: Qu Chen <quchen@amazon.com>
 Date: Fri, 7 Apr 2017 22:31:11 +0000
-Subject: [PATCH 03/19] Implement getKeys procedure for georadius and
+Subject: [PATCH 03/37] Implement getKeys procedure for georadius and
  georadiusbymember commands.
 
 ---
@@ -87,5 +87,5 @@ index 3fa7c3ac..4ca73a25 100644
  /* Cluster */
  void clusterInit(void);
 -- 
-2.13.1
+2.14.0.rc1.383.gd1ce394fe2-goog
 

extern/redis-3.2.8/patch/redis/0004-Test-fix-hopefully-false-PSYNC-failure-like-in-issue.patch

@@ -1,7 +1,7 @@
 From 6a33952b8af18c4c0e778d93a69d97bc2adbc52e Mon Sep 17 00:00:00 2001
 From: antirez <antirez@gmail.com>
 Date: Fri, 14 Apr 2017 17:53:11 +0200
-Subject: [PATCH 04/19] Test: fix, hopefully, false PSYNC failure like in issue
+Subject: [PATCH 04/37] Test: fix, hopefully, false PSYNC failure like in issue
  #2715.
 
 And many other related Github issues... all reporting the same problem.
@@ -26,5 +26,5 @@ index 3a41ceb2..308d63d0 100644
      } $diskless 1
 
 -- 
-2.13.1
+2.14.0.rc1.383.gd1ce394fe2-goog
 

extern/redis-3.2.8/patch/redis/0005-update-block-free-after-some-diff-data-are-written-t.patch

@@ -2,7 +2,7 @@ From d3b499245015b198fb3bd2814453b5852cad3d3f Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?=E5=BC=A0=E6=96=87=E5=BA=B7?=
  <zhangwenkang@zhangwenkangdeMacBook-Pro.local>
 Date: Tue, 18 Apr 2017 20:10:08 +0800
-Subject: [PATCH 05/19] update block->free after some diff data are written to
+Subject: [PATCH 05/37] update block->free after some diff data are written to
  the child process
 
 ---
@@ -22,5 +22,5 @@ index 862b5e13..cbd906c9 100644
          if (block->used == 0) listDelNode(server.aof_rewrite_buf_blocks,ln);
      }
 -- 
-2.13.1
+2.14.0.rc1.383.gd1ce394fe2-goog
 

extern/redis-3.2.8/patch/redis/0006-Fix-3848-by-closing-the-descriptor-on-error.patch

@@ -1,7 +1,7 @@
 From c9c04b11b971bb0598307cf2aafe8954e7785641 Mon Sep 17 00:00:00 2001
 From: antirez <antirez@gmail.com>
 Date: Tue, 18 Apr 2017 16:24:06 +0200
-Subject: [PATCH 06/19] Fix #3848 by closing the descriptor on error.
+Subject: [PATCH 06/37] Fix #3848 by closing the descriptor on error.
 
 ---
  src/anet.c | 3 ++-
@@ -29,5 +29,5 @@ index ef1711d0..e16ce131 100644
  end:
      freeaddrinfo(servinfo);
 -- 
-2.13.1
+2.14.0.rc1.383.gd1ce394fe2-goog
 

extern/redis-3.2.8/patch/redis/0007-Set-lua-time-limit-default-value-at-safe-place.patch

@@ -1,7 +1,7 @@
 From 697d3abeff1563936da2653a8fa8db78d5dff671 Mon Sep 17 00:00:00 2001
 From: antirez <antirez@gmail.com>
 Date: Tue, 11 Apr 2017 16:56:00 +0200
-Subject: [PATCH 07/19] Set lua-time-limit default value at safe place.
+Subject: [PATCH 07/37] Set lua-time-limit default value at safe place.
 
 Otherwise, as it was, it will overwrite whatever the user set.
 
@@ -36,5 +36,5 @@ index 71bcda7d..609f3966 100644
      server.lruclock = getLRUClock();
      resetServerSaveParams();
 -- 
-2.13.1
+2.14.0.rc1.383.gd1ce394fe2-goog
 

extern/redis-3.2.8/patch/redis/0008-Fix-zmalloc_get_memory_size-ifdefs-to-actually-use-t.patch

@@ -1,7 +1,7 @@
 From dd80fedf6fd10556cac7d8318fa4b34fa67a1c81 Mon Sep 17 00:00:00 2001
 From: antirez <antirez@gmail.com>
 Date: Tue, 11 Apr 2017 16:45:08 +0200
-Subject: [PATCH 08/19] Fix zmalloc_get_memory_size() ifdefs to actually use
+Subject: [PATCH 08/37] Fix zmalloc_get_memory_size() ifdefs to actually use
  the else branch.
 
 Close #3927.
@@ -23,5 +23,5 @@ index 640ee19e..d795f448 100644
      return 0L;          /* Unknown OS. */
  #endif
 -- 
-2.13.1
+2.14.0.rc1.383.gd1ce394fe2-goog
 

extern/redis-3.2.8/patch/redis/0009-Fix-preprocessor-if-else-chain-broken-in-order-to-fi.patch

@@ -1,7 +1,7 @@
 From f59b4b93d9211c9888ab044caf2038fa6886424f Mon Sep 17 00:00:00 2001
 From: antirez <antirez@gmail.com>
 Date: Tue, 11 Apr 2017 16:54:27 +0200
-Subject: [PATCH 09/19] Fix preprocessor if/else chain broken in order to fix
+Subject: [PATCH 09/37] Fix preprocessor if/else chain broken in order to fix
  #3927.
 
 ---
@@ -12,16 +12,16 @@ diff --git a/src/zmalloc.c b/src/zmalloc.c
 index d795f448..edfbd570 100644
 --- a/src/zmalloc.c
 +++ b/src/zmalloc.c
-@@ -414,6 +414,9 @@ size_t zmalloc_get_memory_size(void) {
+@@ -413,6 +413,9 @@ size_t zmalloc_get_memory_size(void) {
+     if (sysctl(mib, 2, &size, &len, NULL, 0) == 0)
          return (size_t)size;
      return 0L;          /* Failed? */
- #else
++#else
 +    return 0L;          /* Unknown method to get the data. */
 +#endif
-+#else
+ #else
      return 0L;          /* Unknown OS. */
  #endif
- }
 -- 
-2.13.1
+2.14.0.rc1.383.gd1ce394fe2-goog
 

extern/redis-3.2.8/patch/redis/0010-redis-cli-bigkeys-show-error-when-TYPE-fails.patch

@@ -1,7 +1,7 @@
 From 3b46cf97de6c5d7f2602dda924703db4f87efcc3 Mon Sep 17 00:00:00 2001
 From: antirez <antirez@gmail.com>
 Date: Mon, 15 May 2017 11:22:28 +0200
-Subject: [PATCH 10/19] redis-cli --bigkeys: show error when TYPE fails.
+Subject: [PATCH 10/37] redis-cli --bigkeys: show error when TYPE fails.
 
 Close #3993.
 ---
@@ -29,5 +29,5 @@ index 9c1de0a2..40f91762 100644
          }
 
 -- 
-2.13.1
+2.14.0.rc1.383.gd1ce394fe2-goog
 

extern/redis-3.2.8/patch/redis/0011-Redis-3.2.9.patch

@@ -1,7 +1,7 @@
 From 5116130d42afdaece3de1816174acc69b6d0ccbf Mon Sep 17 00:00:00 2001
 From: antirez <antirez@gmail.com>
 Date: Wed, 17 May 2017 17:39:00 +0200
-Subject: [PATCH 11/19] Redis 3.2.9.
+Subject: [PATCH 11/37] Redis 3.2.9.
 
 ---
  00-RELEASENOTES | 46 ++++++++++++++++++++++++++++++++++++++++++++++
@@ -12,10 +12,11 @@ diff --git a/00-RELEASENOTES b/00-RELEASENOTES
 index ecc04e83..72cfd624 100644
 --- a/00-RELEASENOTES
 +++ b/00-RELEASENOTES
-@@ -11,6 +11,52 @@ CRITICAL: There is a critical bug affecting MOST USERS. Upgrade ASAP.
+@@ -10,6 +10,52 @@ 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 3.2.9     Released Mon May 17 17:35:38 CEST 2017
 +================================================================================
 +
@@ -61,10 +62,9 @@ index ecc04e83..72cfd624 100644
 + Don't leak file descriptor on syncWithMaster().
 + 1 file changed, 2 insertions(+), 1 deletion(-)
 +
-+================================================================================
+ ================================================================================
  Redis 3.2.8     Released Sun Feb 12 16:11:18 CET 2017
  ================================================================================
- 
 diff --git a/src/version.h b/src/version.h
 index d4e33a6d..4d7dbc2e 100644
 --- a/src/version.h
@@ -73,5 +73,5 @@ index d4e33a6d..4d7dbc2e 100644
 -#define REDIS_VERSION "3.2.8"
 +#define REDIS_VERSION "3.2.9"
 -- 
-2.13.1
+2.14.0.rc1.383.gd1ce394fe2-goog
 

extern/redis-3.2.8/patch/redis/0012-fix-Update-create-cluster-README.patch

@@ -1,7 +1,7 @@
 From 373facf81c8bc5ab45629b0043b13aca2a5285c4 Mon Sep 17 00:00:00 2001
 From: Aric Huang <arichuang@gmail.com>
 Date: Fri, 16 Jun 2017 16:10:00 -0700
-Subject: [PATCH 12/19] (fix) Update create-cluster README
+Subject: [PATCH 12/37] (fix) Update create-cluster README
 
 Fix a few typos/adjust wording in `create-cluster` README
 ---
@@ -41,5 +41,5 @@ index 1f43748e..f2a89839 100644
 
  Use the command "./create-cluster help" to get the full list of features.
 -- 
-2.13.1
+2.14.0.rc1.383.gd1ce394fe2-goog
 

extern/redis-3.2.8/patch/redis/0013-cli-Only-print-elapsed-time-on-OUTPUT_STANDARD.patch

@@ -1,7 +1,7 @@
 From 13546adcb9cb83dd021b6f8e068d00f6b0669d20 Mon Sep 17 00:00:00 2001
 From: cbgbt <sean.kelly.2992@gmail.com>
 Date: Thu, 1 Dec 2016 02:33:01 -0800
-Subject: [PATCH 13/19] cli: Only print elapsed time on OUTPUT_STANDARD
+Subject: [PATCH 13/37] cli: Only print elapsed time on OUTPUT_STANDARD
 
 ---
  src/redis-cli.c | 4 +++-
@@ -23,5 +23,5 @@ index 40f91762..3c711402 100644
                      }
                  }
 -- 
-2.13.1
+2.14.0.rc1.383.gd1ce394fe2-goog
 

extern/redis-3.2.8/patch/redis/0014-Fixed-comments-of-slowlog-duration.patch

@@ -1,7 +1,7 @@
 From 8da9a167e08c6cb0ec1e789f322f47ff77128295 Mon Sep 17 00:00:00 2001
 From: xuchengxuan <xuchengxuan@xiaomi.com>
 Date: Wed, 14 Jun 2017 16:42:21 +0800
-Subject: [PATCH 14/19] Fixed comments of slowlog duration
+Subject: [PATCH 14/37] Fixed comments of slowlog duration
 
 ---
  src/slowlog.h | 2 +-
@@ -21,5 +21,5 @@ index 81df0b05..6b8740e8 100644
  } slowlogEntry;
 
 -- 
-2.13.1
+2.14.0.rc1.383.gd1ce394fe2-goog
 

extern/redis-3.2.8/patch/redis/0015-fix-server.stat_net_output_bytes-calc-bug.patch

@@ -1,7 +1,7 @@
 From d70ac1d105ddc72afc32a13a6f1690b47d452335 Mon Sep 17 00:00:00 2001
 From: "minghang.zmh" <minghang.zmh@alibaba-inc.com>
 Date: Fri, 10 Feb 2017 20:13:01 +0800
-Subject: [PATCH 15/19] fix server.stat_net_output_bytes calc bug
+Subject: [PATCH 15/37] fix server.stat_net_output_bytes calc bug
 
 ---
  src/networking.c | 2 +-
@@ -25,5 +25,5 @@ index fb5341ec..c81a1307 100644
          if (errno == EAGAIN) {
              nwritten = 0;
 -- 
-2.13.1
+2.14.0.rc1.383.gd1ce394fe2-goog
 

extern/redis-3.2.8/patch/redis/0016-Fix-set-with-ex-px-option-when-propagated-to-aof.patch

@@ -1,7 +1,7 @@
 From 351663bd7b01caf50d55c3d9aec18151268c9a9e Mon Sep 17 00:00:00 2001
 From: xuzhou <xuzhou1@jd.com>
 Date: Fri, 16 Jun 2017 17:51:38 +0800
-Subject: [PATCH 16/19] Fix set with ex/px option when propagated to aof
+Subject: [PATCH 16/37] Fix set with ex/px option when propagated to aof
 
 ---
  src/aof.c             | 17 +++++++++++++++++
@@ -90,5 +90,5 @@ index 0a50dd31..eddc7c30 100644
 +    }
  }
 -- 
-2.13.1
+2.14.0.rc1.383.gd1ce394fe2-goog
 

extern/redis-3.2.8/patch/redis/0017-redis-benchmark-add-t-hset-target.patch

@@ -1,7 +1,7 @@
 From ad949f23292eba906ec5d35340b09d92f8068078 Mon Sep 17 00:00:00 2001
 From: antirez <antirez@gmail.com>
 Date: Mon, 19 Jun 2017 09:41:11 +0200
-Subject: [PATCH 17/19] redis-benchmark: add -t hset target.
+Subject: [PATCH 17/37] redis-benchmark: add -t hset target.
 
 ---
  src/redis-benchmark.c | 7 +++++++
@@ -26,5 +26,5 @@ index 50905c87..7f560ce7 100644
              len = redisFormatCommand(&cmd,"SPOP myset");
              benchmark("SPOP",cmd,len);
 -- 
-2.13.1
+2.14.0.rc1.383.gd1ce394fe2-goog
 

extern/redis-3.2.8/patch/redis/0018-Optimize-set-command-with-ex-px-when-updating-aof.patch

@@ -1,7 +1,7 @@
 From 2b0f03e4f219a25b06c006e3ee3a4c8da0045d19 Mon Sep 17 00:00:00 2001
 From: xuzhou <xuzhou1@jd.com>
 Date: Thu, 22 Jun 2017 11:06:40 +0800
-Subject: [PATCH 18/19] Optimize set command with ex/px when updating aof.
+Subject: [PATCH 18/37] Optimize set command with ex/px when updating aof.
 
 ---
  src/aof.c | 6 +++---
@@ -32,5 +32,5 @@ index 4a179bd6..ea9ac47a 100644
          }
          serverAssert(!(exarg && pxarg));
 -- 
-2.13.1
+2.14.0.rc1.383.gd1ce394fe2-goog
 

extern/redis-3.2.8/patch/redis/0019-Aesthetic-changes-to-4068-PR-to-conform-to-Redis-cod.patch

@@ -1,7 +1,7 @@
 From d067e3342fefe0be14ce5294a53ea2c76a2a0d04 Mon Sep 17 00:00:00 2001
 From: antirez <antirez@gmail.com>
 Date: Thu, 22 Jun 2017 11:00:21 +0200
-Subject: [PATCH 19/19] Aesthetic changes to #4068 PR to conform to Redis
+Subject: [PATCH 19/37] Aesthetic changes to #4068 PR to conform to Redis
  coding standard.
 
 1. Inline if ... statement if short.
@@ -39,5 +39,5 @@ index ea9ac47a..3b80ca1d 100644
          /* All the other commands don't need translation or need the
           * same translation already operated in the command vector
 -- 
-2.13.1
+2.14.0.rc1.383.gd1ce394fe2-goog
 

extern/redis-3.2.8/patch/redis/0020-Collect-fork-timing-info-only-if-fork-succeeded.patch

@@ -0,0 +1,37 @@
+From 61c78a5215d9e97ea7c743bc6ee9dab8b634068e Mon Sep 17 00:00:00 2001
+From: antirez <antirez@gmail.com>
+Date: Fri, 19 May 2017 11:10:36 +0200
+Subject: [PATCH 20/37] Collect fork() timing info only if fork succeeded.
+
+---
+ src/rdb.c | 7 ++++---
+ 1 file changed, 4 insertions(+), 3 deletions(-)
+
+diff --git a/src/rdb.c b/src/rdb.c
+index da660671..5b4a6cc2 100644
+--- a/src/rdb.c
++++ b/src/rdb.c
+@@ -1690,9 +1690,6 @@ int rdbSaveToSlavesSockets(void) {
+         exitFromChild((retval == C_OK) ? 0 : 1);
+     } else {
+         /* Parent */
+-        server.stat_fork_time = ustime()-start;
+-        server.stat_fork_rate = (double) zmalloc_used_memory() * 1000000 / server.stat_fork_time / (1024*1024*1024); /* GB per second. */
+-        latencyAddSampleIfNeeded("fork",server.stat_fork_time/1000);
+         if (childpid == -1) {
+             serverLog(LL_WARNING,"Can't save in background: fork: %s",
+                 strerror(errno));
+@@ -1715,6 +1712,10 @@ int rdbSaveToSlavesSockets(void) {
+             close(pipefds[0]);
+             close(pipefds[1]);
+         } else {
++            server.stat_fork_time = ustime()-start;
++            server.stat_fork_rate = (double) zmalloc_used_memory() * 1000000 / server.stat_fork_time / (1024*1024*1024); /* GB per second. */
++            latencyAddSampleIfNeeded("fork",server.stat_fork_time/1000);
++
+             serverLog(LL_NOTICE,"Background RDB transfer started by pid %d",
+                 childpid);
+             server.rdb_save_time_start = time(NULL);
+-- 
+2.14.0.rc1.383.gd1ce394fe2-goog
+