John Sully
437a1d54cd
don't swap iterators when swapping DB contents
...
Former-commit-id: 4971518d42218a63cf86919e91af54462f6dc8c0
2020-04-21 21:38:24 -04:00
John Sully
7360d1ccfc
Merge branch 'unstable' of https://github.com/JohnSully/KeyDB into unstable
...
Former-commit-id: e72642667f5a7bda45268ab14a496f021d936e8e
2020-04-16 20:12:14 -04:00
John Sully
0b9779c33f
Fix some clang warnings
...
Former-commit-id: 3785b1efd49002e629c1d821c57e971f8f09a2d2
2020-04-16 20:12:05 -04:00
John Sully
3ecb621ccf
Always link libatomic
...
Former-commit-id: 7aeae62f84fe958bcda9925f76180a7e149a337e
2020-04-16 20:01:24 -04:00
John Sully
e5a1f84582
Fix warning in cluster.cpp
...
Former-commit-id: e5e33f8cb7b4c928884a934184cbf81b916b3c03
2020-04-16 20:01:13 -04:00
John Sully
0962c5f366
Merge branch 'unstable' into keydbpro
...
Former-commit-id: 642719cef20a88d23af84a16d3f6757088c23b1a
2020-04-16 17:06:33 -04:00
John Sully
158868ed92
quiet TSAN in serverLog
...
Former-commit-id: a836d5947d5a024d855bf5d0d6269e014e47b868
2020-04-16 17:06:25 -04:00
John Sully
05cc1fd3de
Initial merge of unstable 6
...
Former-commit-id: aac140de199646914cc02997a45111c9c695e55d
2020-04-16 16:36:16 -04:00
John Sully
87e6d357e9
Update Readme to use github CI badge
...
Former-commit-id: 7cdd5d9e4108474edb453e4be98a1e95f01400d1
2020-04-15 23:21:10 -04:00
John Sully
251a46861b
update TLS readme for KeyDB
...
Former-commit-id: 3f5d3fec36b15476f52ad683af786dd7ee1268ff
2020-04-15 23:19:05 -04:00
John Sully
cf9efc8e9f
Deprecate travis and finish setting up github CI
...
Former-commit-id: 90094a2dcaa004437c43818b411d44e722da420a
2020-04-15 23:04:04 -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
e09a2ac94a
OS X build break
...
Former-commit-id: 5e6b4ab99e6f2ad29577c8d4cc151284f0c652b4
2020-04-15 22:43:40 -04:00
John Sully
2a14dcc7d1
more dependencies for CI
...
Former-commit-id: 2d6d3741624bf8f36b3c6a9e0557d02837f9cdaa
2020-04-15 22:39:47 -04:00
John Sully
a7d88c1287
Add CI dependency
...
Former-commit-id: 3137d4f35c5ae5b24a8956fadeec2d93c7048165
2020-04-15 22: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
470a895585
Quiet test only ASAN fd race
...
Former-commit-id: d4939c838b58eab2fb3b631267045cff9d3caff1
2020-04-15 22:27:45 -04:00
John Sully
3e2ba10d00
Run all KeyDB instances in testmode during tests
...
Former-commit-id: cd306f1d23f4fbb900433edbf55d89099bbf903c
2020-04-15 22:27:04 -04:00
John Sully
19550c4819
Fix race in sendBulk
...
Former-commit-id: 5fd07e08894482e1a55f18ece9c52ff5379b82ec
2020-04-15 22:26:00 -04:00
John Sully
bbb08af294
Convert variables accessed outside lock to atomics
...
Former-commit-id: b0796ff5fd7e069a2fadbfd968f7bbb2020edd2d
2020-04-15 22:25:17 -04:00
John Sully
4f2f2affed
ASAN races in leak checker
...
Former-commit-id: 9dfa074cd6d5ed9a87036e582861dfc386b56d5e
2020-04-15 22:24:12 -04:00
John Sully
24223ed818
Multithreading reliability, force single thread for test relying on internal behavior
...
Former-commit-id: 033761c5f97fc1d1823a031b34467ac1df5588f3
2020-04-15 20:52:25 -04:00
John Sully
9b25f954d0
rename to KeyDB (merge)
...
Former-commit-id: 2926ac494e76c641c19826565db8224ae533d8a3
2020-04-15 16:44:06 -04:00
John Sully
fb991c8e95
Log stdout and stderr for cluster tests
...
Former-commit-id: 06143c2e8cab5c201ce41b85fcac70a36f2626c1
2020-04-15 16:35:24 -04:00
John Sully
fc66f768e0
Fix TSAN race
...
Former-commit-id: f00d28fdabe858bd621a1bd98e40493aca5aba1e
2020-04-15 16:34:38 -04:00
John Sully
4ee29a3b25
Fix incorrect cluster slot tracking (regression from merge)
...
Former-commit-id: 4705f29e2f62d90c374e072319c8cd486d32f807
2020-04-15 16:34:07 -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
8675bd3bde
Fix merge issues and move timeout to C++
...
Former-commit-id: 1005a725d498e3c9f8c708d3c8b013a402149bd8
2020-04-14 22:37:26 -04:00
John Sully
68fd7c5c3d
Merge commit 'c3b268a0bcded2d730790a772176483efb7c31fb' into redis_6_merge
...
Former-commit-id: 50768cd242c0360c6e943c57f866789280d30dc0
2020-04-14 22:25:44 -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
9e7c1a13e6
Merge commit '7c07841632500dfdff31f5a69e5bd140abea646c' into redis_6_merge
...
Former-commit-id: 8056e349e0c76519a62ca97e5b754e55b1bac5c0
2020-04-14 21:26:51 -04:00
John Sully
e06e5b0bbc
Merge commit 'b3e0305448422239ba3cb8d125681bccdb809cd3' into redis_6_merge
...
Former-commit-id: 0001f59c8d0724ca42544b209951b6d1d7141ce3
2020-04-14 21:16:38 -04:00
John Sully
7a6933bb15
Merge commit 'e628f94436f2ffb38dd6305f18956f309838a8d6' into redis_6_merge
...
Former-commit-id: 2941792a85653258a36f8eb02189132ec7835242
2020-04-14 21:13:42 -04:00
John Sully
aa48225a76
Merge commit '76d57161d960f27ac92765118e3b80fef8847b8f' into redis_6_merge
...
Former-commit-id: 320bc3c0329ff9e5a980b79426b719addae381cf
2020-04-14 21:04:42 -04:00
John Sully
b20093e2f3
Merge commit 'e74e68c84f5eba8013769087c9a46cab811b8417' into redis_6_merge
...
Former-commit-id: 2825e515504cffcf6000be2e547ab1cbd86441bc
2020-04-14 20:55:29 -04:00
John Sully
1a661c81fe
Merge commit 'baaf869fc3e138cfcb4cfda09f09fd3c87c8f924' into redis_6_merge
...
Former-commit-id: cbdd47d0569cd7dd5d45fa764f3f966a9bf7aee9
2020-04-14 20:44:27 -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
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
12999c17dd
Merge commit 'df83892760d19b1b7e92d76e72daf4834ad2df6c' into redis_6_merge
...
Former-commit-id: cde199a7973ad63317b68f581df607321e12bf46
2020-04-14 19:43:04 -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
5dbcd55669
Merge commit '51c1a9f8fbc12a9276489178242e498bb6ccbdba' into redis_6_merge
...
Former-commit-id: 09e8fb17cd0889ad17461e48446221b3955f5a8f
2020-04-14 18:44:42 -04:00
John Sully
bd73ec5f1e
Merge commit '6fe55c2f299bbb306533af39cb28346bf5d473d3' into redis_6_merge
...
Former-commit-id: d71c4c221580221c2c31b5e3b5d23bab50a544dc
2020-04-14 18:30:26 -04:00
John Sully
7ee5ad6430
Merge commit '721a39ddff0eb9be822d27dba80267f6da149aff' into redis_6_merge
...
Former-commit-id: 6f621e6480fd629593de8b264117a8b130b21175
2020-04-14 18:29:03 -04:00
John Sully
e751664909
Merge commit 'cbabf779c24fd107ca8e4fe6369e4677ad0eda10' into redis_6_merge
...
Former-commit-id: 8e33c2d30116ea469238c340ed367f0182856454
2020-04-14 18:05:10 -04:00
John Sully
8f4c9d6403
Merge commit 'ecd17e819cbb05110a49d81c6fda10e6770a7838' into redis_6_merge
...
Former-commit-id: 52aca124c30815fc1609ce2fb36081823ef5ddef
2020-04-14 18:04:51 -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
antirez
0fac746f0e
PSYNC2: meaningful offset implemented.
...
A very commonly signaled operational problem with Redis master-replicas
sets is that, once the master becomes unavailable for some reason,
especially because of network problems, many times it wont be able to
perform a partial resynchronization with the new master, once it rejoins
the partition, for the following reason:
1. The master becomes isolated, however it keeps sending PINGs to the
replicas. Such PINGs will never be received since the link connection is
actually already severed.
2. On the other side, one of the replicas will turn into the new master,
setting its secondary replication ID offset to the one of the last
command received from the old master: this offset will not include the
PINGs sent by the master once the link was already disconnected.
3. When the master rejoins the partion and is turned into a replica, its
offset will be too advanced because of the PINGs, so a PSYNC will fail,
and a full synchronization will be required.
Related to issue #7002 and other discussion we had in the past around
this problem.
Former-commit-id: 5d6e8fe3e3e43162f0c57f580b6e8432274fca30
2020-04-14 17:56:09 -04:00
Oran Agra
10a7bfe3a2
reduce repeated calls to use_diskless_load
...
this function possibly iterates on the module list
Former-commit-id: 99762dac23e26a217fcd66531ee4ca9b4d13a7ac
2020-04-14 17:34:36 -04:00
John Sully
f084ee6f17
Fix merge conflicts from cherry-pick
...
Former-commit-id: 57956b3fd2d05581c976f58d07e245896d3a515b
2020-04-14 17:33:54 -04:00
