1. 24 8月, 2012 3 次提交
    • A
      Better Out of Memory handling. · 6fdc6354
      antirez 提交于
      The previous implementation of zmalloc.c was not able to handle out of
      memory in an application-specific way. It just logged an error on
      standard error, and aborted.
      
      The result was that in the case of an actual out of memory in Redis
      where malloc returned NULL (In Linux this actually happens under
      specific overcommit policy settings and/or with no or little swap
      configured) the error was not properly logged in the Redis log.
      
      This commit fixes this problem, fixing issue #509.
      Now the out of memory is properly reported in the Redis log and a stack
      trace is generated.
      
      The approach used is to provide a configurable out of memory handler
      to zmalloc (otherwise the default one logging the event on the
      standard output is used).
      6fdc6354
    • A
      Sentinel: send SCRIPT KILL on -BUSY reply and SDOWN instance. · 850789ce
      antirez 提交于
      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.
      850789ce
    • A
      Sentinel: fixed a crash on script execution. · 01477753
      antirez 提交于
      The call to sentinelScheduleScriptExecution() lacked the final NULL
      argument to signal the end of arguments. This resulted into a crash.
      01477753
  2. 21 8月, 2012 1 次提交
    • A
      redis-benchmark: disable big buffer cleanup in hiredis context. · 227b4293
      antirez 提交于
      This new hiredis features allows us to reuse a previous context reader
      buffer even if already very big in order to maximize performances with
      big payloads (Usually hiredis re-creates buffers when they are too big
      and unused in order to save memory).
      227b4293
  3. 14 8月, 2012 2 次提交
  4. 03 8月, 2012 2 次提交
    • A
      Sentinel: SENTINEL FAILOVER command implemented. · cada7f96
      antirez 提交于
      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.
      cada7f96
    • A
      Sentinel: client reconfiguration script execution. · 6275004c
      antirez 提交于
      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.
      6275004c
  5. 31 7月, 2012 4 次提交
    • A
      Sentinel: when leader in wait-start, sense another leader as race. · fd92b366
      antirez 提交于
      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.
      fd92b366
    • A
      91c15ed1
    • M
      Use correct variable name for value to convert. · f1d187bb
      Michael Parker 提交于
      Note by @antirez: this code was never compiled because utils.c lacked the
      float.h include, so we never noticed this variable was mispelled in the
      past.
      
      This should provide a noticeable speed boost when saving certain types
      of databases with many sorted sets inside.
      f1d187bb
    • A
      Sentinel: abort failover when in wait-start if master is back. · 75084e05
      antirez 提交于
      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.
      75084e05
  6. 29 7月, 2012 1 次提交
    • A
      Sentinel: scripts execution engine improved. · 3f194a9d
      antirez 提交于
      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.
      3f194a9d
  7. 28 7月, 2012 1 次提交
  8. 26 7月, 2012 1 次提交
  9. 25 7月, 2012 7 次提交
    • A
      Sentinel: ability to execute notification scripts. · baace5fc
      antirez 提交于
      baace5fc
    • M
      Fix warning in redis.c for sentinel config load · f1c8661e
      mrb 提交于
      f1c8661e
    • A
      Sentinel: abort failover if no good slave is available. · 672102c2
      antirez 提交于
      The previous behavior of the state machine was to wait some time and
      retry the slave selection, but this is not robust enough against drastic
      changes in the conditions of the monitored instances.
      
      What we do now when the slave selection fails is to abort the failover
      and return back monitoring the master. If the ODOWN condition is still
      present a new failover will be triggered and so forth.
      
      This commit also refactors the code we use to abort a failover.
      672102c2
    • A
      Sentinel: reset pending_commands in a more generic way. · 9e5bef38
      antirez 提交于
      9e5bef38
    • A
      Prevent a spurious +sdown event on switch. · a23a5b6c
      antirez 提交于
      When we reset the master we should start with clean timestamps for ping
      replies otherwise we'll detect a spurious +sdown event, because on
      +master-switch event the previous master instance was probably in +sdown
      condition. Since we updated the address we should count time from
      scratch again.
      
      Also this commit makes sure to explicitly reset the count of pending
      commands, now we can do this because of the new way the hiredis link
      is closed.
      a23a5b6c
    • A
      Sentinel: debugging message removed. · d918e6f1
      antirez 提交于
      d918e6f1
    • A
      Sentinel: changes to connection handling and redirection. · 75fb6e5b
      antirez 提交于
      We disconnect the Redis instances hiredis link in a more robust way now.
      Also we change the way we perform the redirection for the +switch-master
      event, that is not just an instance reset with an address change.
      
      Using the same system we now implement the +redirect-to-master event
      that is triggered by an instance that is configured to be master but
      found to be a slave at the first INFO reply. In that case we monitor the
      master instead, logging the incident as an event.
      75fb6e5b
  10. 24 7月, 2012 2 次提交
    • A
      Sentinel: check that instance still exists in reply callbacks. · 2179c269
      antirez 提交于
      We can't be sure the instance object still exists when the reply
      callback is called.
      2179c269
    • A
      Sentinel: more robust failover detection as observer. · d876d6fe
      antirez 提交于
      Sentinel observers detect failover checking if a slave attached to the
      monitored master turns into its replication state from slave to master.
      However while this change may in theory only happen after a SLAVEOF NO
      ONE command, in practie it is very easy to reboot a slave instance with
      a wrong configuration that turns it into a master, especially if it was
      a past master before a successfull failover.
      
      This commit changes the detection policy so that if an instance goes
      from slave to master, but at the same time the runid has changed, we
      sense a reboot, and in that case we don't detect a failover at all.
      
      This commit also introduces the "reboot" sentinel event, that is logged
      at "warning" level (so this will trigger an admin notification).
      
      The commit also fixes a problem in the disconnect handler that assumed
      that the instance object always existed, that is not the case. Now we
      no longer assume that redisAsyncFree() will call the disconnection
      handler before returning.
      d876d6fe
  11. 23 7月, 2012 1 次提交
  12. 22 7月, 2012 1 次提交
    • A
      Allow Pub/Sub in contexts where other commands are blocked. · 5d73073f
      antirez 提交于
      Redis loading data from disk, and a Redis slave disconnected from its
      master with serve-stale-data disabled, are two conditions where
      commands are normally refused by Redis, returning an error.
      
      However there is no reason to disable Pub/Sub commands as well, given
      that this layer does not interact with the dataset. To allow Pub/Sub in
      as many contexts as possible is especially interesting now that Redis
      Sentinel uses Pub/Sub of a Redis master as a communication channel
      between Sentinels.
      
      This commit allows Pub/Sub to be used in the above two contexts where
      it was previously denied.
      5d73073f
  13. 18 7月, 2012 3 次提交
    • A
      Don't assume that "char" is signed. · b62bdf1c
      antirez 提交于
      For the C standard char can be either signed or unsigned, it's up to the
      compiler, but Redis assumed that it was signed in a few places.
      
      The practical effect of this patch is that now Redis 2.6 will run
      correctly in every system where char is unsigned, notably the RaspBerry
      PI and other ARM systems with GCC.
      
      Thanks to Georgi Marinov (@eesn on twitter) that reported the problem
      and allowed me to use his RaspBerry via SSH to trace and fix the issue!
      b62bdf1c
    • S
      Truncate short write from the AOF · 55302e9e
      Saj Goonatilleke 提交于
      If Redis only manages to write out a partial buffer, the AOF file won't
      load back into Redis the next time it starts up.  It is better to
      discard the short write than waste time running redis-check-aof.
      55302e9e
    • S
      New in INFO: aof_last_bgrewrite_status · 48553a29
      Saj Goonatilleke 提交于
      Behaves like rdb_last_bgsave_status -- even down to reporting 'ok' when
      no rewrite has been done yet.  (You might want to check that
      aof_last_rewrite_time_sec is not -1.)
      48553a29
  14. 15 7月, 2012 1 次提交
  15. 29 6月, 2012 1 次提交
  16. 27 6月, 2012 2 次提交
    • A
      Typo in comment. · 36def8fd
      antirez 提交于
      36def8fd
    • A
      REPLCONF internal command introduced. · 3a328978
      antirez 提交于
      The REPLCONF command is an internal command (not designed to be directly
      used by normal clients) that allows a slave to set some replication
      related state in the master before issuing SYNC to start the
      replication.
      
      The initial motivation for this command, and the only reason currently
      it is used by the implementation, is to let the slave instance
      communicate its listening port to the slave, so that the master can
      show all the slaves with their listening ports in the "replication"
      section of the INFO output.
      
      This allows clients to auto discover and query all the slaves attached
      into a master.
      
      Currently only a single option of the REPLCONF command is supported, and
      it is called "listening-port", so the slave now starts the replication
      process with something like the following chat:
      
          REPLCONF listening-prot 6380
          SYNC
      
      Note that this works even if the master is an older version of Redis and
      does not understand REPLCONF, because the slave ignores the REPLCONF
      error.
      
      In the future REPLCONF can be used for partial replication and other
      replication related features where there is the need to exchange
      information between master and slave.
      
      NOTE: This commit also fixes a bug: the INFO outout already carried
      information about slaves, but the port was broken, and was obtained
      with getpeername(2), so it was actually just the ephemeral port used
      by the slave to connect to the master as a client.
      3a328978
  17. 21 6月, 2012 2 次提交
    • A
      Fixed comment typo into time_independent_strcmp(). · 5410168c
      antirez 提交于
      5410168c
    • A
      Fixed a timing attack on AUTH (Issue #560). · 31a1439b
      antirez 提交于
      The way we compared the authentication password using strcmp() allowed
      an attacker to gain information about the password using a well known
      class of attacks called "timing attacks".
      
      The bug appears to be practically not exploitable in most modern systems
      running Redis since even using multiple bytes of differences in the
      input at a time instead of one the difference in running time in in the
      order of 10 nanoseconds, making it hard to exploit even on LAN. However
      attacks always get better so we are providing a fix ASAP.
      
      The new implementation uses two fixed length buffers and a constant time
      comparison function, with the goal of:
      
      1) Completely avoid leaking information about the content of the
      password, since the comparison is always performed between 512
      characters and without conditionals.
      2) Partially avoid leaking information about the length of the
      password.
      
      About "2" we still have a stage in the code where the real password and
      the user provided password are copied in the static buffers, we also run
      two strlen() operations against the two inputs, so the running time
      of the comparison is a fixed amount plus a time proportional to
      LENGTH(A)+LENGTH(B). This means that the absolute time of the operation
      performed is still related to the length of the password in some way,
      but there is no way to change the input in order to get a difference in
      the execution time in the comparison that is not just proportional to
      the string provided by the user (because the password length is fixed).
      
      Thus in practical terms the user should try to discover LENGTH(PASSWORD)
      looking at the whole execution time of the AUTH command and trying to
      guess a proportionality between the whole execution time and the
      password length: this appears to be mostly unfeasible in the real world.
      
      Also protecting from this attack is not very useful in the case of Redis
      as a brute force attack is anyway feasible if the password is too short,
      while with a long password makes it not an issue that the attacker knows
      the length.
      31a1439b
  18. 15 6月, 2012 1 次提交
    • A
      Fix c->reply_bytes computation in setDeferredMultiBulkLength() · 5b63ccce
      antirez 提交于
      In order to implement reply buffer limits introduced in 2.6 and useful
      to close the connection under user-selected circumastances of big output
      buffers (for instance slow consumers in pub/sub, a blocked slave, and so
      forth) Redis takes a counter with the amount of used memory in objects
      inside the output list stored into c->reply.
      
      The computation was broken in the function setDeferredMultiBulkLength(),
      in the case the object was glued with the next one. This caused the
      c->reply_bytes field to go out of sync, be subtracted more than needed,
      and wrap back near to ULONG_MAX values.
      
      This commit fixes this bug and adds an assertion that is able to trap
      this class of problems.
      
      This problem was discovered looking at the INFO output of an unrelated
      issue (issue #547).
      5b63ccce
  19. 14 6月, 2012 1 次提交
    • A
      ziplistFind(): don't assume that entries are comparable by encoding. · ba779119
      antirez 提交于
      Because Redis 2.6 introduced new integer encodings it is no longer true
      that if two entries have a different encoding they are not equal.
      
      An old ziplist can be loaded from an RDB file generated with Redis 2.4,
      in this case for instance a small unsigned integers is encoded with a
      16 bit encoding, while in Redis 2.6 a more specific 8 bit encoding
      format is used.
      
      Because of this bug hashes ended with duplicated values or fields lookup
      failed, causing many bad behaviors.
      This in turn caused a crash while converting the ziplist encoded hash into
      a real hash table because an assertion was raised on duplicated elements.
      
      This commit fixes issue #547.
      
      Many thanks to Pinterest's Marty Weiner and colleagues for discovering
      the problem and helping us in the debugging process.
      ba779119
  20. 13 6月, 2012 1 次提交
    • T
      Standardize punctuation in redis-cli help. · d665dd08
      Ted Nyman 提交于
      Right there is a mix of help entries ending with periods or
      without periods. This standardizes the end of command as without
      periods, which seems to be the general custom in most unix tools,
      at least.
      d665dd08
  21. 12 6月, 2012 1 次提交
    • A
      Dump ziplist hex value on failed assertion. · ee789e15
      antirez 提交于
      The ziplist -> hashtable conversion code is triggered every time an hash
      value must be promoted to a full hash table because the number or size of
      elements reached the threshold.
      
      If a problem in the ziplist causes the same field to be present
      multiple times, the assertion of successful addition of the element
      inside the hash table will fail, crashing server with a failed
      assertion, but providing little information about the problem.
      
      This code adds a new logging function to perform the hex dump of binary
      data, and makes sure that the ziplist -> hashtable conversion code uses
      this new logging facility to dump the content of the ziplist when the
      assertion fails.
      
      This change was originally made in order to investigate issue #547.
      ee789e15
  22. 02 6月, 2012 1 次提交
    • A
      Fixed RESTORE hash failure (Issue #532) · 51857c7e
      Alex Mitrofanov 提交于
      (additional commit notes by antirez@gmail.com):
      
      The rdbIsObjectType() macro was not updated when the new RDB object type
      of ziplist encoded hashes was added.
      
      As a result RESTORE, that uses rdbLoadObjectType(), failed when a
      ziplist encoded hash was loaded.
      This does not affected normal RDB loading because in that case we use
      the lower-level function rdbLoadType().
      
      The commit also adds a regression test.
      51857c7e