27350 Commits

Author SHA1 Message Date
John Sully
55cac6609b Update README.md
Former-commit-id: cd3c482d5e36bc82fcef653e8020f68e2ac21938
2019-05-21 00:04:12 -04:00
zhaozhao.zz
4517ac981f Threaded IO: use main thread to handle read work 2019-05-21 11:42:10 +08:00
zhaozhao.zz
1398fac3f1 Threaded IO: use main thread to handle read work 2019-05-21 11:42:10 +08:00
John Sully
dd5152f836 Fix regressions from RESP3 changes in commit c8304b099d82dba4da35f4cfaa99595bcdb46d1a
Former-commit-id: c5cbb77fc7e3b2b5124b9432e144d8c74190c755
2019-05-20 23:39:44 -04:00
John Sully
a7afb4c3f7 Fix regressions from RESP3 changes in commit 317f8b9d383f1b7f171aef7ea29f9e05abf0ba83
Former-commit-id: c5cbb77fc7e3b2b5124b9432e144d8c74190c755
2019-05-20 23:39:44 -04:00
zhaozhao.zz
27dc71f8dc Threaded IO: use main thread to handle write work 2019-05-21 11:37:13 +08:00
zhaozhao.zz
8b33975944 Threaded IO: use main thread to handle write work 2019-05-21 11:37:13 +08:00
John Sully
b7fff89e3e The unstable branch doesn't have a version #
Former-commit-id: d7f21f02b30c3f9092dbf9aec75481baf45c3311
2019-05-20 16:12:26 -04:00
John Sully
7ec3b111af The unstable branch doesn't have a version #
Former-commit-id: d7f21f02b30c3f9092dbf9aec75481baf45c3311
2019-05-20 16:12:26 -04:00
John Sully
7d40b9b7d5 Fix double unlock
Former-commit-id: 87dc8ce9b3e376e4a6264aee1d2787b9f8d6437f
2019-05-20 15:52:04 -04:00
John Sully
be60fc72a5 Fix double unlock
Former-commit-id: 87dc8ce9b3e376e4a6264aee1d2787b9f8d6437f
2019-05-20 15:52:04 -04:00
John Sully
fa828d8c92 Merge branch 'unstable' of https://github.com/JohnSully/redis2 into unstable
Former-commit-id: 2e22aa1a9cd9247a51c03afc161cb84a98139438
2019-05-20 10:57:59 -04:00
John Sully
680b49045f Merge branch 'unstable' of https://github.com/JohnSully/redis2 into unstable
Former-commit-id: 2e22aa1a9cd9247a51c03afc161cb84a98139438
2019-05-20 10:57:59 -04:00
John Sully
a3706352d0 Protocol regression from RESP3 work
Former-commit-id: 8c56dbf971aced9e18d170dfffb0c074b545f718
2019-05-20 10:57:37 -04:00
John Sully
e9b8d4e73a Protocol regression from RESP3 work
Former-commit-id: 8c56dbf971aced9e18d170dfffb0c074b545f718
2019-05-20 10:57:37 -04:00
Qix
36ad4c5907 cast void data pointer to const char * to fix gcc
Former-commit-id: a78169e9e043aea83c3f8b8fbb14e605575f8575
2019-05-19 16:24:39 -04:00
Qix
9b2adb19dd cast void data pointer to const char * to fix gcc
Former-commit-id: a78169e9e043aea83c3f8b8fbb14e605575f8575
2019-05-19 16:24:39 -04:00
John Sully
2783649378 Fix build breaks on some older compilers
Former-commit-id: 39a60c8120ac4a7c2aad83df00a4fbea07a801cc
2019-05-18 20:58:48 -04:00
John Sully
e2b3627360 Fix build breaks on some older compilers
Former-commit-id: 39a60c8120ac4a7c2aad83df00a4fbea07a801cc
2019-05-18 20:58:48 -04:00
John Sully
7074a7615e Fix build break on some compilers
Former-commit-id: c57d8760bd9f824555366d1685b12e959ef36f4c
2019-05-18 20:41:05 -04:00
John Sully
0c359a8245 Fix build break on some compilers
Former-commit-id: c57d8760bd9f824555366d1685b12e959ef36f4c
2019-05-18 20:41:05 -04:00
John Sully
a3556e7cef Merge branch 'unstable' of https://github.com/JohnSully/redis2 into unstable
Former-commit-id: 3eed2a8780f263e8b889174313506c227f57595c
2019-05-18 20:25:23 -04:00
John Sully
2a61b00a3c Merge branch 'unstable' of https://github.com/JohnSully/redis2 into unstable
Former-commit-id: 3eed2a8780f263e8b889174313506c227f57595c
2019-05-18 20:25:23 -04:00
John Sully
7ccf4f2dcf Print nicer error messages for uncaught exceptions
Former-commit-id: 23b0268a7fc1f7116e96905502895a445d2caf76
2019-05-18 20:24:29 -04:00
John Sully
67d94eee12 Print nicer error messages for uncaught exceptions
Former-commit-id: 23b0268a7fc1f7116e96905502895a445d2caf76
2019-05-18 20:24:29 -04:00
John Sully
2dccb832bf Fix: Active replication falls behind under high load
Former-commit-id: 3d0de946bb73a34f96cd773e85c102c2743e6480
2019-05-18 20:23:20 -04:00
John Sully
1d0036882c Fix: Active replication falls behind under high load
Former-commit-id: 3d0de946bb73a34f96cd773e85c102c2743e6480
2019-05-18 20:23:20 -04:00
Salvatore Sanfilippo
7a0a7ec8d2 Merge pull request #6100 from chrizel/typo-fixes
Typo fixes in CONTRIBUTING
2019-05-15 17:48:40 +02:00
Salvatore Sanfilippo
fd0ee469ab
Merge pull request #6100 from chrizel/typo-fixes
Typo fixes in CONTRIBUTING
2019-05-15 17:48:40 +02:00
Christian Zeller
525fc336ef Typo fixes in CONTRIBUTING 2019-05-15 16:10:48 +02:00
Christian Zeller
7fababd44e
Typo fixes in CONTRIBUTING 2019-05-15 16:10:48 +02:00
antirez
6e4635e8fd Update CONTRIBUTING with present info. 2019-05-15 12:46:01 +02:00
antirez
fd9407dfc8 Update CONTRIBUTING with present info. 2019-05-15 12:46:01 +02:00
antirez
9eea57cc31 Narrow the effects of PR #6029 to the exact state.
CLIENT PAUSE may be used, in other contexts, for a long time making all
the slaves time out. Better for now to be more specific about what
should disable senidng PINGs.

