Commit Graph
24 Commits
Author SHA1 Message Date
John Sully e245fdbb89 Merge commit '97e58ee026675e70fbd8843f7a86e98f53a3c791' into unstable
Former-commit-id: 8ab77465db
2020-05-21 19:37:42 -04:00
John Sully c001ea5b41 Merge branch 'unstable' into redis_6_merge
Former-commit-id: cc9924ffa6
2020-04-15 23:00:13 -04:00
John Sully f69c169c04 Merge tag '6.0-rc3' into redis_6_merge
Redis 6.0 RC3.


Former-commit-id: b2cb10de5f
2020-04-14 22:56:19 -04:00
John Sully ce54857237 Merge commit '454e12cb8961f21c9dd8502dc82ae6ffd7e22fe0' into redis_6_merge
Former-commit-id: cc3ebbe519
2020-04-14 22:19:29 -04:00
John Sully 4f56e9c3b0 Merge commit 'e91ca9fee9c56ef319b407b104afc435be0c53cb' into redis_6_merge
Former-commit-id: 516c8c6e23
2020-04-14 20:42:48 -04:00
John Sully 6df76a3bfa Merge commit 'a8e2bbe8f6a3f4833f286cc5049e6b52c87de1a9' into redis_6_merge
Former-commit-id: 5589a0a69c
2020-04-14 19:22:44 -04:00
John Sully c198d81582 Merge commit 'dff5370c8be0dcef1728b95b17906d2494ce9bf2' into redis_6_merge
Former-commit-id: 8e33c2d301
2020-04-14 18:05:10 -04:00
antirez 910db44fc5 Jump to right label on AOF parsing error.
Related to #6054.


Former-commit-id: c7159d58f1
2020-04-14 18:03:22 -04:00
John Sully 2684a266c8 Fix subkey expires not replicating correctly, and AOF issues
Former-commit-id: bd183cdee1
2020-04-04 21:52:27 -04:00
John Sully fbaa46505c Merge branch 'unstable' into redis_6_merge
Former-commit-id: 18a5f46b61
2020-02-11 02:39:08 -05:00
John Sully d4c1e98124 Implement an error handler so bug #125 can't happen
Former-commit-id: 16a019dba0
2020-02-11 01:41:00 -05:00
John Sully fef9925b7f Fix higher latency at low load by grouping clients to threads. This fixes slow perf in cluster benchmarks mentioned in issue #102
Former-commit-id: 1a4c3224c9
2020-02-11 01:00:21 -05:00
John Sully 6193e9ad4f Merge remote-tracking branch 'redis/6.0' into redis_merge
Former-commit-id: ef9a3cadcf
2020-01-27 02:55:48 -05:00
John Sully b9b8272724 Avoid crash due to excessive posted functions for AOF rewrite
Former-commit-id: aa6409f2e8
2020-01-11 16:34:09 -05:00
John Sully b06901a295 Fix Issue #107
Former-commit-id: 98a928147f
2019-12-01 18:17:33 -05:00
John Sully b1190c24a8 Optimize deadlock detection, fix callstack for ASM, and annotate locks
Note: This change moves our assembly code to use the GNU Assembler because NASM seems to be incapable of emitting the necessary debug information for callstack unwinding to work.

Former-commit-id: 600fc241cf
2019-10-22 21:34:51 -04:00
John Sully e57d2e24c9 Update more slave instances to use replica (Issue #75)
Former-commit-id: 252725d50f
2019-10-13 12:29:20 -04:00
John Sully c75e700a86 Fix issue where AOF events are posted to the wrong event loop and not properly cleaned up
Former-commit-id: 55324aa56a
2019-09-19 15:39:52 -04:00
John Sully e06c38f1d3 Plumb support for sub expires to all expire related code
Former-commit-id: 184abac694
2019-07-23 18:53:59 -04:00
John Sully 725dd6539f Add back user space buffering of RDB save
Former-commit-id: d918ca6fa5
2019-07-06 00:36:23 -04:00
John Sully 397e85befb Merge branch 'unstable' of https://github.com/antirez/redis into MergeRedis
Note: some tests failing

Former-commit-id: 86d7276f24
2019-05-11 02:20:34 -04:00
John Sully 6ae796cb91 refactor server global into a pointer (so that threadsafe commands can set this to NULL to prove they don't rely on it
Former-commit-id: 37b2d046be
2019-04-21 14:01:10 -04:00
John Sully 83adc0eabb Factor out some normally const globals
Former-commit-id: fa2e407873
2019-04-21 13:20:45 -04:00
John Sully 68bec6f239 Move remaning files dependent on server.h over to C++
Former-commit-id: 8c133b605c
2019-04-08 01:00:48 -04:00