27350 Commits

Author SHA1 Message Date
John Sully
81c5af353b Fix bug where we don't correctly process maxmemory during bgsave
Former-commit-id: a0f2694d15784628df5d5ecb72b42c2979100f93
2020-05-08 00:14:55 -04:00
John Sully
a3b80c293b Be *much* more aggressive flushing memory
Former-commit-id: f0bdc4fb5fce02d79c1aa2bcf384aa06580ff9e1
2020-05-07 23:07:31 -04:00
John Sully
46b091464c Be *much* more aggressive flushing memory
Former-commit-id: f0bdc4fb5fce02d79c1aa2bcf384aa06580ff9e1
2020-05-07 23:07:31 -04:00
John Sully
22b46fa2f2 Disable cluster tests
They are unreliable on slow hardware.

Former-commit-id: 86f9ed6248c6629af026e27d14d15a3eb50a2090
2020-05-07 01:49:04 -04:00
John Sully
e28d3b33c7 Disable cluster tests
They are unreliable on slow hardware.

Former-commit-id: 86f9ed6248c6629af026e27d14d15a3eb50a2090
2020-05-07 01:49:04 -04:00
ShooterIT
5da4bad713 Use dictSize to get the size of dict in dict.c 2020-05-07 11:04:08 +08:00
ShooterIT
4afa243ff1 Use dictSize to get the size of dict in dict.c 2020-05-07 11:04:08 +08:00
antirez
7cbfa3c45d stringmatchlen() should not expect null terminated strings. 2020-05-06 16:18:21 +02:00
antirez
e17f9311c8 stringmatchlen() should not expect null terminated strings. 2020-05-06 16:18:21 +02:00
Salvatore Sanfilippo
10d4bc8808 Merge pull request #7201 from braddunbar/stringmatchlen
Remove unreachable branch.
2020-05-06 16:17:10 +02:00
Salvatore Sanfilippo
2e2f57e23b
Merge pull request #7201 from braddunbar/stringmatchlen
Remove unreachable branch.
2020-05-06 16:17:10 +02:00
Salvatore Sanfilippo
44addd7ab7 Merge pull request #7207 from hwware/redisconffixx
add jemalloc-bg-thread config in redis conf
2020-05-06 15:42:03 +02:00
Salvatore Sanfilippo
028eb45723
Merge pull request #7207 from hwware/redisconffixx
add jemalloc-bg-thread config in redis conf
2020-05-06 15:42:03 +02:00
Salvatore Sanfilippo
50536d349b Merge pull request #7206 from hwware/lolwutmarcofix
add include guard for lolwut.h
2020-05-06 15:40:26 +02:00
Salvatore Sanfilippo
18c4c7bfe7
Merge pull request #7206 from hwware/lolwutmarcofix
add include guard for lolwut.h
2020-05-06 15:40:26 +02:00
hwware
edfd415ca2 add jemalloc-bg-thread config in redis conf 2020-05-06 01:07:17 -04:00
hwware
9cfb1c88d6 add jemalloc-bg-thread config in redis conf 2020-05-06 01:07:17 -04:00
hwware
04ee24e43f add include guard for lolwut.h 2020-05-05 23:35:08 -04:00
hwware
24173d11bf add include guard for lolwut.h 2020-05-05 23:35:08 -04:00
Salvatore Sanfilippo
7e27d7b6b2 Merge pull request #7175 from bsergean/bsergean-patch-1
redis-cli cluster reshard does not work with ACL (AUTH2 MIGRATE args un-implemented)
2020-05-05 18:22:24 +02:00
Salvatore Sanfilippo
54cb8214d9
Merge pull request #7175 from bsergean/bsergean-patch-1
redis-cli cluster reshard does not work with ACL (AUTH2 MIGRATE args un-implemented)
2020-05-05 18:22:24 +02:00
ShooterIT
133df5a311 Redis Benchmark: Fix coredump because of double free 2020-05-05 23:09:45 +08:00
ShooterIT
150ba0e1ff Redis Benchmark: Fix coredump because of double free 2020-05-05 23:09:45 +08:00
Brad Dunbar
b53fbf167f Remove unreachable branch. 2020-05-05 09:57:01 -04:00
Brad Dunbar
5508c228e7
Remove unreachable branch. 2020-05-05 09:57:01 -04:00
antirez
7dc3d5c1b8 Don't propagate spurious MULTI on DEBUG LOADAOF. 2020-05-05 15:50:00 +02:00
antirez
373a3384ac Don't propagate spurious MULTI on DEBUG LOADAOF. 2020-05-05 15:50:00 +02:00
antirez
634ba2237a Dump recent backlog on master query generating errors. 2020-05-05 13:40:33 +02:00
antirez
51ab31dbab Dump recent backlog on master query generating errors. 2020-05-05 13:40:33 +02:00
antirez
d0724c2ad4 Merge branch 'unstable' of github.com:/antirez/redis into unstable 2020-05-05 13:19:01 +02:00
antirez
415c4f613c Merge branch 'unstable' of github.com:/antirez/redis into unstable 2020-05-05 13:19:01 +02:00
antirez
e7c236b187 Test: --dont-clean should do first cleanup. 2020-05-05 13:18:53 +02:00
antirez
e49d97298a Test: --dont-clean should do first cleanup. 2020-05-05 13:18:53 +02:00
Salvatore Sanfilippo
898a50e69f Merge pull request #7200 from titouanc/fix-redis6-uclibc
make struct user anonymous (only typedefed) in server.h
2020-05-05 11:42:43 +02:00
Salvatore Sanfilippo
64347aaaf9
Merge pull request #7200 from titouanc/fix-redis6-uclibc
make struct user anonymous (only typedefed) in server.h
2020-05-05 11:42:43 +02:00
Titouan Christophe
405f435b37 make struct user anonymous (only typedefed)
This works because this struct is never referenced by its name,
but always by its type.