An alternative to that would be to virtually refresh the slave
interactions when clients are paused, however for now I went for this
more conservative solution.
2019-05-15 12:16:43 +02:00
antirez
074d24df1e Narrow the effects of PR #6029 to the exact state.
CLIENT PAUSE may be used, in other contexts, for a long time making all
the slaves time out. Better for now to be more specific about what
should disable senidng PINGs.

An alternative to that would be to virtually refresh the slave
interactions when clients are paused, however for now I went for this
more conservative solution.
2019-05-15 12:16:43 +02:00
Salvatore Sanfilippo
3f4f7aff1a Merge pull request #6029 from chendq8/clientpause
fix cluster failover time out
2019-05-15 12:03:19 +02:00
Salvatore Sanfilippo
caf74e507e
Merge pull request #6029 from chendq8/clientpause
fix cluster failover time out
2019-05-15 12:03:19 +02:00
antirez
78978eb5e1 Test: fix slowlog test false positive.
In fast systems "SLOWLOG RESET" is fast enough to don't be logged even
when the time limit is "1" sometimes. Leading to false positives such
as:

[err]: SLOWLOG - can be disabled in tests/unit/slowlog.tcl
Expected '1' to be equal to '0'
2019-05-14 16:55:52 +02:00
antirez
1a1ba48390 Test: fix slowlog test false positive.
In fast systems "SLOWLOG RESET" is fast enough to don't be logged even
when the time limit is "1" sometimes. Leading to false positives such
as:

[err]: SLOWLOG - can be disabled in tests/unit/slowlog.tcl
Expected '1' to be equal to '0'
2019-05-14 16:55:52 +02:00
antirez
d0d1cbbf5c Make comment in getClientOutputBufferMemoryUsage() describing the present. 2019-05-13 17:30:06 +02:00
antirez
9724ca4e22 Make comment in getClientOutputBufferMemoryUsage() describing the present. 2019-05-13 17:30:06 +02:00
antirez
5606036fb4 Fix test false positive introduced by threaded I/O.
Now clients that are ready to be terminated asynchronously are processed
more often in beforeSleep() instead of being processed in serverCron().
This means that the test will not be able to catch the moment the client
was terminated, also note that the 'omem' figure now changes in big
steps, because of the new client output buffers layout.

So we have to change the test range in order to accomodate for that.
Yet the test is useful enough to be worth taking, even if its precision
is reduced by this commit. Probably if we get more problems, a thing
that makes sense is just to check that the limit is < 200k. That's more
than enough actually.
2019-05-13 17:27:10 +02:00
antirez
4f4676a142 Fix test false positive introduced by threaded I/O.
Now clients that are ready to be terminated asynchronously are processed
more often in beforeSleep() instead of being processed in serverCron().
This means that the test will not be able to catch the moment the client
was terminated, also note that the 'omem' figure now changes in big
steps, because of the new client output buffers layout.

So we have to change the test range in order to accomodate for that.
Yet the test is useful enough to be worth taking, even if its precision
is reduced by this commit. Probably if we get more problems, a thing
that makes sense is just to check that the limit is < 200k. That's more
than enough actually.
2019-05-13 17:27:10 +02:00
John Sully
f240fb7803 Update Active Replication wiki links
Former-commit-id: 866b8ead9147e454fe577ec26bb6cf3a502b091f
2019-05-11 21:53:30 -04:00
John Sully
22dc65b35b Update Active Replication wiki links
Former-commit-id: 866b8ead9147e454fe577ec26bb6cf3a502b091f
2019-05-11 21:53:30 -04:00
John Sully
6371f6e3e4 Fix a few issues from the merge
Former-commit-id: aa274960fff095c4c3cd570cdbaaabb9ca005651
2019-05-11 19:26:59 -04:00
John Sully
6205dee978 Fix a few issues from the merge
Former-commit-id: aa274960fff095c4c3cd570cdbaaabb9ca005651
2019-05-11 19:26:59 -04:00
John Sully
e601bc1169 Make lazy free test more reliable
Former-commit-id: 54d6eb851bbea48e858d84bca818cb14c65b6403
2019-05-11 17:57:35 -04:00
John Sully
25a904605a Make lazy free test more reliable
Former-commit-id: 54d6eb851bbea48e858d84bca818cb14c65b6403
2019-05-11 17:57:35 -04:00
John Sully
397e85befb Merge branch 'unstable' of https://github.com/antirez/redis into MergeRedis
Note: some tests failing

Former-commit-id: 86d7276f24f0cf1a0eceb6cd00a6a0ae2a0fa520
2019-05-11 02:20:34 -04:00