update build

lecterqian · Apr 17, 2015 · 87e350a · 87e350a
1 parent 53d787d
commit 87e350a
Show file tree

Hide file tree

Showing 187 changed files with 243 additions and 202 deletions.
diff --git a/_sources/topic/replication.txt b/_sources/topic/replication.txt
@@ -49,6 +49,30 @@ Redis 支持简单且易用的主从复制（master-slave replication）功能
   然后由从服务器去执行持久化操作即可。
 
 
+关闭主服务器持久化时，复制功能的数据安全
+----------------------------------------------------
+
+当配置Redis复制功能时，强烈建议打开主服务器的持久化功能。
+否则的话，由于延迟等问题，部署的服务应该要避免自动拉起。
+
+为了帮助理解主服务器关闭持久化时自动拉起的危险性，参考一下以下会导致主从服务器数据全部丢失的例子：
+
+1. 假设节点A为主服务器，并且关闭了持久化。
+并且节点B和节点C从节点A复制数据
+
+2. 节点A崩溃，然后由自动拉起服务重启了节点A.
+由于节点A的持久化被关闭了，所以重启之后没有任何数据
+
+3. 节点B和节点C将从节点A复制数据，但是A的数据是空的，
+于是就把自身保存的数据副本删除。
+
+
+在关闭主服务器上的持久化，并同时开启自动拉起进程的情况下，即便使用Sentinel来实现Redis的高可用性，也是非常危险的。
+因为主服务器可能拉起得非常快，以至于Sentinel在配置的心跳时间间隔内没有检测到主服务器已被重启，然后还是会执行上面的数据丢失的流程。
+
+无论何时，数据安全都是极其重要的，所以应该禁止主服务器关闭持久化的同时自动拉起。
+
+
 复制功能的运作原理
 -------------------------------
 

diff --git a/change_log.html b/change_log.html
@@ -165,7 +165,7 @@ <h3>Navigation</h3>
     </div>
     <div class="footer">
         &copy; Copyright 2013, Redis.
-      Last updated on Apr 16, 2015.
+      Last updated on Apr 17, 2015.
       Created using <a href="http://sphinx.pocoo.org/">Sphinx</a> 1.3b1.
     </div>
   </body>

diff --git a/connection/auth.html b/connection/auth.html
@@ -176,7 +176,7 @@ <h3>Navigation</h3>
     </div>
     <div class="footer">
         &copy; Copyright 2013, Redis.
-      Last updated on Apr 16, 2015.
+      Last updated on Apr 17, 2015.
       Created using <a href="http://sphinx.pocoo.org/">Sphinx</a> 1.3b1.
     </div>
   </body>

diff --git a/connection/echo.html b/connection/echo.html
@@ -141,7 +141,7 @@ <h3>Navigation</h3>
     </div>
     <div class="footer">
         &copy; Copyright 2013, Redis.
-      Last updated on Apr 16, 2015.
+      Last updated on Apr 17, 2015.
       Created using <a href="http://sphinx.pocoo.org/">Sphinx</a> 1.3b1.
     </div>
   </body>

diff --git a/connection/index.html b/connection/index.html
@@ -130,7 +130,7 @@ <h3>Navigation</h3>
     </div>
     <div class="footer">
         &copy; Copyright 2013, Redis.
-      Last updated on Apr 16, 2015.
+      Last updated on Apr 17, 2015.
       Created using <a href="http://sphinx.pocoo.org/">Sphinx</a> 1.3b1.
     </div>
   </body>

diff --git a/connection/ping.html b/connection/ping.html
@@ -146,7 +146,7 @@ <h3>Navigation</h3>
     </div>
     <div class="footer">
         &copy; Copyright 2013, Redis.
-      Last updated on Apr 16, 2015.
+      Last updated on Apr 17, 2015.
       Created using <a href="http://sphinx.pocoo.org/">Sphinx</a> 1.3b1.
     </div>
   </body>

diff --git a/connection/quit.html b/connection/quit.html
@@ -142,7 +142,7 @@ <h3>Navigation</h3>
     </div>
     <div class="footer">
         &copy; Copyright 2013, Redis.
-      Last updated on Apr 16, 2015.
+      Last updated on Apr 17, 2015.
       Created using <a href="http://sphinx.pocoo.org/">Sphinx</a> 1.3b1.
     </div>
   </body>

