1. 18 Oct, 2012 1 commit
    • NanXiao's avatar
      Update src/redis-benchmark.c · a03c3270
      NanXiao authored
      The code of current implementation:
      
      if (c->pending == 0) clientDone(c);
      In clientDone function, the c's memory has been freed, then the loop will continue: while(c->pending). The memory of c has been freed now, so c->pending is invalid (c is an invalid pointer now), and this will cause memory dump in some platforams(eg: Solaris).
      
      So I think the code should be modified as:
      if (c->pending == 0)
      {
      clientDone(c);
      break;
      }
      and this will not lead to while(c->pending).
      a03c3270
  2. 16 Oct, 2012 1 commit
    • antirez's avatar
      Fix MULTI / EXEC rendering in MONITOR output. · 21645232
      antirez authored
      Before of this commit it used to be like this:
      
      MULTI
      EXEC
      ... actual commands of the transaction ...
      
      Because after all that is the natural order of things. Transaction
      commands are queued and executed *only after* EXEC is called.
      
      However this makes debugging with MONITOR a mess, so the code was
      modified to provide a coherent output.
      
      What happens is that MULTI is rendered in the MONITOR output as far as
      possible, instead EXEC is propagated only after the transaction is
      executed, or even in the case it fails because of WATCH, so in this case
      you'll simply see:
      
      MULTI
      EXEC
      
      An empty transaction.
      21645232
  3. 11 Oct, 2012 2 commits
  4. 06 Oct, 2012 1 commit
  5. 05 Oct, 2012 5 commits
    • antirez's avatar
      Redis 2.6.0 RC8 (2.5.14) · 500dddc2
      antirez authored
      500dddc2
    • Salvatore Sanfilippo's avatar
      Merge pull request #544 from dvirsky/2.6 · a6305f13
      Salvatore Sanfilippo authored
      fixed install script to rewrite the default config
      a6305f13
    • antirez's avatar
      Hash function switched to murmurhash2. · 99c3338c
      antirez authored
      The previously used hash function, djbhash, is not secure against
      collision attacks even when the seed is randomized as there are simple
      ways to find seed-independent collisions.
      
      The new hash function appears to be safe (or much harder to exploit at
      least) in this case, and has better distribution.
      
      Better distribution does not always means that's better. For instance in
      a fast benchmark with "DEBUG POPULATE 1000000" I obtained the following
      results:
      
          1.6 seconds with djbhash
          2.0 seconds with murmurhash2
      
      This is due to the fact that djbhash will hash objects that follow the
      pattern `prefix:<id>` and where the id is numerically near, to near
      buckets. This improves the locality.
      
      However in other access patterns with keys that have no relation
      murmurhash2 has some (apparently minimal) speed advantage.
      
      On the other hand a better distribution should significantly
      improve the quality of the distribution of elements returned with
      dictGetRandomKey() that is used in SPOP, SRANDMEMBER, RANDOMKEY, and
      other commands.
      
      Everything considered, and under the suspect that this commit fixes a
      security issue in Redis, we are switching to the new hash function.
      If some serious speed regression will be found in the future we'll be able
      to step back easiliy.
      
      This commit fixes issue #663.
      99c3338c
    • antirez's avatar
      Warn when configured maxmemory value seems odd. · 05e06e15
      antirez authored
      This commit warns the user with a log at "warning" level if:
      
      1) After the server startup the maxmemory limit was found to be < 1MB.
      2) After a CONFIG SET command modifying the maxmemory setting the limit
      is set to a value that is smaller than the currently used memory.
      
      The behaviour of the Redis server is unmodified, and this wil not make
      the CONFIG SET command or a wrong configuration in redis.conf less
      likely to create problems, but at least this will make aware most users
      about a possbile error they committed without resorting to external
      help.
      
      However no warning is issued if, as a result of loading the AOF or RDB
      file, we are very near the maxmemory setting, or key eviction will be
      needed in order to go under the specified maxmemory setting. The reason
      is that in servers configured as a cache with an aggressive
      maxmemory-policy most of the times restarting the server will cause this
      condition to happen if persistence is not switched off.
      
      This fixes issue #429.
      05e06e15
    • antirez's avatar
      Include time.h in ae.c as we now use time(). · e2f2dab3
      antirez authored
      e2f2dab3
  6. 04 Oct, 2012 2 commits
    • Jokea's avatar
      Force expire all timer events when system clock skew is detected. · e480c279
      Jokea authored
      When system time changes back, the timer will not worker properly
      hence some core functionality of redis will stop working(e.g. replication,
      bgsave, etc). See issue #633 for details.
      
      The patch saves the previous time and when a system clock skew is detected,
      it will force expire all timers.
      
      Modiifed by @antirez: the previous time was moved into the eventLoop
      structure to make sure the library is still thread safe as long as you
      use different event loops into different threads (otherwise you need
      some synchronization). More comments added about the reasoning at the
      base of the patch, that's worth reporting here:
      
      /* If the system clock is moved to the future, and then set back to the
       * right value, time events may be delayed in a random way. Often this
       * means that scheduled operations will not be performed soon enough.
       *
       * Here we try to detect system clock skews, and force all the time
       * events to be processed ASAP when this happens: the idea is that
       * processing events earlier is less dangerous than delaying them
       * indefinitely, and practice suggests it is. */
      e480c279
    • antirez's avatar
      "Timeout receiving bulk data" error message modified. · 0c19880c
      antirez authored
      The new message now contains an hint about modifying the repl-timeout
      configuration directive if the problem persists.
      
      This should normally not be needed, because while the master generates
      the RDB file it makes sure to send newlines to the replication channel
      to prevent timeouts. However there are times when masters running on
      very slow systems can completely stop for seconds during the RDB saving
      process. In such a case enlarging the timeout value can fix the problem.
      
      See issue #695 for an example of this problem in an EC2 deployment.
      0c19880c
  7. 03 Oct, 2012 1 commit
    • antirez's avatar
      "SORT by nosort" (skip sorting) respect sorted set ordering. · 2ba96271
      antirez authored
      When SORT is called with the option BY set to a string constant not
      inclduing the wildcard character "*", there is no way to sort the output
      so any ordering is valid. This allows the SORT internals to optimize its
      work and don't really sort the output at all.
      
      However it was odd that this option was not able to retain the natural
      order of a sorted set. This feature was requested by users multiple
      times as sometimes to call SORT with GET against sorted sets as a way to
      mass-fetch objects can be handy.
      
      This commit introduces two things:
      
      1) The ability of SORT to return sorted sets elements in their natural
      ordering when `BY nosort` is specified, accordingly to `DESC / ASC` options.
      2) The ability of SORT to optimize this case further if LIMIT is passed
      as well, avoiding to really fetch the whole sorted set, but directly
      obtaining the specified range.
      
      Because in this case the sorting is always deterministic, no
      post-sorting activity is performed when SORT is called from a Lua
      script.
      
      This commit fixes issue #98.
      2ba96271
  8. 01 Oct, 2012 1 commit
  9. 28 Sep, 2012 2 commits
    • antirez's avatar
      Scripting: add helper functions redis.error_reply() and redis.status_reply(). · f1466e11
      antirez authored
      A previous commit introduced Redis.NIL. This commit adds similar helper
      functions to return tables with a single field set to the specified
      string so that instead of using 'return {err="My Error"}' it is possible
      to use a more idiomatic form:
      
          return redis.error_reply("My Error")
          return redis.status_reply("OK")
      f1466e11
    • antirez's avatar
      Scripting: redis.NIL to return nil bulk replies. · e061d797
      antirez authored
      Lua arrays can't contain nil elements (see
      http://www.lua.org/pil/19.1.html for more information), so Lua scripts
      were not able to return a multi-bulk reply containing nil bulk
      elements inside.
      
      This commit introduces a special conversion: a table with just
      a "nilbulk" field set to a boolean value is converted by Redis as a nil
      bulk reply, but at the same time for Lua this type is not a "nil" so can
      be used inside Lua arrays.
      
      This type is also assigned to redis.NIL, so the following two forms
      are equivalent and will be able to return a nil bulk reply as second
      element of a three elements array:
      
          EVAL "return {1,redis.NIL,3}" 0
          EVAL "return {1,{nilbulk=true},3}" 0
      
      The result in redis-cli will be:
      
          1) (integer) 1
          2) (nil)
          3) (integer) 3
      e061d797
  10. 27 Sep, 2012 24 commits
    • Erik Dubbelboer's avatar
      04779bdf
    • Erik Dubbelboer's avatar
      Added consts keyword where possible · e04be06e
      Erik Dubbelboer authored
      e04be06e
    • antirez's avatar
      Final merge of Sentinel into 2.6. · c4cbffa3
      antirez authored
      After cherry-picking Sentinel commits a few spurious issues remained
      about references to Redis Cluster that is not present in the 2.6 branch.
      c4cbffa3
    • antirez's avatar
      Sentinel: Support for AUTH. · dfb7194c
      antirez authored
      dfb7194c
    • antirez's avatar
      Sentinel: reply -IDONTKNOW to get-master-addr-by-name on lack of info. · b8ce9a84
      antirez authored
      If we don't have any clue about a master since it never replied to INFO
      so far, reply with an -IDONTKNOW error to SENTINEL
      get-master-addr-by-name requests.
      b8ce9a84
    • antirez's avatar
      Sentinel: more easy master redirection if master is a slave. · 1f8bd823
      antirez authored
      Before this commit Sentienl used to redirect master ip/addr if the
      current instance reported to be a slave only if this was the first INFO
      output received, and the role was found to be slave.
      
      Now instead also if we find that the runid is different, and the
      reported role is slave, we also redirect to the reported master ip/addr.
      
      This unifies the behavior of Sentinel in the case of a reboot (where it
      will see the first INFO output with the wrong role and will perform the
      redirection), with the behavior of Sentinel in the case of a change in
      what it sees in the INFO output of the master.
      1f8bd823
    • antirez's avatar
      Sentinel: do not crash against slaves not publishing the runid. · ef792fc9
      antirez authored
      Older versions of Redis (before 2.4.17) don't publish the runid field in
      INFO. This commit makes Sentinel able to handle that without crashing.
      ef792fc9
    • antirez's avatar
      Sentinel: INFO command implementation. · de499f7f
      antirez authored
      de499f7f
    • antirez's avatar
      Sentinel: add Redis execution mode to INFO output. · b65f3c21
      antirez authored
      The new "redis_mode" field in the INFO output will show if Redis is
      running in standalone mode, cluster, or sentinel mode.
      b65f3c21
    • antirez's avatar
      Sentinel: Sentinel-side support for slave priority. · 161e137c
      antirez authored
      The slave priority that is now published by Redis in INFO output is
      now used by Sentinel in order to select the slave with minimum priority
      for promotion, and in order to consider slaves with priority set to 0 as
      not able to play the role of master (they will never be promoted by
      Sentinel).
      
      The "slave-priority" field is now one of the fileds that Sentinel
      publishes when describing an instance via the SENTINEL commands such as
      "SENTINEL slaves mastername".
      161e137c
    • antirez's avatar
      Sentinel: suppress harmless warning by initializing 'table' to NULL. · d480b9ce
      antirez authored
      Note that the assertion guarantees that one of the if branches setting
      table is always entered.
      d480b9ce
    • antirez's avatar
      Sentinel: send SCRIPT KILL on -BUSY reply and SDOWN instance. · fa23fc33
      antirez authored
      From the point of view of Redis an instance replying -BUSY is down,
      since it is effectively not able to reply to user requests. However
      a looping script is a recoverable condition in Redis if the script still
      did not performed any write to the dataset. In that case performing a
      fail over is not optimal, so Sentinel now tries to restore the normal server
      condition killing the script with a SCRIPT KILL command.
      
      If the script already performed some write before entering an infinite
      (or long enough to timeout) loop, SCRIPT KILL will not work and the
      fail over will be triggered anyway.
      fa23fc33
    • antirez's avatar
      Sentinel: fixed a crash on script execution. · fc0a0d4a
      antirez authored
      The call to sentinelScheduleScriptExecution() lacked the final NULL
      argument to signal the end of arguments. This resulted into a crash.
      fc0a0d4a
    • antirez's avatar
      Sentinel: SENTINEL FAILOVER command implemented. · ea9bec50
      antirez authored
      This command can be used in order to force a Sentinel instance to start
      a failover for the specified master, as leader, forcing the failover
      even if the master is up.
      
      The commit also adds some minor refactoring and other improvements to
      functions already implemented that make them able to work when the
      master is not in SDOWN condition. For instance slave selection
      assumed that we ask INFO every second to every slave, this is true
      only when the master is in SDOWN condition, so slave selection did not
      worked when the master was not in SDOWN condition.
      ea9bec50
    • antirez's avatar
      Sentinel: client reconfiguration script execution. · 26a34009
      antirez authored
      This commit adds support to optionally execute a script when one of the
      following events happen:
      
      * The failover starts (with a slave already promoted).
      * The failover ends.
      * The failover is aborted.
      
      The script is called with enough parameters (documented in the example
      sentinel.conf file) to provide information about the old and new ip:port
      pair of the master, the role of the sentinel (leader or observer) and
      the name of the master.
      
      The goal of the script is to inform clients of the configuration change
      in a way specific to the environment Sentinel is running, that can't be
      implemented in a genereal way inside Sentinel itself.
      26a34009
    • antirez's avatar
      Sentinel: when leader in wait-start, sense another leader as race. · 524b79d2
      antirez authored
      When we are in wait start, if another leader (or any other external
      entity) turns a slave into a master, abort the failover, and detect it
      as an observer.
      
      Note that the wait-start state is mainly there for this reason but the
      abort was yet not implemented.
      
      This adds a new sentinel event -failover-abort-race.
      524b79d2
    • antirez's avatar
    • antirez's avatar
      7c9bfe10
    • antirez's avatar
      Sentinel: abort failover when in wait-start if master is back. · 3da75e2c
      antirez authored
      When we are a Leader Sentinel in wait-start state, starting with this
      commit the failover is aborted if the master returns online.
      
      This improves the way we handle a notable case of net split, that is the
      split between Sentinels and Redis servers, that will be a very common
      case of split becase Sentinels will often be installed in the client's
      network and servers can be in a differnt arm of the network.
      
      When Sentinels and Redis servers are isolated the master is in ODOWN
      condition since the Sentinels can agree about this state, however the
      failover does not start since there are no good slaves to promote (in
      this specific case all the slaves are unreachable).
      
      However when the split is resolved, Sentinels may sense the slave back
      a moment before they sense the master is back, so the failover may start
      without a good reason (since the master is actually working too).
      
      Now this condition is reversible, so the failover will be aborted
      immediately after if the master is detected to be working again, that
      is, not in SDOWN nor in ODOWN condition.
      3da75e2c
    • antirez's avatar
      Sentinel: scripts execution engine improved. · e328e41a
      antirez authored
      We no longer use a vanilla fork+execve but take a queue of jobs of
      scripts to execute, with retry on error, timeouts, and so forth.
      
      Currently this is used only for notifications but soon the ability to
      also call clients reconfiguration scripts will be added.
      e328e41a
    • Jan-Erik Rediger's avatar
      Include sys/wait.h to avoid compiler warning · 8a8e560b
      Jan-Erik Rediger authored
      gcc warned about an implicit declaration of function 'wait3'.
      Including this header fixes this.
      8a8e560b
    • antirez's avatar
    • Jeremy Zawodny's avatar
      comment fix · af41f6cf
      Jeremy Zawodny authored
      improve English a bit. :-)
      af41f6cf
    • antirez's avatar
      999fe0d3