John Sully
c38f94d5d0
Merge branch 'redis_6_merge' into keydbpro
...
Former-commit-id: b0a3bb848937d24dd74de63032306fd92c61dd7b
2020-03-04 17:24:36 -05:00
John Sully
1187fb6afc
Fix CLANG build break
...
Former-commit-id: 5e63c0955d2861ab0ebe2055d4f2d2e8989ea4f3
2020-03-04 17:24:17 -05:00
John Sully
0114827642
Fix CLANG build break
...
Former-commit-id: 5e63c0955d2861ab0ebe2055d4f2d2e8989ea4f3
2020-03-04 17:24:17 -05:00
John Sully
591cc30206
Fix CLANG build break
...
Former-commit-id: e523afa7410399697659106c88e9f65e2cffae79
2020-03-04 17:24:00 -05:00
John Sully
09f08908e2
Fix CLANG build break
...
Former-commit-id: e523afa7410399697659106c88e9f65e2cffae79
2020-03-04 17:24:00 -05:00
John Sully
435bd4c2fb
Fix CLANG build break
...
Former-commit-id: c2a98a60f964f28455a5d04e18b88a9a45c9e586
2020-03-04 17:23:40 -05:00
John Sully
b3e33daf7d
Fix CLANG build break
...
Former-commit-id: c2a98a60f964f28455a5d04e18b88a9a45c9e586
2020-03-04 17:23:40 -05:00
John Sully
7033048f7a
finish merge
...
Former-commit-id: 66063a19f6cdbc87ead8ecbd4887134438ee1ccd
2020-03-04 17:22:57 -05:00
John Sully
a26eec507a
finish merge
...
Former-commit-id: 66063a19f6cdbc87ead8ecbd4887134438ee1ccd
2020-03-04 17:22:57 -05:00
John Sully
4ccd0c7a0f
Merge branch 'redis_6_merge' into keydbpro
...
Former-commit-id: bef19fefeb293e44e31dfefe383eef99e4cd7721
2020-03-04 17:15:54 -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
958b0b110c
Merge branch 'unstable' into redis_6_merge
...
Former-commit-id: 6bc92d6d3182970ebe64184d5be9108321182218
2020-03-04 17:13:50 -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
2105a6300c
Merge branch 'unstable' into RELEASE_5
...
Former-commit-id: 13cf8bbeb7b96e771620cf79dacba9b63cd31591
2020-03-04 17:13:32 -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
6a8fa9eeb1
Add missing files from last checkin
...
Former-commit-id: 60c0d4104de3ff904758c200342e4d132b19501c
2020-03-04 17:13:18 -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
e39dd04f6c
Merge branch 'unstable' into redis_6_merge
...
Former-commit-id: 52fd4445a472fa3112e96c6a7ef66ecdfe6ce9f5
2020-03-04 17:13:01 -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
0a67cb4c6a
Merge branch 'unstable' into RELEASE_5
...
Former-commit-id: 693ba4ed4ad2fe3f9190b8dc8ca5f940d02baf51
2020-03-04 17:09:29 -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
01a85ba7fe
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
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
550413070c
MOTD refactor
...
Former-commit-id: 6c78ec7c41223b3381e19fdf78478f66b4959dc9
2020-03-04 16:22:55 -05:00
John Sully
21fb601851
MOTD refactor
...
Former-commit-id: 6c78ec7c41223b3381e19fdf78478f66b4959dc9
2020-03-04 16:22:55 -05:00
John Sully
864871b57b
Merge branch 'keydbpro' into PRO_RELEASE_6
...
Former-commit-id: 5b89b51192154e66e8ad87ce342a9cd4ab7a0130
2020-03-04 15:34:27 -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
f9c70eff94
Merge branch 'redis_6_merge' into keydbpro
...
Former-commit-id: a14d1d5b55a507a83cf5b85920607a0d013e7037
2020-03-04 15:33:59 -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
bd0bfe4d05
min-clients-per-thread needs to use the new config code
...
Former-commit-id: fed4bd5269a95a24f99d4542ceece09b9ad66d2c
2020-03-04 15:14:41 -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
40b1414e6f
RDB deletion: document it in example redis.conf.
2020-03-04 17:58:05 +01:00
antirez
4983eb6a23
RDB deletion: document it in example redis.conf.
2020-03-04 17:58:05 +01:00
antirez
b3134c8dd3
Make sync RDB deletion configurable. Default to no.
2020-03-04 17:44:21 +01:00
antirez
3bab69e921
Make sync RDB deletion configurable. Default to no.
2020-03-04 17:44:21 +01:00
bodong.ybd
e0cf09cace
Added BITFIELD_RO variants for read-only operations.
2020-03-04 20:51:45 +08:00
bodong.ybd
94376f46ad
Added BITFIELD_RO variants for read-only operations.
2020-03-04 20:51:45 +08:00
antirez
dff91688a6
Check that the file exists in removeRDBUsedToSyncReplicas().
2020-03-04 12:55:49 +01:00
antirez
d16bb64fa4
Check that the file exists in removeRDBUsedToSyncReplicas().
2020-03-04 12:55:49 +01:00
antirez
994b992782
Log RDB deletion in persistence-less instances.
2020-03-04 11:19:55 +01:00
antirez
ff024e3064
Log RDB deletion in persistence-less instances.
2020-03-04 11:19:55 +01:00
antirez
b661704fb5
Introduce bg_unlink().
2020-03-04 11:10:54 +01:00
antirez
f0acdee4c5
Introduce bg_unlink().
2020-03-04 11:10:54 +01:00
Jamie Scott
31fe892339
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
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
0f89436537
Update README.md
...
Former-commit-id: c0882864f2fff0a32899e983ad4fe060eb71c1ad
2020-03-03 13:58:48 -08:00
John Sully
53a66f6a72
Update README.md
...
Former-commit-id: c0882864f2fff0a32899e983ad4fe060eb71c1ad
2020-03-03 13:58:48 -08:00
antirez
1d048a3b46
Remove RDB files used for replication in persistence-less instances.
2020-03-03 14:58:15 +01:00
antirez
5e2319c326
Remove RDB files used for replication in persistence-less instances.
2020-03-03 14:58:15 +01:00
Salvatore Sanfilippo
df8bc67c92
Merge pull request #6804 from qetu3790/unstable
...
Fix not used constant in lru_test_mode.
2020-03-02 17:43:36 +01:00