diff --git a/connection/select.html b/connection/select.html
@@ -156,7 +156,7 @@ <h3>Navigation</h3>
     </div>
     <div class="footer">
         &copy; Copyright 2013, Redis.
-      Last updated on Apr 16, 2015.
+      Last updated on Apr 17, 2015.
       Created using <a href="http://sphinx.pocoo.org/">Sphinx</a> 1.3b1.
     </div>
   </body>

diff --git a/der/README.html b/der/README.html
@@ -166,7 +166,7 @@ <h3>Navigation</h3>
     </div>
     <div class="footer">
         &copy; Copyright 2013, Redis.
-      Last updated on Apr 16, 2015.
+      Last updated on Apr 17, 2015.
       Created using <a href="http://sphinx.pocoo.org/">Sphinx</a> 1.3b1.
     </div>
   </body>

diff --git a/ebookindex.html b/ebookindex.html
@@ -277,11 +277,12 @@ <h1>Redis 命令参考<a class="headerlink" href="#redis" title="Permalink to th
 </ul>
 </li>
 <li class="toctree-l1"><a class="reference internal" href="topic/replication.html">复制（Replication）</a><ul>
-<li class="toctree-l2"><a class="reference internal" href="topic/replication.html#id1">复制功能的运作原理</a></li>
-<li class="toctree-l2"><a class="reference internal" href="topic/replication.html#id2">部分重同步</a></li>
-<li class="toctree-l2"><a class="reference internal" href="topic/replication.html#id3">配置</a></li>
-<li class="toctree-l2"><a class="reference internal" href="topic/replication.html#id4">只读从服务器</a></li>
-<li class="toctree-l2"><a class="reference internal" href="topic/replication.html#id5">从服务器相关配置</a></li>
+<li class="toctree-l2"><a class="reference internal" href="topic/replication.html#id1">关闭主服务器持久化时，复制功能的数据安全</a></li>
+<li class="toctree-l2"><a class="reference internal" href="topic/replication.html#id2">复制功能的运作原理</a></li>
+<li class="toctree-l2"><a class="reference internal" href="topic/replication.html#id3">部分重同步</a></li>
+<li class="toctree-l2"><a class="reference internal" href="topic/replication.html#id4">配置</a></li>
+<li class="toctree-l2"><a class="reference internal" href="topic/replication.html#id5">只读从服务器</a></li>
+<li class="toctree-l2"><a class="reference internal" href="topic/replication.html#id6">从服务器相关配置</a></li>
 <li class="toctree-l2"><a class="reference internal" href="topic/replication.html#n">主服务器只在有至少 N 个从服务器的情况下，才执行写操作</a></li>
 </ul>
 </li>

diff --git a/hash/hdel.html b/hash/hdel.html
@@ -173,7 +173,7 @@ <h3>Navigation</h3>
     </div>
     <div class="footer">
         &copy; Copyright 2013, Redis.
-      Last updated on Apr 16, 2015.
+      Last updated on Apr 17, 2015.
       Created using <a href="http://sphinx.pocoo.org/">Sphinx</a> 1.3b1.
     </div>
   </body>

diff --git a/hash/hexists.html b/hash/hexists.html
@@ -148,7 +148,7 @@ <h3>Navigation</h3>
     </div>
     <div class="footer">
         &copy; Copyright 2013, Redis.
-      Last updated on Apr 16, 2015.
+      Last updated on Apr 17, 2015.
       Created using <a href="http://sphinx.pocoo.org/">Sphinx</a> 1.3b1.
     </div>
   </body>

diff --git a/hash/hget.html b/hash/hget.html
@@ -153,7 +153,7 @@ <h3>Navigation</h3>
     </div>
     <div class="footer">
         &copy; Copyright 2013, Redis.
-      Last updated on Apr 16, 2015.
+      Last updated on Apr 17, 2015.
       Created using <a href="http://sphinx.pocoo.org/">Sphinx</a> 1.3b1.
     </div>
   </body>

diff --git a/hash/hgetall.html b/hash/hgetall.html
@@ -152,7 +152,7 @@ <h3>Navigation</h3>
     </div>
     <div class="footer">
         &copy; Copyright 2013, Redis.
