Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

#148 Replaced Master and Slave with Primary and Replica where applicable #177

Merged
merged 2 commits into from
Oct 12, 2024

Conversation

nastena1606
Copy link
Collaborator

The labels, commands and command outputs keep master and slave. Added a note about using master and slave to replication page

Copy link
Member

@madolson madolson left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I also see a reference in replconf.md.
In replication.md, we should include references to primaryauth as the preferred alternative to mastauth.

All the updates look good, mostly suggesting some additional changes.

commands/client-list.md Show resolved Hide resolved
commands/replicaof.md Show resolved Hide resolved
commands/replicaof.md Outdated Show resolved Hide resolved
topics/cluster-spec.md Show resolved Hide resolved
topics/cluster-spec.md Show resolved Hide resolved
topics/cluster-spec.md Show resolved Hide resolved
topics/cluster-spec.md Show resolved Hide resolved
@madolson madolson linked an issue Sep 29, 2024 that may be closed by this pull request
…e applicable

The labels, commands and command outputs keep master and slave.
Added a note about using master and slave to replication page

Signed-off-by: Anastasia Alexadrova <[email protected]>
@nastena1606 nastena1606 force-pushed the 148-Rename-master-replica branch from 6311dde to af26d5f Compare September 30, 2024 11:29
topics/migration.md Outdated Show resolved Hide resolved
Signed-off-by: Madelyn Olson <[email protected]>
@@ -339,7 +339,7 @@ example "write deny-oom". The set of flags are:
Starting from Redis OSS 7.0 this flag has been deprecated.
Declaring a command as "random" can be done using
command tips, see https://valkey.io/topics/command-tips.
* **"allow-stale"**: The command is allowed to run on slaves that don't
* **"allow-stale"**: The command is allowed to run on replicas that don't
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This file is generated from the various comment blocks in https://github.com/valkey-io/valkey/blob/unstable/src/module.c, so can you also submit a PR to update this file in the main repo as well?

@madolson madolson merged commit 77de0ff into valkey-io:main Oct 12, 2024
2 checks passed
@zuiderkwast
Copy link
Contributor

Awesome. Sorry I didn't review this. I just noticed the note "A note about the word slave used in this man page" is on various pages, for example on commands/role.md. It should probably be updated to the version you used in the migration guide, the version mentioning master and slave.

I did a git grep:

$ git grep 'about the word'
commands/cluster-nodes.md:**A note about the word slave used in this man page and command name**: If not for Redis OSS compatibility, the Valkey project does not use the word slave. Unfortunately in this command the word slave is part of the protocol, so we'll be able to remove such occurrences only when this API will be naturally deprecated.
commands/cluster-slaves.md:**A note about the word slave used in this man page and command name**: If not for Redis OSS compatibility, the Valkey project does not use the word slave. Please use the new command `CLUSTER REPLICAS`. The command `CLUSTER SLAVES` will continue to work for backward compatibility.
commands/info.md:**A note about the word slave used in this man page**: If not for backward compatibility, the Valkey project no longer uses the word slave. Unfortunately in this command the word slave is part of the protocol, so we'll be able to remove such occurrences only when this API will be naturally deprecated.
commands/memory-stats.md:**A note about the word slave used in this man page**: If not for Redis OSS compatibility, the Valkey project does not use the word slave. Unfortunately in this command the word slave is part of the protocol, so we'll be able to remove such occurrences only when this API will be naturally deprecated.
commands/role.md:**A note about the word slave used in this man page**: If not for Redis OSS compatibility, the Valkey project does not use the word slave. Unfortunately in this command the word slave is part of the protocol, so we'll be able to remove such occurrences only when this API will be naturally deprecated.
commands/slaveof.md:**A note about the word slave used in this man page and command name**: If not for Redis OSS compatibility, the Valkey project does not use the word slave. Please use the new command `REPLICAOF`. The command `SLAVEOF` will continue to work for backward compatibility.
topics/sentinel.md:**A note about the words "master" and "slave" used in this man page**: If not for backward compatibility, the Valkey project no longer uses the words "master" and "slave". Unfortunately in this command these words are part of the protocol, so we'll be able to remove such occurrences only when this API will be naturally deprecated.

@nastena1606
Copy link
Collaborator Author

@zuiderkwast thanks for raising the question about the disclaimer. I updated these: #180

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Change terminology "master" to "primary"
3 participants