John Sully
|
2d783a3cbf
|
Merge tag '6.0.2' into unstable
Redis 6.0.2
Former-commit-id: a010e4a4b2cc2bcad1cb14604b7ebc596c35b05e
|
2020-05-22 16:45:18 -04:00 |
|
John Sully
|
67b7d512cb
|
Merge commit 'cb683a84f7a9d530bec629f2b656e7d0842a0f75' into unstable
Former-commit-id: 817a11ff110772893eda0675912bbb0cfc1fca74
|
2020-05-22 15:56:35 -04:00 |
|
John Sully
|
df7ac419d0
|
Merge commit '3a441c7d95c8757d2ab12ff730cc7ca8899538c9' into unstable
Former-commit-id: c52e1fc78c369843e49a22765bed2c53e99d9709
|
2020-05-22 15:42:50 -04:00 |
|
John Sully
|
8f8dea57db
|
Merge tag '6.0.1' into unstable
Redis 6.0.1.
Former-commit-id: c505df8830123904da026be2aacbd92a95a5e37c
|
2020-05-21 23:41:36 -04:00 |
|
John Sully
|
27eb239f1a
|
Fix bad merge in CI.yml
Former-commit-id: 6311d709c39b3bacaeab77b18033010f1b548f81
|
2020-05-21 22:09:06 -04:00 |
|
John Sully
|
3384af024d
|
Merge commit 'cbcd07777dc569618a34f59e5fd0de53178f4f1d' into unstable
Former-commit-id: 49784c8122e827bd9de86bbae4d88c313400e86e
|
2020-05-21 18:48:49 -04:00 |
|
John Sully
|
24322b9b6d
|
Merge commit 'eba28e2cea0b2632cf751426ada02adf24f273db' into unstable
Former-commit-id: d5b057534a3dbf50f94465332107da2490811946
|
2020-05-21 17:32:53 -04:00 |
|
John Sully
|
d1948ab944
|
Merge branch 'unstable' into keydbpro
Former-commit-id: d89c15518f984c1d4d4e7638a4e8ac5aa499632a
|
2020-05-11 00:53:38 -04:00 |
|
John Sully
|
012228bd51
|
We should still send replies even if an async close is pending
Former-commit-id: 572bcca9c2e7985782909cca22ef9e381bea55b4
|
2020-05-10 23:56:29 -04:00 |
|
John Sully
|
f0ed02448d
|
Fix race on clients_to_close
Former-commit-id: 10fa06410941121c4c9fc3cc9c553a7afe347147
|
2020-05-10 23:14:15 -04:00 |
|
John Sully
|
dc131afe1c
|
Fix crash in client unblock command
Former-commit-id: 7cd779d304d75833ca891b4fe3b7e1cfdabf6fa8
|
2020-05-10 22:08:50 -04:00 |
|
John Sully
|
05cc1fd3de
|
Initial merge of unstable 6
Former-commit-id: aac140de199646914cc02997a45111c9c695e55d
|
2020-04-16 16:36:16 -04:00 |
|
John Sully
|
34131bf287
|
During AOF reload we can erroneously read incorrect aof_state values, so this variable must be read with the global lock acquired
Former-commit-id: 6ff9d23fd4541a011d754209d9fda3ef3af4a7f9
|
2020-04-15 22:30:19 -04:00 |
|
John Sully
|
d3ebe3b6bd
|
Merge tag '6.0-rc3' into redis_6_merge
Redis 6.0 RC3.
Former-commit-id: b2cb10de5f39b4d8e1ee19877c2bdaf19eefd9db
|
2020-04-14 22:56:19 -04:00 |
|
John Sully
|
02147b4be0
|
Merge commit '0f7dfc378ce5ab0524ac28b6142545bc41435386' into redis_6_merge
Former-commit-id: cc3ebbe5194e9744fb84ce490e90ac5fbe7f8716
|
2020-04-14 22:19:29 -04:00 |
|
John Sully
|
f27524674a
|
Merge commit '973297336fc05a601e17be70aba88e5dca6480ae' into redis_6_merge
Former-commit-id: ef1236b6009ebd7b00f6dd2f43df57ad95e51253
|
2020-04-14 20:19:48 -04:00 |
|
John Sully
|
d57fa7c8f9
|
Merge commit '349aa24511253b3e323064b95cefb4414f31726c' into redis_6_merge
Former-commit-id: 28cbed1d13961c5568f2bdc50c6a23107d3434d0
|
2020-04-14 20:09:53 -04:00 |
|
John Sully
|
947bf289a5
|
Merge commit 'f42ce57d0f7eee6705fb0a81714cabe97a4f2c0a' into redis_6_merge
Former-commit-id: 5589a0a69ca6f5798b750a6a79f7e9b44d20e136
|
2020-04-14 19:22:44 -04:00 |
|
John Sully
|
138ce49a96
|
merge
Former-commit-id: 187773190f153f8a7236bc2e4f42bffe6885f727
|
2020-03-26 01:16:36 -04:00 |
|
John Sully
|
aaa751acb8
|
Merge branch 'unstable' into redis_6_merge
Former-commit-id: 908cf5042ebcd7870166bd1a0bb450f37e5f3b4d
|
2020-03-25 22:12:22 -04:00 |
|
John Sully
|
356ed25c62
|
Fix issue #143
Former-commit-id: 6ec1641294b23e22a2a5dc5cc6098a02ce234df3
|
2020-03-25 21:55:31 -04:00 |
|
John Sully
|
3eb99b4811
|
Merge branch 'redis_6_merge' into keydbpro
Former-commit-id: 44f1b065ed6d3b0ad2a62f093432743b98fad6be
|
2020-03-25 15:47:24 -04:00 |
|
John Sully
|
af459476ea
|
Merge branch 'unstable' into redis_6_merge
Former-commit-id: 718aee242dd75abd16a5a6a89353d2a35f37b010
|
2020-03-25 15:47:12 -04:00 |
|
John Sully
|
4d5d7ed59f
|
Fix lock inversion in processEventsWhileBlocked
Former-commit-id: a9249d4a82a0f0355ac8ffa40b34b9c14cabf66b
|
2020-03-19 15:28:39 -04:00 |
|
John Sully
|
87626299a6
|
Prevent dangling lock when we can't free the client
Former-commit-id: 3c373494d63b21744b264f0a47e6999bcdda6b2b
|
2020-03-19 14:34:23 -04:00 |
|
John Sully
|
b29f96e007
|
Merge branch 'redis_6_merge' into keydbpro
Former-commit-id: bef19fefeb293e44e31dfefe383eef99e4cd7721
|
2020-03-04 17:15:54 -05:00 |
|
John Sully
|
a669a40ac6
|
Merge branch 'unstable' into redis_6_merge
Former-commit-id: 52fd4445a472fa3112e96c6a7ef66ecdfe6ce9f5
|
2020-03-04 17:13:01 -05:00 |
|
John Sully
|
de2b08c3f8
|
Add extra logging when reporting errors from masters - especially in rreplay
Former-commit-id: 5397f0b03312b8cace07a85333d8f035bdfb8d57
|
2020-03-04 17:09:12 -05:00 |
|
John Sully
|
20924db872
|
Merge branch 'redis_6_merge' into keydbpro
Former-commit-id: 82b957be47c828238554ba8b365e2d0a45994bc2
|
2020-02-17 19:56:07 -05:00 |
|
John Sully
|
1abc602081
|
Merge branch 'unstable' into redis_6_merge
Former-commit-id: 32f34f63fd1025ae8337e8f30e9622abf08ee014
|
2020-02-17 19:55:29 -05:00 |
|
John Sully
|
c2ef5957ef
|
Add double unlock detection and improve fastlock_unlock assmebly
Former-commit-id: 98aefac09b6b59371e6c1c77d1ef2794bfc5ae62
|
2020-02-17 19:54:05 -05:00 |
|
John Sully
|
d90ebb9f85
|
processEventsWhileBlocked not exception safe
Former-commit-id: 45b711f9d124a948a66e667992176b5387943512
|
2020-02-17 19:04:11 -05:00 |
|
John Sully
|
96c4f5ecfc
|
processEventsWhileBlocked not exception safe
Former-commit-id: 1ef187533c26bfa0c084a815b8b80de92ba1cf0b
|
2020-02-17 19:03:49 -05:00 |
|
John Sully
|
0b315702c2
|
processEventsWhileBlocked not exception safe
Former-commit-id: 432543956c74351a12af2cb258a7a0ba5daa9b27
|
2020-02-17 18:57:13 -05:00 |
|
John Sully
|
2af2e5c730
|
Merge branch 'redis_6_merge' into keydbpro
Former-commit-id: 4bd4159e2d8a7cdd0af9719776dca3e7d161d166
|
2020-02-11 03:48:24 -05:00 |
|
John Sully
|
d1885547f2
|
Merge branch 'unstable' into redis_6_merge
Former-commit-id: 329519d4aa230a9f7f2d3b82158f8cafcbbd6952
|
2020-02-11 03:48:08 -05:00 |
|
John Sully
|
da293758fc
|
Fix race condition in allocating connections to threads
Former-commit-id: 52434a583aa7114ff5658226441ab82ed3110a57
|
2020-02-11 03:44:28 -05:00 |
|
John Sully
|
a52e7fa2af
|
Merge branch 'redis_6_merge' into keydbpro
Former-commit-id: 4091800e499cade8bc188c9e6f52f535c500f282
|
2020-02-11 02:54:24 -05:00 |
|
John Sully
|
ee99605def
|
Merge branch 'unstable' into redis_6_merge
Former-commit-id: 18a5f46b6138e8a975dda0ed4897d19eed756d24
|
2020-02-11 02:39:08 -05:00 |
|
John Sully
|
e30630d53b
|
Implement an error handler so bug #125 can't happen
Former-commit-id: 16a019dba053fd0654116ff98a2ad0b66a9ed4e6
|
2020-02-11 01:41:00 -05:00 |
|
John Sully
|
3282d4114f
|
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: 1a4c3224c9848f02fbdb49674045b593cfc41d31
|
2020-02-11 01:00:21 -05:00 |
|
John Sully
|
1a3285ff17
|
Merge branch 'unstable' into keydbpro
Former-commit-id: fec8209c1996112976d927d65dbc2b4492131681
|
2020-02-07 16:46:13 -05:00 |
|
John Sully
|
46506b3e53
|
module fixes
Former-commit-id: ef4e11ecb8a6f1a05bb21f014120b0ef9e771b60
|
2020-02-04 01:22:25 -05:00 |
|
John Sully
|
e945cf0b1f
|
Merge branch 'redis_merge' into keydb_pro_merge
Former-commit-id: 2a760ac3b2cf12e45a9db9d0c2efe6efc4dc2aed
|
2020-01-29 21:30:20 -05:00 |
|
John Sully
|
5c1a0410b9
|
TLS Thread Safety fixes
Former-commit-id: e98a5fc108c5448307a8cc38182c79263f01102a
|
2020-01-29 21:21:47 -05:00 |
|
John Sully
|
14cf73deaa
|
Merge KeyDB 6
Former-commit-id: 9129b98c12b0da856bbda3eb68b4ddc7530693c9
|
2020-01-29 12:55:23 -05:00 |
|
John Sully
|
8e7f3304b2
|
More threading fixes from merge
Former-commit-id: 4a980f4ddbebe3f62703aa3de67c93cdffb6b4b8
|
2020-01-28 17:54:00 -05:00 |
|
John Sully
|
e3b2ef962b
|
reenable multithreading after merge
Former-commit-id: 9fbb9a551e83ddfc66894fba688dae7c9c3c7ae1
|
2020-01-27 19:59:04 -05:00 |
|
John Sully
|
39378f982e
|
Fix most tests (still some failures)
Former-commit-id: da83e841255487efe0e4b13d42b2dcc55a369838
|
2020-01-27 18:16:19 -05:00 |
|
John Sully
|
8e5fe97525
|
Merge remote-tracking branch 'redis/6.0' into redis_merge
Former-commit-id: ef9a3cadcf94326bf2f163db7698aad9a3c01690
|
2020-01-27 02:55:48 -05:00 |
|