-      Last updated on Apr 16, 2015.
+      Last updated on Apr 17, 2015.
       Created using <a href="http://sphinx.pocoo.org/">Sphinx</a> 1.3b1.
     </div>
   </body>

diff --git a/hash/hincrby.html b/hash/hincrby.html
@@ -178,7 +178,7 @@ <h3>Navigation</h3>
     </div>
     <div class="footer">
         &copy; Copyright 2013, Redis.
-      Last updated on Apr 16, 2015.
+      Last updated on Apr 17, 2015.
       Created using <a href="http://sphinx.pocoo.org/">Sphinx</a> 1.3b1.
     </div>
   </body>

diff --git a/hash/hincrbyfloat.html b/hash/hincrbyfloat.html
@@ -183,7 +183,7 @@ <h3>Navigation</h3>
     </div>
     <div class="footer">
         &copy; Copyright 2013, Redis.
-      Last updated on Apr 16, 2015.
+      Last updated on Apr 17, 2015.
       Created using <a href="http://sphinx.pocoo.org/">Sphinx</a> 1.3b1.
     </div>
   </body>

diff --git a/hash/hkeys.html b/hash/hkeys.html
@@ -157,7 +157,7 @@ <h3>Navigation</h3>
     </div>
     <div class="footer">
         &copy; Copyright 2013, Redis.
-      Last updated on Apr 16, 2015.
+      Last updated on Apr 17, 2015.
       Created using <a href="http://sphinx.pocoo.org/">Sphinx</a> 1.3b1.
     </div>
   </body>

diff --git a/hash/hlen.html b/hash/hlen.html
@@ -152,7 +152,7 @@ <h3>Navigation</h3>
     </div>
     <div class="footer">
         &copy; Copyright 2013, Redis.
-      Last updated on Apr 16, 2015.
+      Last updated on Apr 17, 2015.
       Created using <a href="http://sphinx.pocoo.org/">Sphinx</a> 1.3b1.
     </div>
   </body>

diff --git a/hash/hmget.html b/hash/hmget.html
@@ -145,7 +145,7 @@ <h3>Navigation</h3>
     </div>
     <div class="footer">
         &copy; Copyright 2013, Redis.
-      Last updated on Apr 16, 2015.
+      Last updated on Apr 17, 2015.
       Created using <a href="http://sphinx.pocoo.org/">Sphinx</a> 1.3b1.
     </div>
   </body>

diff --git a/hash/hmset.html b/hash/hmset.html
@@ -150,7 +150,7 @@ <h3>Navigation</h3>
     </div>
     <div class="footer">
         &copy; Copyright 2013, Redis.
-      Last updated on Apr 16, 2015.
+      Last updated on Apr 17, 2015.
       Created using <a href="http://sphinx.pocoo.org/">Sphinx</a> 1.3b1.
     </div>
   </body>

diff --git a/hash/hscan.html b/hash/hscan.html
@@ -126,7 +126,7 @@ <h3>Navigation</h3>
     </div>
     <div class="footer">
         &copy; Copyright 2013, Redis.
-      Last updated on Apr 16, 2015.
+      Last updated on Apr 17, 2015.
       Created using <a href="http://sphinx.pocoo.org/">Sphinx</a> 1.3b1.
     </div>
   </body>

diff --git a/hash/hset.html b/hash/hset.html
@@ -147,7 +147,7 @@ <h3>Navigation</h3>
     </div>
     <div class="footer">
         &copy; Copyright 2013, Redis.
-      Last updated on Apr 16, 2015.
+      Last updated on Apr 17, 2015.
       Created using <a href="http://sphinx.pocoo.org/">Sphinx</a> 1.3b1.
     </div>
   </body>

diff --git a/hash/hsetnx.html b/hash/hsetnx.html
@@ -147,7 +147,7 @@ <h3>Navigation</h3>
     </div>
     <div class="footer">
         &copy; Copyright 2013, Redis.
-      Last updated on Apr 16, 2015.
+      Last updated on Apr 17, 2015.
       Created using <a href="http://sphinx.pocoo.org/">Sphinx</a> 1.3b1.
     </div>
   </body>

diff --git a/hash/hvals.html b/hash/hvals.html
@@ -157,7 +157,7 @@ <h3>Navigation</h3>
     </div>
     <div class="footer">
         &copy; Copyright 2013, Redis.
