From 3841236074d6e318a4f47a69ce21780ecc83a22a Mon Sep 17 00:00:00 2001 From: antirez Date: Tue, 11 Sep 2018 10:51:47 +0200 Subject: Slave removal: remove slave from the README. --- README.md | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) (limited to 'README.md') diff --git a/README.md b/README.md index 8dbad7dbf..36a4e0442 100644 --- a/README.md +++ b/README.md @@ -119,7 +119,7 @@ parameter (the path of the configuration file): It is possible to alter the Redis configuration by passing parameters directly as options using the command line. Examples: - % ./redis-server --port 9999 --slaveof 127.0.0.1 6379 + % ./redis-server --port 9999 --replicaof 127.0.0.1 6379 % ./redis-server /etc/redis/6379.conf --loglevel debug All the options in redis.conf are also supported as options using the command @@ -245,7 +245,7 @@ A few important fields in this structure are: * `server.db` is an array of Redis databases, where data is stored. * `server.commands` is the command table. * `server.clients` is a linked list of clients connected to the server. -* `server.master` is a special client, the master, if the instance is a slave. +* `server.master` is a special client, the master, if the instance is a replica. There are tons of other fields. Most fields are commented directly inside the structure definition. @@ -323,7 +323,7 @@ Inside server.c you can find code that handles other vital things of the Redis s networking.c --- -This file defines all the I/O functions with clients, masters and slaves +This file defines all the I/O functions with clients, masters and replicas (which in Redis are just special clients): * `createClient()` allocates and initializes a new client. @@ -390,16 +390,16 @@ replication.c This is one of the most complex files inside Redis, it is recommended to approach it only after getting a bit familiar with the rest of the code base. -In this file there is the implementation of both the master and slave role +In this file there is the implementation of both the master and replica role of Redis. -One of the most important functions inside this file is `replicationFeedSlaves()` that writes commands to the clients representing slave instances connected -to our master, so that the slaves can get the writes performed by the clients: +One of the most important functions inside this file is `replicationFeedSlaves()` that writes commands to the clients representing replica instances connected +to our master, so that the replicas can get the writes performed by the clients: this way their data set will remain synchronized with the one in the master. This file also implements both the `SYNC` and `PSYNC` commands that are used in order to perform the first synchronization between masters and -slaves, or to continue the replication after a disconnection. +replicas, or to continue the replication after a disconnection. Other C files --- -- cgit v1.2.1