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

Removing the master and slave terminology #266

Open
wants to merge 1 commit into
base: master
Choose a base branch
from

Conversation

bopopescu
Copy link

For diversity reasons, it would be nice to try to avoid 'master' and 'slave' terminology in this repository which can be associated to slavery. The master-slave terminology could be problematic for people in several countries which has the history of slavery like Romania, USA and many others. Thank you for considering the proposal. Let me know if any changes in the PR are needed, I would be happy to implement them.

Copy link
Contributor

@hannes-ucsc hannes-ucsc left a comment

Choose a reason for hiding this comment

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

Thank you for this pull request. We'd prefer leader instead of main.

And could you please change the commit title to

Change "master" to "leader" for more inclusive language

@@ -66,7 +66,7 @@ def __init__( self, application ):

self.option( '--cluster-name', '-c', metavar='NAME',
help=heredoc( """A name for the new cluster. If absent, the instance ID of
the master will be used. Cluster names do not need to be unique, but they
the main will be used. Cluster names do not need to be unique, but they
Copy link
Contributor

Choose a reason for hiding this comment

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

Suggested change
the main will be used. Cluster names do not need to be unique, but they
the leader will be used. Cluster names do not need to be unique, but they

@@ -277,7 +277,7 @@ def run_on_box( self, options, first_worker ):
workers = first_worker.list( leader_instance_id=leader.instance_id )
used_cluster_ordinals = set( w.cluster_ordinal for w in workers )
assert len( used_cluster_ordinals ) == len( workers ) # check for collisions
assert 0 not in used_cluster_ordinals # master has 0
assert 0 not in used_cluster_ordinals # main has 0
Copy link
Contributor

Choose a reason for hiding this comment

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

Suggested change
assert 0 not in used_cluster_ordinals # main has 0
assert 0 not in used_cluster_ordinals # leader has 0

@@ -395,7 +395,7 @@ def run_on_cluster( self, options, ctx, cluster ):

class RsyncClusterCommand( RsyncCommandMixin, ApplyClusterCommand ):
"""
Run rsync against each node in a cluster. The rsync program will be run against master first,
Run rsync against each node in a cluster. The rsync program will be run against main first,
Copy link
Contributor

Choose a reason for hiding this comment

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

Suggested change
Run rsync against each node in a cluster. The rsync program will be run against main first,
Run rsync against each node in a cluster. The rsync program will be run against the leader first,

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.

2 participants