-      Last updated on Apr 16, 2015.
+      Last updated on Apr 17, 2015.
       Created using <a href="http://sphinx.pocoo.org/">Sphinx</a> 1.3b1.
     </div>
   </body>

diff --git a/hash/index.html b/hash/index.html
@@ -139,7 +139,7 @@ <h3>Navigation</h3>
     </div>
     <div class="footer">
         &copy; Copyright 2013, Redis.
-      Last updated on Apr 16, 2015.
+      Last updated on Apr 17, 2015.
       Created using <a href="http://sphinx.pocoo.org/">Sphinx</a> 1.3b1.
     </div>
   </body>

diff --git a/hyperloglog/index.html b/hyperloglog/index.html
@@ -128,7 +128,7 @@ <h3>Navigation</h3>
     </div>
     <div class="footer">
         &copy; Copyright 2013, Redis.
-      Last updated on Apr 16, 2015.
+      Last updated on Apr 17, 2015.
       Created using <a href="http://sphinx.pocoo.org/">Sphinx</a> 1.3b1.
     </div>
   </body>

diff --git a/hyperloglog/pfadd.html b/hyperloglog/pfadd.html
@@ -175,7 +175,7 @@ <h3>Navigation</h3>
     </div>
     <div class="footer">
         &copy; Copyright 2013, Redis.
-      Last updated on Apr 16, 2015.
+      Last updated on Apr 17, 2015.
       Created using <a href="http://sphinx.pocoo.org/">Sphinx</a> 1.3b1.
     </div>
   </body>

diff --git a/hyperloglog/pfcount.html b/hyperloglog/pfcount.html
@@ -177,7 +177,7 @@ <h3>Navigation</h3>
     </div>
     <div class="footer">
         &copy; Copyright 2013, Redis.
-      Last updated on Apr 16, 2015.
+      Last updated on Apr 17, 2015.
       Created using <a href="http://sphinx.pocoo.org/">Sphinx</a> 1.3b1.
     </div>
   </body>

diff --git a/hyperloglog/pfmerge.html b/hyperloglog/pfmerge.html
@@ -156,7 +156,7 @@ <h3>Navigation</h3>
     </div>
     <div class="footer">
         &copy; Copyright 2013, Redis.
-      Last updated on Apr 16, 2015.
+      Last updated on Apr 17, 2015.
       Created using <a href="http://sphinx.pocoo.org/">Sphinx</a> 1.3b1.
     </div>
   </body>

diff --git a/index.html b/index.html
@@ -407,11 +407,12 @@ <h2>文档<a class="headerlink" href="#id1" title="Permalink to this headline">
 <tr class="row-even"><td><div class="toctree-wrapper first last compound">
 <ul>
 <li class="toctree-l1"><a class="reference internal" href="topic/replication.html">复制（Replication）</a><ul>
-<li class="toctree-l2"><a class="reference internal" href="topic/replication.html#id1">复制功能的运作原理</a></li>
-<li class="toctree-l2"><a class="reference internal" href="topic/replication.html#id2">部分重同步</a></li>
-<li class="toctree-l2"><a class="reference internal" href="topic/replication.html#id3">配置</a></li>
-<li class="toctree-l2"><a class="reference internal" href="topic/replication.html#id4">只读从服务器</a></li>
-<li class="toctree-l2"><a class="reference internal" href="topic/replication.html#id5">从服务器相关配置</a></li>
+<li class="toctree-l2"><a class="reference internal" href="topic/replication.html#id1">关闭主服务器持久化时，复制功能的数据安全</a></li>
+<li class="toctree-l2"><a class="reference internal" href="topic/replication.html#id2">复制功能的运作原理</a></li>
+<li class="toctree-l2"><a class="reference internal" href="topic/replication.html#id3">部分重同步</a></li>
+<li class="toctree-l2"><a class="reference internal" href="topic/replication.html#id4">配置</a></li>
+<li class="toctree-l2"><a class="reference internal" href="topic/replication.html#id5">只读从服务器</a></li>
+<li class="toctree-l2"><a class="reference internal" href="topic/replication.html#id6">从服务器相关配置</a></li>
 <li class="toctree-l2"><a class="reference internal" href="topic/replication.html#n">主服务器只在有至少 N 个从服务器的情况下，才执行写操作</a></li>
 </ul>
 </li>

