diff options
| author | Binbin <binloveplay1314@qq.com> | 2022-03-27 17:03:38 +0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-03-27 12:03:38 +0300 |
| commit | f25e688e2acae8329ed97cab163fc4852e4dd5d2 (patch) | |
| tree | c17bbf3208e1dadac98ff9b6b49b38c2be55aa5b /redis.conf | |
| parent | 3bcc67d14f5fcdfb1a44e216fe4aaef3533028f8 (diff) | |
| download | redis-f25e688e2acae8329ed97cab163fc4852e4dd5d2.tar.gz | |
Cleanups in redis.conf (#10452)
Did some cleanups:
1. local local typo
2. replace the only slave word in the file
3. add FUNCTION FLUSH to `lazyfree-lazy-user-flush` description
4. thought it would be better to use these, there are actually "four" options
5. the the typo
6. remove a extra space
7. change comment next to `activedefrag no` to match the default value
Diffstat (limited to 'redis.conf')
| -rw-r--r-- | redis.conf | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/redis.conf b/redis.conf index 1b8a62b60..34b755718 100644 --- a/redis.conf +++ b/redis.conf @@ -126,7 +126,7 @@ protected-mode yes # # no - Block for any connection (remain immutable) # yes - Allow for any connection (no protection) -# local - Allow only for local local connections. Ones originating from the +# local - Allow only for local connections. Ones originating from the # IPv4 address (127.0.0.1), IPv6 address (::1) or Unix domain sockets. # # enable-protected-configs no @@ -627,7 +627,7 @@ repl-diskless-sync-max-replicas 0 # # In many cases the disk is slower than the network, and storing and loading # the RDB file may increase replication time (and even increase the master's -# Copy on Write memory and slave buffers). +# Copy on Write memory and replica buffers). # However, parsing the RDB file directly from the socket may mean that we have # to flush the contents of the current database before the full rdb was # received. For this reason we have the following options: @@ -1224,7 +1224,7 @@ replica-lazy-flush no lazyfree-lazy-user-del no -# FLUSHDB, FLUSHALL, and SCRIPT FLUSH support both asynchronous and synchronous +# FLUSHDB, FLUSHALL, SCRIPT FLUSH and FUNCTION FLUSH support both asynchronous and synchronous # deletion, which can be controlled by passing the [SYNC|ASYNC] flags into the # commands. When neither flag is passed, this directive will be used to determine # if the data should be deleted asynchronously. @@ -1287,7 +1287,7 @@ lazyfree-lazy-user-flush no # attempt to have background child processes killed before all others, and # replicas killed before masters. # -# Redis supports three options: +# Redis supports these options: # # no: Don't make changes to oom-score-adj (default). # yes: Alias to "relative" see below. @@ -1640,7 +1640,7 @@ aof-timestamp-enabled no # cluster-replica-no-failover no # This option, when set to yes, allows nodes to serve read traffic while the -# the cluster is in a down state, as long as it believes it owns the slots. +# cluster is in a down state, as long as it believes it owns the slots. # # This is useful for two cases. The first case is for when an application # doesn't require consistency of data during node failures or network partitions. @@ -1958,7 +1958,7 @@ activerehashing yes # The limit can be set differently for the three different classes of clients: # # normal -> normal clients including MONITOR clients -# replica -> replica clients +# replica -> replica clients # pubsub -> clients subscribed to at least one pubsub channel or pattern # # The syntax of every client-output-buffer-limit directive is the following: @@ -2164,7 +2164,7 @@ rdb-save-incremental-fsync yes # defragmentation process. If you are not sure about what they mean it is # a good idea to leave the defaults untouched. -# Enabled active defragmentation +# Active defragmentation is disabled by default # activedefrag no # Minimum amount of fragmentation waste to start active defrag |