15250 Commits

Author SHA1 Message Date
John Sully
09f08908e2 Fix CLANG build break
Former-commit-id: e523afa7410399697659106c88e9f65e2cffae79
2020-03-04 17:24:00 -05:00
John Sully
b3e33daf7d Fix CLANG build break
Former-commit-id: c2a98a60f964f28455a5d04e18b88a9a45c9e586
2020-03-04 17:23:40 -05:00
John Sully
a26eec507a finish merge
Former-commit-id: 66063a19f6cdbc87ead8ecbd4887134438ee1ccd
2020-03-04 17:22:57 -05:00
John Sully
b29f96e007 Merge branch 'redis_6_merge' into keydbpro
Former-commit-id: bef19fefeb293e44e31dfefe383eef99e4cd7721
2020-03-04 17:15:54 -05:00
John Sully
2833febaa5 Merge branch 'unstable' into redis_6_merge
Former-commit-id: 6bc92d6d3182970ebe64184d5be9108321182218
2020-03-04 17:13:50 -05:00
John Sully
43befe9985 Merge branch 'unstable' into RELEASE_5
Former-commit-id: 13cf8bbeb7b96e771620cf79dacba9b63cd31591
2020-03-04 17:13:32 -05:00
John Sully
3dbe23f513 Add missing files from last checkin
Former-commit-id: 60c0d4104de3ff904758c200342e4d132b19501c
2020-03-04 17:13:18 -05:00
John Sully
a669a40ac6 Merge branch 'unstable' into redis_6_merge
Former-commit-id: 52fd4445a472fa3112e96c6a7ef66ecdfe6ce9f5
2020-03-04 17:13:01 -05:00
John Sully
6a254a8d39 Merge branch 'unstable' into RELEASE_5
Former-commit-id: 693ba4ed4ad2fe3f9190b8dc8ca5f940d02baf51
2020-03-04 17:09:29 -05:00
John Sully
de2b08c3f8 Add extra logging when reporting errors from masters - especially in rreplay
Former-commit-id: 5397f0b03312b8cace07a85333d8f035bdfb8d57
2020-03-04 17:09:12 -05:00
John Sully
21fb601851 MOTD refactor
Former-commit-id: 6c78ec7c41223b3381e19fdf78478f66b4959dc9
2020-03-04 16:22:55 -05:00
John Sully
c2d223e3ba Merge branch 'keydbpro' into PRO_RELEASE_6
Former-commit-id: 5b89b51192154e66e8ad87ce342a9cd4ab7a0130
2020-03-04 15:34:27 -05:00
John Sully
a18c883f2c Merge branch 'redis_6_merge' into keydbpro
Former-commit-id: a14d1d5b55a507a83cf5b85920607a0d013e7037
2020-03-04 15:33:59 -05:00
John Sully
bffd982853 min-clients-per-thread needs to use the new config code
Former-commit-id: fed4bd5269a95a24f99d4542ceece09b9ad66d2c
2020-03-04 15:14:41 -05:00
antirez
4983eb6a23 RDB deletion: document it in example redis.conf. 2020-03-04 17:58:05 +01:00
antirez
3bab69e921 Make sync RDB deletion configurable. Default to no. 2020-03-04 17:44:21 +01:00
bodong.ybd
94376f46ad Added BITFIELD_RO variants for read-only operations. 2020-03-04 20:51:45 +08:00
antirez
d16bb64fa4 Check that the file exists in removeRDBUsedToSyncReplicas(). 2020-03-04 12:55:49 +01:00
antirez
ff024e3064 Log RDB deletion in persistence-less instances. 2020-03-04 11:19:55 +01:00
antirez
f0acdee4c5 Introduce bg_unlink(). 2020-03-04 11:10:54 +01:00
Jamie Scott
2f3bfd1c13
Update Redis.conf to improve TLS usability
When using TLS with a Redis.conf file the line for TLS reading tls-cert-file redis.crt tls-key-file redis.key is interpreted as one complete directive. I am separating this on two separate lines to improve usability so users do not get the below error.

ubuntu@ip-172-31-29-250:~/redis-6.0-rc1$ ./src/redis-server redis.conf 

