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.

Sign up for GitHub

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
Open

Removing the master and slave terminology #266

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions core/src/cgcloud/core/cluster_commands.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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

should be in order to avoid user error.""" ) )

self.option( '--num-workers', '-s', metavar='NUM',
Expand Down Expand Up @@ -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

used_cluster_ordinals.add( 0 ) # to make the math easier
cluster_ordinal = allocate_cluster_ordinals( num=options.num_workers,
used=used_cluster_ordinals )
Expand Down Expand Up @@ -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,

followed by all workers in parallel. To avoid being prompted for confirmation of the host
key, use --ssh-opts="-o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no".
"""
Expand Down