21057 Commits

Author SHA1 Message Date
John Sully
0c359a8245 Fix build break on some compilers
Former-commit-id: c57d8760bd9f824555366d1685b12e959ef36f4c
2019-05-18 20:41:05 -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
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
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
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
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
John Sully
e48c132d35 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
John Sully
35a4c694e6 Add byline to logo
Former-commit-id: 09186514381019ce6d07f5d0d78d19e229b00c84
2019-05-10 23:48:14 -04:00
John Sully
b9b955044b Add byline to logo
Former-commit-id: 09186514381019ce6d07f5d0d78d19e229b00c84
2019-05-10 23:48:14 -04:00
Salvatore Sanfilippo
d7dd023bfd Merge pull request #6053 from soloestoy/enhance-aof-fsync-everysec
aof: enhance AOF_FSYNC_EVERYSEC, more details in #5985
2019-05-10 18:06:40 +02:00
Salvatore Sanfilippo
e633254ccf
Merge pull request #6053 from soloestoy/enhance-aof-fsync-everysec
aof: enhance AOF_FSYNC_EVERYSEC, more details in #5985
2019-05-10 18:06:40 +02:00
Salvatore Sanfilippo
2395eeb6e0 Merge pull request #6074 from trevor211/fixActiveExpire
Do not active expire keys in the background when the switch is off.
2019-05-10 12:39:35 +02:00
Salvatore Sanfilippo
34f6d94701
Merge pull request #6074 from trevor211/fixActiveExpire
Do not active expire keys in the background when the switch is off.
2019-05-10 12:39:35 +02:00
Salvatore Sanfilippo
472ac2de18 Merge pull request #6080 from soloestoy/fix-makefile
Makefile: 1TD -> STD
2019-05-10 12:37:07 +02:00
Salvatore Sanfilippo
1e9b8d853d
Merge pull request #6080 from soloestoy/fix-makefile
Makefile: 1TD -> STD
2019-05-10 12:37:07 +02:00
Salvatore Sanfilippo
4d889fd390 Merge pull request #6073 from yossigo/fix/blocked-client-id
Preserve client->id for blocked clients.
2019-05-10 12:32:47 +02:00
Salvatore Sanfilippo
2903c56bda
Merge pull request #6073 from yossigo/fix/blocked-client-id
Preserve client->id for blocked clients.
2019-05-10 12:32:47 +02:00
Salvatore Sanfilippo
a16964bac7 Merge pull request #6081 from Happy4Code/mod_comments
change the comments there may have a mis type
2019-05-10 12:28:12 +02:00
Salvatore Sanfilippo
6b490e33c4
Merge pull request #6081 from Happy4Code/mod_comments
change the comments there may have a mis type
2019-05-10 12:28:12 +02:00
Salvatore Sanfilippo
330835e25a Merge pull request #6077 from zltl/patch-7
delete sdsTest() from REDIS_TEST in server.c to fix build failed
2019-05-10 12:27:47 +02:00
Salvatore Sanfilippo
891f4a38f6
Merge pull request #6077 from zltl/patch-7
delete sdsTest() from REDIS_TEST in server.c to fix build failed
2019-05-10 12:27:47 +02:00
Salvatore Sanfilippo
3ef55a1e77 Merge pull request #6083 from tangquanawj/fix-inappropriate-add-operation-code
fix-inappropriate-add-operation-code
2019-05-10 12:25:18 +02:00
Salvatore Sanfilippo
433f763814
Merge pull request #6083 from tangquanawj/fix-inappropriate-add-operation-code
fix-inappropriate-add-operation-code
2019-05-10 12:25:18 +02:00
Salvatore Sanfilippo
ebd56c0ff3 Merge pull request #6086 from yongman/fix-uint64-in-defrag
Fix uint64_t hash value in active defrag
2019-05-10 12:23:59 +02:00
Salvatore Sanfilippo
402b0d0bd1
Merge pull request #6086 from yongman/fix-uint64-in-defrag
Fix uint64_t hash value in active defrag
2019-05-10 12:23:59 +02:00
John Sully
1efbf15086 Fix CentOS build failure
Former-commit-id: 272d9297b6c022abbd4eeef890a0e1f41fc0536d
2019-05-09 19:54:34 -04:00
John Sully
0f2c05adea Fix CentOS build failure
Former-commit-id: 272d9297b6c022abbd4eeef890a0e1f41fc0536d
2019-05-09 19:54:34 -04:00
John Sully
3f9b9fd718 build break fix
Former-commit-id: 42e1ded55fa33f8a45dc0041fd4c6376eab5f0b9
2019-05-09 19:16:31 -04:00
John Sully
6e00cc15dd build break fix
Former-commit-id: 42e1ded55fa33f8a45dc0041fd4c6376eab5f0b9
2019-05-09 19:16:31 -04:00
John Sully
b57a72fa2c Fix issue #11
Former-commit-id: 6c410af5a89aa9c11df67e04d1cfbde55aa7fe90
2019-05-09 19:14:10 -04:00
John Sully
4aa0008f7f Fix issue #11
Former-commit-id: 6c410af5a89aa9c11df67e04d1cfbde55aa7fe90
2019-05-09 19:14:10 -04:00
John Sully
57539d2ce4 Add missing file
Former-commit-id: 7896ca6e52b9caa9d8ab78145f16872fe488c4bb
2019-05-09 19:05:09 -04:00
John Sully
cfd9b5e6ee Add missing file
Former-commit-id: 7896ca6e52b9caa9d8ab78145f16872fe488c4bb
2019-05-09 19:05:09 -04:00
John Sully
58b4650c5a Change debug messages to reference KeyDB
Former-commit-id: c4a315dd5ece321dad02401356d9523e54f91024
2019-05-09 19:03:50 -04:00
John Sully
d74a109d6e Change debug messages to reference KeyDB
Former-commit-id: c4a315dd5ece321dad02401356d9523e54f91024
2019-05-09 19:03:50 -04:00
John Sully
3d2b9e3ab8 Fix module locking issues
Former-commit-id: bf26959b722285f9b8caedb853e712d5b4ce6b3f
2019-05-09 19:00:27 -04:00
John Sully
e69b51a6d4 Fix module locking issues
Former-commit-id: bf26959b722285f9b8caedb853e712d5b4ce6b3f
2019-05-09 19:00:27 -04:00
Angus Pearson
8752868c1d Enlarge error buffer in redis-check-aof.c to remove compiler warning of output truncation through snprintf format string 2019-05-08 12:13:45 +01:00
Angus Pearson
a1fb0be1d7 Enlarge error buffer in redis-check-aof.c to remove compiler warning of output truncation through snprintf format string 2019-05-08 12:13:45 +01:00
yongman
58fb679d82 Fix uint64_t hash value in active defrag 2019-05-08 16:29:16 +08:00
yongman
fb4ee7f0c5 Fix uint64_t hash value in active defrag 2019-05-08 16:29:16 +08:00
唐权
8713082973 Update ziplist.c
Hi, @antirez

In the code, to get the size of ziplist, "unsigned int bytes = ZIPLIST_HEADER_SIZE+1;" is correct, 
but why not make it more readable and easy to understand
2019-05-08 12:53:56 +08:00