Malavan Sotheeswaran
f3a9d2e0cd
technically possible for child_type == CHILD_TYPE_AOF without active child
2023-02-06 20:33:21 -08:00
Malavan Sotheeswaran
5123e2b3a1
change hasActiveChildProcess to return true only when there is an actual child process ( #558 )
...
change hasActiveChildProcess to return true only when there is an actual child process, add hasActiveChildProcessOrBGSave to catch case of forkless bgsave
2023-02-03 13:36:06 -05:00
Christian Legge
c81cc4ee2b
Save and restore master info in rdb to allow active replica partial sync ( #371 )
...
* save replid for all masters in rdb
* expanded rdbSaveInfo to hold multiple master structs
* parse repl-masters from rdb
* recover replid info from rdb in active replica mode, attempt partial sync
* save offset from rdb into correct variable
* don't change replid based on master in active rep
* save and load psync info from correct fields
2022-04-14 20:17:18 +00:00
VivekSainiEQ
bfcea943ea
Merge remote-tracking branch 'mainpro/PRO_RELEASE_6' into keydbpro
...
Former-commit-id: 5a32d66ee382b6d227a67073afc81ca058d605ed
2021-12-06 20:43:23 +00:00
malavan
1d5873da39
fix dataloss on aof load with storage provider
...
Former-commit-id: 447c8601b5203346fdd4b956ad1ac87c4a6073c8
2021-11-16 02:13:36 +00:00
VivekSainiEQ
f9a355900a
Merge remote-tracking branch 'opensource/unstable' into PRO_RELEASE_6
...
Former-commit-id: 60da86471f68b13e2456e113ecd4aa117d95b134
2021-11-12 21:12:53 +00:00
VivekSainiEQ
93b0482376
Resolved merge conflicts in prior commit
...
Former-commit-id: b88f06b16f3d9e58ec884c61d2d074d7a489775e
2021-10-21 22:35:15 +00:00
VivekSainiEQ
1d882b5ddd
Merge tag '6.2.6' into Redis_626_Merge
...
Former-commit-id: e6d7e01be6965110d487e12f40511fe0b3497695
2021-10-21 22:33:55 +00:00
John Sully
6b4f686f5f
Merge branch 'unstable' into keydbpro
...
Former-commit-id: 205d8f18d2bb8df5253bab40578b006b7aa73fd5
2021-05-28 23:32:46 +00:00
John Sully
5267928381
Merge tag '6.2.2' into unstable
...
Former-commit-id: 93ebb31b17adec5d406d2e30a5b9ea71c07fce5c
2021-05-21 05:54:39 +00:00
John Sully
fe8efa916b
Merge tag '6.2.1' into unstable
...
Former-commit-id: bfed57e3e0edaa724b9d060a6bb8edc5a6de65fa
2021-05-19 02:59:48 +00:00
VivekSainiEQ
7b982ae4c5
Changed branding in various locations
...
Former-commit-id: 96bca72bb4528a0789354ee4fd6bf3ab66d82bf7
2021-05-06 20:13:45 -04:00
John Sully
bb767ad61d
Enable prefetch with storage providers
...
Former-commit-id: 21f9c52c446ad1b460a340c3d873839b2355728f
2021-02-11 00:50:21 +00:00
christianEQ
cca8d186aa
Merge remote-tracking branch 'opensource/unstable' into keydbpro
...
Former-commit-id: 5bad058733de2c217340bb9ee48f02b07d754808
2021-02-03 18:10:27 +00:00
christianEQ
358debebfa
Merge tag 'tags/6.0.10' into redismerge_2021-01-20
...
Former-commit-id: dadce055f897cee83946c2d3e5cbb76341b94230
2021-01-26 21:43:09 +00:00
John Sully
706ba4e1dc
Merge branch 'unstable' into keydbpro
...
Former-commit-id: b7a1e16c0f04e8aeb3764e3681fa14fc0f97f6a3
2020-12-10 02:37:28 +00:00
John Sully
c179c98870
Fix issue where active replication doesn't replicate RDB data
...
Former-commit-id: 527b7eb0742567302e0343e3acbed9814c0cbb95
2020-11-23 02:01:40 +00:00
John Sully
4f18a247e3
Merge tag '6.0.8' into unstable
...
Former-commit-id: 4c7e4b91a6bb2034636856b608b8c386d07f5541
2020-09-30 19:47:55 +00:00
John Sully
ad4c2390a8
Merge branch 'unstable' into keydbpro
...
Former-commit-id: d1986d9fcdfd56f2c30ee95edef6d5260e0aa777
2020-09-24 22:02:30 +00:00
John Sully
d89fbd4175
Avoid memory overhead in situations it won't be used (active rep only)
...
Former-commit-id: 8f7d977f9068904eca783fefbb24df4d8abd4214
2020-09-19 21:44:59 +00:00
John Sully
649745924b
RocksDB Read Performance Improvements
...
Former-commit-id: 80cca4869888e048e10e11f1f20796c482c3e5b3
2020-08-09 23:36:20 +00:00
John Sully
346adf976a
Perf fixes on expire lock
...
Former-commit-id: 7f23ac087720317f54a0bc0e0c4774e7b0ef4337
2020-07-13 18:14:52 +00:00
John Sully
91a803815d
Merge branch 'flash_cache' into keydbpro
...
Former-commit-id: 2a721ef645921d62b39f1374c0a3f5c92b00fae5
2020-07-13 03:53:34 +00:00
John Sully
6a57593467
Merge branch 'PRO_RELEASE_6' into keydbpro
...
Former-commit-id: bffe010ea5279bee869bc61cc6d933979e10bbea
2020-07-13 03:32:14 +00:00
John Sully
1ad2d96697
Merge branch 'unstable' into keydbpro
...
Former-commit-id: 0dafbc254a0efd5ee302d5c58fb2ca0a85110104
2020-07-13 03:31:47 +00:00
John Sully
d4dd336834
Merge tag '6.0.5' into unstable
...
Redis 6.0.5
Former-commit-id: b736a95b0d23e4b73daa88c676b76d1d18e8bd17
2020-07-13 00:55:23 +00:00
John Sully
17661f2382
Implement storage key cache, and writeback memory model
...
Former-commit-id: 732bd9c153459f1174475ad67de36c399ddbe359
2020-07-11 21:23:48 +00:00
John Sully
c83fe382ff
COW pointer is not thread safe so we need a global expire lock
...
Former-commit-id: ac12eef75301564d920e622a08e4f586486fd395
2020-06-09 19:58:42 -04:00
John Sully
44c1e6d5e7
Merge branch 'unstable' into keydbpro
...
Former-commit-id: 08a36155e3db9918048e87c3d691b7317787c9ab
2020-06-01 17:41:37 -04:00
John Sully
e380087cdb
Unify beforeSleep handling
...
Former-commit-id: 1cb48c7bf6a7e91e728a677902a7bfc64fe80dd6
2020-05-29 17:44:55 -04:00
John Sully
cece963cf3
Merge branch 'unstable' into keydbpro
...
Former-commit-id: a830cf85df236885558c5571c0bf23cfb23e3655
2020-05-24 14:41:53 -04:00
John Sully
67b7d512cb
Merge commit 'cb683a84f7a9d530bec629f2b656e7d0842a0f75' into unstable
...
Former-commit-id: 817a11ff110772893eda0675912bbb0cfc1fca74
2020-05-22 15:56:35 -04:00
John Sully
ad1eac9856
Merge commit 'bec68bff2978de88b23140f41b6a943162333b11' into unstable
...
Former-commit-id: 8ab77465dbb3c0b1f859f24cdbb461937516eb6a
2020-05-21 19:37:42 -04:00
John Sully
05cc1fd3de
Initial merge of unstable 6
...
Former-commit-id: aac140de199646914cc02997a45111c9c695e55d
2020-04-16 16:36:16 -04:00
John Sully
c498381b1a
Merge branch 'unstable' into redis_6_merge
...
Former-commit-id: cc9924ffa606200f331b3bf5e1e1a4aa3f2702fa
2020-04-15 23:00:13 -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
07005cc187
Merge commit 'be4bc1a5be26a7fde2fd05acd8187f5f0ed59f25' into redis_6_merge
...
Former-commit-id: 516c8c6e231cdfc87a3db5be401407cb7afa3937
2020-04-14 20:42:48 -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
e751664909
Merge commit 'cbabf779c24fd107ca8e4fe6369e4677ad0eda10' into redis_6_merge
...
Former-commit-id: 8e33c2d30116ea469238c340ed367f0182856454
2020-04-14 18:05:10 -04:00
antirez
eafcca9f29
Jump to right label on AOF parsing error.
...
Related to #6054 .
Former-commit-id: c7159d58f118e840a3b9f72160d1abf3e8a86b3d
2020-04-14 18:03:22 -04:00
John Sully
eeca58777d
Fix subkey expires not replicating correctly, and AOF issues
...
Former-commit-id: bd183cdee13081a02efef5df75edf2292b872a16
2020-04-04 21:52:27 -04:00
John Sully
79f48a214e
Prevent issue where count can be out of sync temporarily, causing crashes where we expect the count to be perfect
...
Former-commit-id: 77c9f36413c6f0cbb0b13a7ec746746c97faadcd
2020-03-24 00:21:12 -04:00
John Sully
b7a60588c1
Merge branch 'unstable' into keydbpro
...
Former-commit-id: f3457e2a9a8464bac656b57256316bbddb65d9e9
2020-02-16 04:04:34 -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
14cf73deaa
Merge KeyDB 6
...
Former-commit-id: 9129b98c12b0da856bbda3eb68b4ddc7530693c9
2020-01-29 12:55:23 -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
John Sully
7a6085742d
Merge branch 'moar_perf' into keydbpro_moarperf
...
Former-commit-id: d0990a465c3c5c29b71f239d84a875af40699281
2020-01-11 22:06:20 -05:00