1. 21 Jan, 2015 5 commits
    • Matt Stancliff's avatar
      Fix potential invalid read past end of array · 29049507
      Matt Stancliff authored
      If array has N elements, we can't read +1 if we are already at N.
      
      Also, we need to move elements by their storage size in the array,
      not just by individual bytes.
      29049507
    • Matt Stancliff's avatar
      Fix cluster reset memory leak · 30152554
      Matt Stancliff authored
      [maybe] Fixes valgrind errors:
      32 bytes in 4 blocks are definitely lost in loss record 107 of 228
         at 0x80EA447: je_malloc (jemalloc.c:944)
         by 0x806E59C: zrealloc (zmalloc.c:125)
         by 0x80A9AFC: clusterSetMaster (cluster.c:801)
         by 0x80AEDC9: clusterCommand (cluster.c:3994)
         by 0x80682A5: call (redis.c:2049)
         by 0x8068A20: processCommand (redis.c:2309)
         by 0x8076497: processInputBuffer (networking.c:1143)
         by 0x8073BAF: readQueryFromClient (networking.c:1208)
         by 0x8060E98: aeProcessEvents (ae.c:412)
         by 0x806123B: aeMain (ae.c:455)
         by 0x806C3DB: main (redis.c:3832)
      
      64 bytes in 8 blocks are definitely lost in loss record 143 of 228
         at 0x80EA447: je_malloc (jemalloc.c:944)
         by 0x806E59C: zrealloc (zmalloc.c:125)
         by 0x80AAB40: clusterProcessPacket (cluster.c:801)
         by 0x80A847F: clusterReadHandler (cluster.c:1975)
         by 0x30000FF: ???
      
      80 bytes in 10 blocks are definitely lost in loss record 148 of 228
         at 0x80EA447: je_malloc (jemalloc.c:944)
         by 0x806E59C: zrealloc (zmalloc.c:125)
         by 0x80AAB40: clusterProcessPacket (cluster.c:801)
         by 0x80A847F: clusterReadHandler (cluster.c:1975)
         by 0x2FFFFFF: ???
      30152554
    • Matt Stancliff's avatar
      Fix sending uninitialized bytes · 72b8574c
      Matt Stancliff authored
      Fixes valgrind error:
      Syscall param write(buf) points to uninitialised byte(s)
         at 0x514C35D: ??? (syscall-template.S:81)
         by 0x456B81: clusterWriteHandler (cluster.c:1907)
         by 0x41D596: aeProcessEvents (ae.c:416)
         by 0x41D8EA: aeMain (ae.c:455)
         by 0x41A84B: main (redis.c:3832)
       Address 0x5f268e2 is 2,274 bytes inside a block of size 8,192 alloc'd
         at 0x4932D1: je_realloc (jemalloc.c:1297)
         by 0x428185: zrealloc (zmalloc.c:162)
         by 0x4269E0: sdsMakeRoomFor.part.0 (sds.c:142)
         by 0x426CD7: sdscatlen (sds.c:251)
         by 0x4579E7: clusterSendMessage (cluster.c:1995)
         by 0x45805A: clusterSendPing (cluster.c:2140)
         by 0x45BB03: clusterCron (cluster.c:2944)
         by 0x423344: serverCron (redis.c:1239)
         by 0x41D6CD: aeProcessEvents (ae.c:311)
         by 0x41D8EA: aeMain (ae.c:455)
         by 0x41A84B: main (redis.c:3832)
       Uninitialised value was created by a stack allocation
         at 0x457810: nodeUpdateAddressIfNeeded (cluster.c:1236)
      72b8574c
    • antirez's avatar
      Cluster: node deletion cleanup / centralization. · 2601e3e4
      antirez authored
      2601e3e4
    • antirez's avatar
      Cluster: set the slaves->slaveof filed to NULL when master is freed. · 59ad6ac5
      antirez authored
      Related to issue #2289.
      59ad6ac5
  2. 13 Jan, 2015 3 commits
    • antirez's avatar
      Cluster: fetch my IP even if msg is not MEET for the first time. · cf76af6b
      antirez authored
      In order to avoid that misconfigured cluster nodes at some time may
      force an IP update on other nodes, it is required that nodes update
      their own address only on MEET messages. However it does not make sense
      to do this the first time a node is contacted and yet does not have an
      IP, we just risk that myself->ip remains not assigned if there are
      messages lost or cluster creation procedures that don't make sure
      everybody is targeted by at least one incoming MEET message.
      
      Also fix the logging of the IP switch avoiding the :-1 tail.
      cf76af6b
    • antirez's avatar
      Cluster: clusterMsgDataGossip structure, explict padding + minor stuff. · 5b0f4a83
      antirez authored
      Also explicitly set version to 0, add a protocol version define, improve
      comments in the gossip structure.
      
      Note that the structure layout is the same after the change, we are just
      making the padding explicit with an additional not used 16 bits field.
      So this commit is still able to talk with the previous versions of
      cluster nodes.
      5b0f4a83
    • antirez's avatar
      Suppress valgrind error about write sending uninitialized data. · 237ab727
      antirez authored
      Valgrind checks that the buffers we transfer via syscalls are all
      composed of bytes actually initialized. This is useful, it makes we able
      to avoid leaking informations in non initialized parts fo messages
      transferred to other hosts. This commit fixes one of such issues.
      237ab727
  3. 12 Jan, 2015 1 commit
    • antirez's avatar
      Cluster: initialize mf_end. · 6274a678
      antirez authored
      Can't be initialized by resetManualFailover() since it's actual state
      the function uses, so we need to initialize it at startup time. Not
      really a bug in practical terms, but showed up into valgrind and is not
      technically correct anyway.
      6274a678
  4. 23 Dec, 2014 1 commit
  5. 17 Dec, 2014 1 commit
    • Matt Stancliff's avatar
      Cluster: Notify user on accept error · a772747f
      Matt Stancliff authored
      If we woke up to accept a connection, but we can't
      accept it, inform the user of the error going on
      with their networking.
      
      (The previous message was the same for success or error!)
      a772747f
  6. 16 Dec, 2014 1 commit
  7. 15 Dec, 2014 1 commit
  8. 11 Dec, 2014 2 commits
  9. 10 Dec, 2014 1 commit
    • antirez's avatar
      Better read-only behavior for expired keys in slaves. · 06e76bc3
      antirez authored
      Slaves key expire is orchestrated by the master. Sometimes the master
      will send the synthesized DEL to expire keys on the slave with a non
      trivial delay (when the key is not accessed, only the incremental expiry
      algorithm will expire it in background).
      
      During that time, a key is logically expired, but slaves still return
      the key if you GET (or whatever) it. This is a bad behavior.
      
      However we can't simply trust the slave view of the key, since we need
      the master to be able to send write commands to update the slave data
      set, and DELs should only happen when the key is expired in the master
      in order to ensure consistency.
      
      However 99.99% of the issues with this behavior is when a client which
      is not a master sends a read only command. In this case we are safe and
      can consider the key as non existing.
      
      This commit does a few changes in order to make this sane:
      
      1. lookupKeyRead() is modified in order to return NULL if the above
      conditions are met.
      2. Calls to lookupKeyRead() in commands actually writing to the data set
      are repliaced with calls to lookupKeyWrite().
      
      There are redundand checks, so for example, if in "2" something was
      overlooked, we should be still safe, since anyway, when the master
      writes the behavior is to don't care about what expireIfneeded()
      returns.
      
      This commit is related to  #1768, #1770, #2131.
      06e76bc3
  10. 28 Nov, 2014 1 commit
    • antirez's avatar
      Cluster PUBLISH message: fix totlen count. · 669aa2a2
      antirez authored
      bulk_data field size was not removed from the count. It is not possible
      to declare it simply as 'char bulk_data[]' since the structure is nested
      into another structure.
      669aa2a2
  11. 29 Oct, 2014 2 commits
    • Matt Stancliff's avatar
      Networking: add more outbound IP binding fixes · 0014966c
      Matt Stancliff authored
      Same as the original bind fixes (we just missed these the
      first time around).
      
      This helps Redis not automatically send
      connections from the first IP on an interface if we are bound
      to a specific IP address (e.g. with multiple IP aliases on one
      interface, you want to send from _your_ IP, not from the first IP
      on the interface).
      0014966c
    • Matt Stancliff's avatar
      Parse cluster state file in IPv6 compatible way · daca1edb
      Matt Stancliff authored
      We need to pick the port based on the _last_ colon, not the first one.
      daca1edb
  12. 08 Oct, 2014 2 commits
    • antirez's avatar
      Cluster: process gossip section only for known nodes. · 5f6950ca
      antirez authored
      With the exception of nodes sending MEET packets: we have to trust them
      since they can send us MEET packets only when the cluster is initially
      created or because sysadmin manual action.
      5f6950ca
    • antirez's avatar
      Cluster: fix logic to detect we are among a minority. · 36e34a65
      antirez authored
      In the cluster evaluation function we are supposed to set the cluster
      state as "fail" if we are among a minority, however the code was not
      detecting to be into a minority partition if exactly half the masters
      were reachable, which is a minority.
      36e34a65
  13. 07 Oct, 2014 1 commit
  14. 29 Sep, 2014 1 commit
    • Matt Stancliff's avatar
      Clean up text throughout project · 12d0195b
      Matt Stancliff authored
        - Remove trailing newlines from redis.conf
        - Fix comment misspelling
        - Clarifies zipEncodeLength usage and a C API mention (#1243, #1242)
        - Fix cluster typos (inspired by @papanikge #1507)
        - Fix rewite -> rewrite in a few places (inspired by #682)
      
      Closes #1243, #1242, #1507
      12d0195b
  15. 17 Sep, 2014 2 commits
  16. 25 Aug, 2014 1 commit
    • Matt Stancliff's avatar
      Cluster: Fix segfault if cluster config corrupt · 60c448b5
      Matt Stancliff authored
      This commit adds a size check after initial config
      line parsing to make sure we have *at least* 8 arguments
      per line.
      
      Also, instead of asserting for cluster->myself, we just test
      and error out normally (since the error does a hard exit anyway).
      
      Closes #1597
      60c448b5
  17. 18 Aug, 2014 2 commits
  18. 13 Aug, 2014 1 commit
  19. 08 Aug, 2014 3 commits
  20. 25 Jul, 2014 1 commit
    • antirez's avatar
      Cluster: don't migrate to a master that never had slaves. · 0d9bcb1c
      antirez authored
      Replica migration algorithm modified so that slaves never try to migrate
      to masters that were never configured to have slaves in the past.
      We want the algorithm to take care of masters that remained without
      *working* slaves, but that used to have slaves according to the cluster
      configuration.
      0d9bcb1c
  21. 22 Jul, 2014 1 commit
    • antirez's avatar
      CLUSTER RESET: Flush dataset if node is a slave. · 89af4631
      antirez authored
      For non-empty masters, CLUSTER RESET is denied, and the user requires to
      start to reset a node by explicitly clearing it with FLUSHALL.
      However CLUSTER RESET when executed with slaves don't have this
      restrictions since data is just a replica of the master, and with
      read-only slaves it is also not possible to remove the data set. However
      the node was turned from slave to master after a reset, without touching
      the old slave data. This is 99.99% of times not appropriate and forces
      full resets to follow this path to work with both slave and master
      nodes:
      
          FLUSHALL
          CLUSTER RESET HARD
          FLUSHALL
      
      Since we need the first flushall for masters, and the second for slaves.
      
      This commit changes the behavior so that CLUSTER RESET removes the data set
      of a slave node during a reset, in the moment it gets turned into a master,
      so the new pattern is simply:
      
          FLUSHALL (that may fail for slaves)
          CLUSTER RESET
      89af4631
  22. 26 Jun, 2014 1 commit
  23. 25 Jun, 2014 4 commits
    • antirez's avatar
      CLUSTER SLOTS: don't output failing slaves. · 75c57d53
      antirez authored
      While we have to output failing masters in order to provide an accurate
      map (that may be the one of a Redis Cluster in down state because not
      all slots are served by a working master), to provide slaves in FAIL
      state is not a good idea since those are not necesarely needed, and the
      client will likely incur into a latency penalty trying to connect with a
      slave which is down.
      
      Note that this means that CLUSTER SLOTS does not provide a *complete*
      map of slaves, however this would not be of any help since slaves may be
      added later, and a client that needs to scale reads and requires to
      stay updated with the list of slaves, need to do a refresh of the map
      from time to time, anyway.
      75c57d53
    • antirez's avatar
    • Matt Stancliff's avatar
      Cluster: Add CLUSTER SLOTS command · e14829de
      Matt Stancliff authored
      CLUSTER SLOTS returns a Redis-formatted mapping from
      slot ranges to IP/Port pairs serving that slot range.
      
      The outer return elements group return values by slot ranges.
      
      The first two entires in each result are the min and max slots for the range.
      
      The third entry in each result is guaranteed to be either
      an IP/Port of the master for that slot range - OR - null
      if that slot range, for some reason, has no master
      
      The 4th and higher entries in each result are replica instances
      for the slot range.
      
      Output comparison:
      127.0.0.1:7001> cluster nodes
      f853501ec8ae1618df0e0f0e86fd7abcfca36207 127.0.0.1:7001 myself,master - 0 0 2 connected 4096-8191
      5a2caa782042187277647661ffc5da739b3e0805 127.0.0.1:7005 slave f853501ec8ae1618df0e0f0e86fd7abcfca36207 0 1402622415859 6 connected
      6c70b49813e2ffc9dd4b8ec1e108276566fcf59f 127.0.0.1:7007 slave 26f4729ca0a5a992822667fc16b5220b13368f32 0 1402622415357 8 connected
      2bd5a0e3bb7afb2b56a2120d3fef2f2e4333de1d 127.0.0.1:7006 slave 32adf4b8474fdc938189dba00dc8ed60ce635b0f 0 1402622419373 7 connected
      5a9450e8279df36ff8e6bb1c139ce4d5268d1390 127.0.0.1:7000 master - 0 1402622418872 1 connected 0-4095
      32adf4b8474fdc938189dba00dc8ed60ce635b0f 127.0.0.1:7002 master - 0 1402622419874 3 connected 8192-12287
      5db7d05c245267afdfe48c83e7de899348d2bdb6 127.0.0.1:7004 slave 5a9450e8279df36ff8e6bb1c139ce4d5268d1390 0 1402622417867 5 connected
      26f4729ca0a5a992822667fc16b5220b13368f32 127.0.0.1:7003 master - 0 1402622420877 4 connected 12288-16383
      
      127.0.0.1:7001> cluster slots
      1) 1) (integer) 0
         2) (integer) 4095
         3) 1) "127.0.0.1"
            2) (integer) 7000
         4) 1) "127.0.0.1"
            2) (integer) 7004
      2) 1) (integer) 12288
         2) (integer) 16383
         3) 1) "127.0.0.1"
            2) (integer) 7003
         4) 1) "127.0.0.1"
            2) (integer) 7007
      3) 1) (integer) 4096
         2) (integer) 8191
         3) 1) "127.0.0.1"
            2) (integer) 7001
         4) 1) "127.0.0.1"
            2) (integer) 7005
      4) 1) (integer) 8192
         2) (integer) 12287
         3) 1) "127.0.0.1"
            2) (integer) 7002
         4) 1) "127.0.0.1"
            2) (integer) 7006
      e14829de
    • antirez's avatar
      Cluster: myself->ip autodiscovery. · f29b12d0
      antirez authored
      Instead of having an hardcoded IP address in the node configuration, we
      autodiscover it via MEET messages for automatic update when the node is
      restarted with a different IP address.
      
      This mechanism was discussed in the context of PR #1782.
      f29b12d0
  24. 23 Jun, 2014 1 commit