11345 Commits

Author SHA1 Message Date
John Sully
e9d1f9bc6c Merge branch 'redis_6_merge' of https://github.com/JohnSully/KeyDB into redis_6_merge
Former-commit-id: 95b4f899c5a9218f7ed4cbb81b7f0b894bffe83f
2020-03-30 00:52:43 -04:00
John Sully
4cf5373b9c Merge branch 'unstable' into redis_6_merge
Former-commit-id: 294615531347d7db5d1b0c6a021ac9b05e0bcb48
2020-03-30 00:52:12 -04:00
John Sully
754138a94c Allow active replicas to connect to each other when replica-serve-stale-data is set
Former-commit-id: f2ca2aa1f70956a0309d6a2441417a80383fd717
2020-03-30 00:51:40 -04:00
John Sully
b28c7298ce Don't send build log to stderr
Former-commit-id: b20bf10fda319389c6e7d06cc7cc6c6b6b4f1c6c
2020-03-28 23:36:57 -04:00
John Sully
623c617042 Merge branch 'unstable' into redis_6_merge
Former-commit-id: 208c15bc16aa2a0abf8f8dbcb132316134f0be31
2020-03-27 14:50:37 -04:00
John Sully
6283ca8a2c Raspberry Pi fixes (compile and replication)
Former-commit-id: c3d3c82f3a1751f063a3e77b4bde47f1802a517e
2020-03-27 12:46:25 -04:00
John Sully
8011cc3c6d Fix merge issues
Former-commit-id: b22d9cc27d0434578891c59825f1c8813a3a9b28
2020-03-25 22:26:27 -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
5e96404ad8 Give a better error when handling std::terminate
Former-commit-id: 7b79ec360ba046da6d9dbf3cc731bbdee1458d34
2020-03-25 16:27: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
d5c4d4999b Add roundtrip test for subkey expires
Former-commit-id: 56fc6b7deb59cfb3219d65c01c96969d3983e84a
2020-03-25 15:34:30 -04:00
John Sully
7b2b437539 Fix failure to load subkey expires
Former-commit-id: 528a43bd6c80f073d928dd18c4f67f37cfd0977a
2020-03-25 01:38:58 -04:00
John Sully
70faf2f375 Expire entry needs to be resorted after a subkey expires
Former-commit-id: b357803362728c26a1169e3cec279c693b86205b
2020-03-25 01:06:40 -04:00
John Sully
b057a9cd7a Unstable branch should always be version 0.0.0
Former-commit-id: 448808529ab9e9e4705c2e7cbda5b3e6523b7c6f
2020-03-19 15:52:24 -04:00
John Sully
dada212214 Merge branch 'RELEASE_5' into unstable
Former-commit-id: a0bc2084128f991697d3e1b7473d14c55afdd785
2020-03-19 15:38:16 -04:00
John Sully
69806aaa7b Print stack traces of other threads in the deadlock detector
Former-commit-id: 6b0172b9bf124372f4c8688c91c380c6c1b607c7
2020-03-19 15:37:49 -04:00
John Sully
1bdccb3c42 Log which thread a message came from
Former-commit-id: bc1eccb66d3302d6c99588fb4a5a879e1ef243b1
2020-03-19 15:37:24 -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
3df47fa3ab Merge branch 'unstable' into redis_6_merge
Former-commit-id: 40761e403166bf3342fe388ab742498f99245b1a
2020-03-17 00:09:48 -04:00
John Sully
42027c533a Fix issue #153: Config get replicaof returns a corrupt response
Former-commit-id: 5aef606d3bc1d748ca8d2df1d36feccaa2e583c0
2020-03-16 20:43:46 -04:00
John Sully
c7f1eab8a4 Merge branch 'unstable' into redis_6_merge
Former-commit-id: 4671cd6002c50dd8484e59fd7434878053340702
2020-03-15 18:47:27 -04:00
John Sully
15df3ed91d Handle HTTP error codes with MOTD
Former-commit-id: 2ec0b2cd206f2c73fabcda5d59751b013aa8cfbf
2020-03-15 18:47:01 -04:00
John Sully
d73ac7e377 Merge branch 'unstable' into redis_6_merge
Former-commit-id: 07effa392564f3c53989600e803103f3e3951fe7
2020-03-15 18:33:24 -04:00
John Sully
3b1f36a521 Update MOTD URL
Former-commit-id: cd76a71de393eb527f98024ea85a9492ef0c36ca
2020-03-15 18:32:05 -04:00
John Sully
0114827642 Fix CLANG build break
Former-commit-id: 5e63c0955d2861ab0ebe2055d4f2d2e8989ea4f3
2020-03-04 17:24:17 -05:00
John Sully
09f08908e2 Fix CLANG build break
Former-commit-id: e523afa7410399697659106c88e9f65e2cffae79
2020-03-04 17:24:00 -05:00
John Sully
b3e33daf7d Fix CLANG build break
Former-commit-id: c2a98a60f964f28455a5d04e18b88a9a45c9e586
2020-03-04 17:23:40 -05:00
John Sully
2833febaa5 Merge branch 'unstable' into redis_6_merge
Former-commit-id: 6bc92d6d3182970ebe64184d5be9108321182218
2020-03-04 17:13:50 -05:00
John Sully
43befe9985 Merge branch 'unstable' into RELEASE_5
Former-commit-id: 13cf8bbeb7b96e771620cf79dacba9b63cd31591
2020-03-04 17:13:32 -05:00
John Sully
3dbe23f513 Add missing files from last checkin
Former-commit-id: 60c0d4104de3ff904758c200342e4d132b19501c
2020-03-04 17:13:18 -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
6a254a8d39 Merge branch 'unstable' into RELEASE_5
Former-commit-id: 693ba4ed4ad2fe3f9190b8dc8ca5f940d02baf51
2020-03-04 17:09:29 -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
21fb601851 MOTD refactor
Former-commit-id: 6c78ec7c41223b3381e19fdf78478f66b4959dc9
2020-03-04 16:22:55 -05:00
John Sully
bffd982853 min-clients-per-thread needs to use the new config code
Former-commit-id: fed4bd5269a95a24f99d4542ceece09b9ad66d2c
2020-03-04 15:14:41 -05:00
John Sully
53a66f6a72 Update README.md
Former-commit-id: c0882864f2fff0a32899e983ad4fe060eb71c1ad
2020-03-03 13:58:48 -08:00
John Sully
529b860f85 Merge branch 'unstable' into redis_6_merge
Former-commit-id: 1a7e2e663e0ebabdf51ec8b6bd50d8a4c8a611c8
2020-03-01 21:48:51 -05:00
John Sully
a6a0400b86 Merge branch 'unstable' into RELEASE_5
Former-commit-id: faa87ed8393c9f020ba85da1d30f81bca4cf8202
2020-03-01 21:43:21 -05:00
John Sully
de3d796eb7 Update tests to reflect new CRON name (keydb.cron)
Former-commit-id: 83f585e30ab9d37408c79b74e2536664325a051f
2020-03-01 21:42:01 -05:00
benschermel
7785fa981a Merge branch 'unstable' into RELEASE_5
Former-commit-id: 7a244bb847491f992e15c4e9c55473ffd734a8ec
2020-03-01 19:53:32 -05:00
John Sully
0648930af4 Rename cron command to KEYDB.CRON and add help
Former-commit-id: 1b925119b5ad24ab3a91763bf9f4633f5bc9fef4
2020-03-01 19:18:21 -05:00
John Sully
765ffea018 Rename cron command to KEYDB.CRON and add help
Former-commit-id: 3eb847e28f6df45528dcebc6761290ff60248e78
2020-03-01 19:17:58 -05:00
John Sully
d5ed6f1b5e Merge branch 'unstable' into redis_6_merge
Former-commit-id: 9dc8f30e4783d7e2e9749b155f6bf3df57c536a7
2020-02-28 23:56:26 -05:00
John Sully
ef291b246e Bump version
Former-commit-id: 3ce6441a0c0f5c58f31f5fa28116cea09aebbf35
2020-02-28 23:53:54 -05:00
John Sully
42b6305fbc Merge branch 'unstable' into RELEASE_5
Former-commit-id: 6d00a1a5cf86f69bc9204973adb67a4e215260bd
2020-02-28 23:53:00 -05:00
John Sully
ec4eb534d7 Fix compile failure on raspberry pi machines, issue #141
Former-commit-id: aaca32a5cd1bdb0314b4a57847938854b8a4fef2
2020-02-28 23:49:17 -05:00
John Sully
f68f3d0d14 Fix not respecting max clients config, issue #147
Former-commit-id: 54c96d19954fbddcfd2a307e436ca3290c76e0fb
2020-02-28 22:04:42 -05:00
John Sully
1db49c5897 Fix issue #146
Former-commit-id: e5a2d594464a965f36e4cbf924f02929265186e6
2020-02-28 21:21:05 -05:00