diff --git a/key/del.html b/key/del.html
@@ -175,7 +175,7 @@ <h3>Navigation</h3>
     </div>
     <div class="footer">
         &copy; Copyright 2013, Redis.
-      Last updated on Apr 16, 2015.
+      Last updated on Apr 17, 2015.
       Created using <a href="http://sphinx.pocoo.org/">Sphinx</a> 1.3b1.
     </div>
   </body>

diff --git a/key/dump.html b/key/dump.html
@@ -159,7 +159,7 @@ <h3>Navigation</h3>
     </div>
     <div class="footer">
         &copy; Copyright 2013, Redis.
-      Last updated on Apr 16, 2015.
+      Last updated on Apr 17, 2015.
       Created using <a href="http://sphinx.pocoo.org/">Sphinx</a> 1.3b1.
     </div>
   </body>

diff --git a/key/exists.html b/key/exists.html
@@ -147,7 +147,7 @@ <h3>Navigation</h3>
     </div>
     <div class="footer">
         &copy; Copyright 2013, Redis.
-      Last updated on Apr 16, 2015.
+      Last updated on Apr 17, 2015.
       Created using <a href="http://sphinx.pocoo.org/">Sphinx</a> 1.3b1.
     </div>
   </body>

diff --git a/key/expire.html b/key/expire.html
@@ -178,7 +178,7 @@ <h3>Navigation</h3>
     </div>
     <div class="footer">
         &copy; Copyright 2013, Redis.
-      Last updated on Apr 16, 2015.
+      Last updated on Apr 17, 2015.
       Created using <a href="http://sphinx.pocoo.org/">Sphinx</a> 1.3b1.
     </div>
   </body>

diff --git a/key/expireat.html b/key/expireat.html
@@ -149,7 +149,7 @@ <h3>Navigation</h3>
     </div>
     <div class="footer">
         &copy; Copyright 2013, Redis.
-      Last updated on Apr 16, 2015.
+      Last updated on Apr 17, 2015.
       Created using <a href="http://sphinx.pocoo.org/">Sphinx</a> 1.3b1.
     </div>
   </body>

diff --git a/key/index.html b/key/index.html
@@ -170,7 +170,7 @@ <h3>Navigation</h3>
     </div>
     <div class="footer">
         &copy; Copyright 2013, Redis.
-      Last updated on Apr 16, 2015.
+      Last updated on Apr 17, 2015.
       Created using <a href="http://sphinx.pocoo.org/">Sphinx</a> 1.3b1.
     </div>
   </body>

diff --git a/key/keys.html b/key/keys.html
@@ -166,7 +166,7 @@ <h3>Navigation</h3>
     </div>
     <div class="footer">
         &copy; Copyright 2013, Redis.
-      Last updated on Apr 16, 2015.
+      Last updated on Apr 17, 2015.
       Created using <a href="http://sphinx.pocoo.org/">Sphinx</a> 1.3b1.
     </div>
   </body>

diff --git a/key/migrate.html b/key/migrate.html
@@ -192,7 +192,7 @@ <h3>Navigation</h3>
     </div>
     <div class="footer">
         &copy; Copyright 2013, Redis.
-      Last updated on Apr 16, 2015.
+      Last updated on Apr 17, 2015.
       Created using <a href="http://sphinx.pocoo.org/">Sphinx</a> 1.3b1.
     </div>
   </body>

diff --git a/key/move.html b/key/move.html
@@ -200,7 +200,7 @@ <h3>Navigation</h3>
     </div>
     <div class="footer">
         &copy; Copyright 2013, Redis.
-      Last updated on Apr 16, 2015.
+      Last updated on Apr 17, 2015.
       Created using <a href="http://sphinx.pocoo.org/">Sphinx</a> 1.3b1.
     </div>
   </body>

diff --git a/key/object.html b/key/object.html
@@ -192,7 +192,7 @@ <h3>Navigation</h3>
     </div>
     <div class="footer">
         &copy; Copyright 2013, Redis.
-      Last updated on Apr 16, 2015.
+      Last updated on Apr 17, 2015.
       Created using <a href="http://sphinx.pocoo.org/">Sphinx</a> 1.3b1.
     </div>
   </body>