1. 26 Jan, 2016 5 commits
    • antirez's avatar
      Fix merge conflicts from 3.2. · 13f48d8d
      antirez authored
      13f48d8d
    • antirez's avatar
      4d62a82b
    • antirez's avatar
    • antirez's avatar
      Better address udpate strategy when processing gossip sections. · 025f936c
      antirez authored
      The change covers the case where:
      
      1. There is a node we can't reach (in fail or pfail state).
      2. We see a different address for this node, in the gossip section sent
      to us by a node that, instead, is able to talk with the node we cannot
      talk to.
      
      In this case it's a good bet to switch to the address reported by this
      node, since there was an address switch and it is able to talk with the
      node and we are not.
      
      However previosuly this was done in a dangerous way, by initiating an
      handshake. The handshake, using the MEET packet, forces the receiver to
      join our cluster, and this is not a good idea. If the node in question
      really just switched address, but is the same node, it already knows about
      us, so we just need to perform an address update and a reconnection.
      
      So with this commit instead we just update the address of the node,
      release the node link if any, and attempt to reconnect in the next
      clusterCron() cycle.
      
      The commit also improves debugging messages printed by Cluster during
      address or ID switches.
      025f936c
    • antirez's avatar
      5d9a5335
  2. 25 Jan, 2016 17 commits
  3. 19 Jan, 2016 1 commit
  4. 08 Jan, 2016 3 commits
    • antirez's avatar
      Scripting: handle trailing comments. · e50b9a07
      antirez authored
      This fix, provided by Paul Kulchenko (@pkulchenko), allows the Lua
      scripting engine to evaluate statements with a trailing comment like the
      following one:
      
          EVAL "print() --comment" 0
      
      Lua can't parse the above if the string does not end with a newline, so
      now a final newline is always added automatically. This does not change
      the SHA1 of scripts since the SHA1 is computed on the body we pass to
      EVAL, without the other code we add to register the function.
      
      Close #2951.
      e50b9a07
    • antirez's avatar
      Allow MIGRATE to always be called on local keys for open slots. · e9abc944
      antirez authored
      Extend the MIGRATE extra freedom to be able to be called in the context
      of the local slot, anytime there is a slot open in one or the other
      direction (importing or migrating). This is useful for redis-trib to fix
      the cluster when it has in an odd state.
      
      Thix fix allows "redis-trib fix" to make its work in certain cases where
      previously an error was reported.
      e9abc944
    • antirez's avatar
  5. 06 Jan, 2016 1 commit
    • antirez's avatar
      Cluster: don't send -ASK to MIGRATE. · 319a4c04
      antirez authored
      For non existing keys, we don't want to send -ASK redirections to
      MIGRATE, since when moving slots from the migrating node to the
      importing node, we want just to ignore keys that are no longer there.
      They may be expired or deleted between the GETKEYSINSLOT call and the
      MIGRATE call. Otherwise this causes an error during migrations with
      redis-trib (or equivalent cluster management tools).
      319a4c04
  6. 02 Jan, 2016 2 commits
  7. 18 Dec, 2015 11 commits