*** FATAL CONFIG FILE ERROR ***
Reading the configuration file, at line 145
>>> 'tls-cert-file redis.crt tls-key-file redis.key'
wrong number of arguments
ubuntu@ip-172-31-29-250:~/redis-6.0-rc1$ vi redis.conf 
ubuntu@ip-172-31-29-250:~/redis-6.0-rc1$ ./src/redis-server redis.conf 
23085:C 04 Mar 2020 01:58:12.631 # oO0OoO0OoO0Oo Redis is starting oO0OoO0OoO0Oo
23085:C 04 Mar 2020 01:58:12.631 # Redis version=5.9.101, bits=64, commit=00000000, modified=0, pid=23085, just started
23085:C 04 Mar 2020 01:58:12.631 # Configuration loaded
23085:M 04 Mar 2020 01:58:12.632 * Increased maximum number of open files to 10032 (it was originally set to 1024).
2020-03-03 18:03:16 -08:00
John Sully
53a66f6a72 Update README.md
Former-commit-id: c0882864f2fff0a32899e983ad4fe060eb71c1ad
2020-03-03 13:58:48 -08:00
antirez
5e2319c326 Remove RDB files used for replication in persistence-less instances. 2020-03-03 14:58:15 +01:00
Salvatore Sanfilippo
f88f8661ac
Merge pull request #6804 from qetu3790/unstable
Fix not used constant in lru_test_mode.
2020-03-02 17:43:36 +01:00
Salvatore Sanfilippo
d3e8f3fb62
Merge pull request #6923 from hwware/marcofix
add missing marco in sdsalloc.h
2020-03-02 17:07:41 +01:00
Salvatore Sanfilippo
bd07f121b9
Merge pull request #6944 from ShooterIT/acl-compiler-warning
To avoid compiler warnings
2020-03-02 16:53:17 +01:00
antirez
6dd8de1774 Use a smaller getkeys global buffer.
The idea is that very few commands have a lot of keys, and when this
happens the allocation time becomes neglegible.
2020-03-02 16:49:11 +01:00
Salvatore Sanfilippo
7ca81170c7
Merge pull request #6836 from oranagra/opt_get_keys_malloc
Optimize temporary memory allocations for getKeysFromCommand mechanism
2020-03-02 16:48:05 +01:00
John Sully
eb1c6d5743 Merge branch 'keydbpro' into PRO_RELEASE_6
Former-commit-id: 51e889277c59adb25a8724b25706631e6adca366
2020-03-01 22:17:04 -05:00
John Sully
87b36b00df Add option to build pro without license checks
Former-commit-id: 0713518d2f34559a06db31a9023228b91ce60af3
2020-03-01 22:16:25 -05:00
John Sully
aff45e1cde Merge branch 'redis_6_merge' into keydbpro
Former-commit-id: 656bacd614f359742f6bd2df3fd2009c44c3d788
2020-03-01 21:49:21 -05:00
John Sully
529b860f85 Merge branch 'unstable' into redis_6_merge
Former-commit-id: 1a7e2e663e0ebabdf51ec8b6bd50d8a4c8a611c8
2020-03-01 21:48:51 -05:00
John Sully
a6a0400b86 Merge branch 'unstable' into RELEASE_5
Former-commit-id: faa87ed8393c9f020ba85da1d30f81bca4cf8202
2020-03-01 21:43:21 -05:00
John Sully
de3d796eb7 Update tests to reflect new CRON name (keydb.cron)
Former-commit-id: 83f585e30ab9d37408c79b74e2536664325a051f
2020-03-01 21:42:01 -05:00
benschermel
7785fa981a Merge branch 'unstable' into RELEASE_5
Former-commit-id: 7a244bb847491f992e15c4e9c55473ffd734a8ec
2020-03-01 19:53:32 -05:00
John Sully
3e3fa1a248 Merge branch 'keydbpro' into PRO_RELEASE_6
Former-commit-id: 197022aa76949664dfd866e0e71602bf23cbc3a0
2020-03-01 19:18:56 -05:00
John Sully
51b6e9eb3f Merge branch 'redis_6_merge' into keydbpro
Former-commit-id: 4e8000d43cd4e23c90bf7e262835fae5ae6da34d
2020-03-01 19:18:34 -05:00
John Sully
0648930af4 Rename cron command to KEYDB.CRON and add help
Former-commit-id: 1b925119b5ad24ab3a91763bf9f4633f5bc9fef4
2020-03-01 19:18:21 -05:00
John Sully
765ffea018 Rename cron command to KEYDB.CRON and add help
Former-commit-id: 3eb847e28f6df45528dcebc6761290ff60248e78
2020-03-01 19:17:58 -05:00
ShooterIT
98b23cce29 Avoid compiler warnings 2020-02-29 18:28:41 +08:00
John Sully
72c0b918b4 Bump version
Former-commit-id: e5776fd1a05b329c3113b94d26fba9e39816644f
2020-02-29 00:04:24 -05:00
John Sully
7e04a6d97e Merge branch 'keydbpro' into PRO_RELEASE_6
Former-commit-id: e559a947e6d233146416e68a7c69d4e9b2eadd6c
2020-02-29 00:03:55 -05:00
John Sully
b5b8e0e194 Merge branch 'redis_6_merge' into keydbpro
Former-commit-id: a60d71e13335bdf231b5f1bec61b457056dc5e0a
2020-02-28 23:57:45 -05:00
John Sully
d5ed6f1b5e Merge branch 'unstable' into redis_6_merge
Former-commit-id: 9dc8f30e4783d7e2e9749b155f6bf3df57c536a7
2020-02-28 23:56:26 -05:00
John Sully
ef291b246e Bump version
Former-commit-id: 3ce6441a0c0f5c58f31f5fa28116cea09aebbf35
2020-02-28 23:53:54 -05:00
John Sully
42b6305fbc Merge branch 'unstable' into RELEASE_5
Former-commit-id: 6d00a1a5cf86f69bc9204973adb67a4e215260bd
2020-02-28 23:53:00 -05:00
John Sully
ec4eb534d7 Fix compile failure on raspberry pi machines, issue #141
Former-commit-id: aaca32a5cd1bdb0314b4a57847938854b8a4fef2
2020-02-28 23:49:17 -05:00
John Sully
f68f3d0d14 Fix not respecting max clients config, issue #147
Former-commit-id: 54c96d19954fbddcfd2a307e436ca3290c76e0fb
2020-02-28 22:04:42 -05:00
John Sully
1db49c5897 Fix issue #146
Former-commit-id: e5a2d594464a965f36e4cbf924f02929265186e6
2020-02-28 21:21:05 -05:00
antirez
c8ae90fef6 Modules: reformat RM_Scan() top comment a bit. 2020-02-28 18:09:46 +01:00