This prevents a conflict with struct user from <sys/user.h>
when compiling against uclibc.

Signed-off-by: Titouan Christophe <titouan.christophe@railnova.eu>
2020-05-05 11:35:03 +02:00
Titouan Christophe
1f246bfcc8 make struct user anonymous (only typedefed)
This works because this struct is never referenced by its name,
but always by its type.

This prevents a conflict with struct user from <sys/user.h>
when compiling against uclibc.

Signed-off-by: Titouan Christophe <titouan.christophe@railnova.eu>
2020-05-05 11:35:03 +02:00
Salvatore Sanfilippo
a987299b76 Merge pull request #7197 from bsergean/patch-1
Add --user argument to redis-benchmark.c (ACL)
2020-05-05 10:28:35 +02:00
Salvatore Sanfilippo
140c20fb5e
Merge pull request #7197 from bsergean/patch-1
Add --user argument to redis-benchmark.c (ACL)
2020-05-05 10:28:35 +02:00
antirez
5f7634b465 Drop not needed part from #7194. 2020-05-05 10:27:27 +02:00
antirez
5fdc5e5c25 Drop not needed part from #7194. 2020-05-05 10:27:27 +02:00
Salvatore Sanfilippo
4a77e32031 Merge pull request #7194 from tryfinally/dev-reverse-bits
Fixed compiler warnings on rev(ulong) function
2020-05-05 10:26:02 +02:00
Salvatore Sanfilippo
154e735c46
Merge pull request #7194 from tryfinally/dev-reverse-bits
Fixed compiler warnings on rev(ulong) function
2020-05-05 10:26:02 +02:00
antirez
dd4efadb21 Move CRC64 initialization in main(). 2020-05-05 10:20:48 +02:00
antirez
8257a3c1f6 Move CRC64 initialization in main(). 2020-05-05 10:20:48 +02:00
antirez
825e1df189 Fix CRC64 initialization outside the Redis server itself. 2020-05-05 10:09:28 +02:00
antirez
1063f1d833 Fix CRC64 initialization outside the Redis server itself. 2020-05-05 10:09:28 +02:00
Benjamin Sergeant
8a3741342e Add --user argument to redis-benchmark.c (ACL) 2020-05-04 08:09:21 -07:00
Benjamin Sergeant
538c2b2d8d
Add --user argument to redis-benchmark.c (ACL) 2020-05-04 08:09:21 -07:00
Muhammad Zahalqa
16956ce2a6 Fix compiler warnings on function rev(unsigned long) 2020-05-04 12:36:01 +03:00