From b5e2cc1606c9d1e422a2033e2fac39a8019e6cb2 Mon Sep 17 00:00:00 2001 From: Bogdan Popescu <68062990+bopopescu@users.noreply.github.com> Date: Sat, 25 Jul 2020 23:12:32 +0300 Subject: [PATCH] Get away from master/slave words --- third_party/python/boto/emr/connection.py | 22 ++++++++++---------- third_party/python/boto/emr/step.py | 2 +- third_party/python/boto/pyami/bootstrap.py | 2 +- third_party/python/boto/rds/__init__.py | 24 +++++++++++----------- third_party/python/boto/rds/dbinstance.py | 14 ++++++------- third_party/python/boto/rds/dbsnapshot.py | 6 +++--- tools/hstore/fabric/abstractfabric.py | 2 +- tools/hstore/fabric/ec2fabric.py | 2 +- 8 files changed, 37 insertions(+), 37 deletions(-) diff --git a/third_party/python/boto/emr/connection.py b/third_party/python/boto/emr/connection.py index 0e741994d3..f41097e142 100644 --- a/third_party/python/boto/emr/connection.py +++ b/third_party/python/boto/emr/connection.py @@ -189,8 +189,8 @@ def modify_instance_groups(self, instance_group_ids, new_sizes): return self.get_object('ModifyInstanceGroups', params, ModifyInstanceGroupsResponse, verb='POST') def run_jobflow(self, name, log_uri, ec2_keyname=None, availability_zone=None, - master_instance_type='m1.small', - slave_instance_type='m1.small', num_instances=1, + main_instance_type='m1.small', + subordinate_instance_type='m1.small', num_instances=1, action_on_failure='TERMINATE_JOB_FLOW', keep_alive=False, enable_debugging=False, hadoop_version='0.18', @@ -207,10 +207,10 @@ def run_jobflow(self, name, log_uri, ec2_keyname=None, availability_zone=None, :param ec2_keyname: EC2 key used for the instances :type availability_zone: str :param availability_zone: EC2 availability zone of the cluster - :type master_instance_type: str - :param master_instance_type: EC2 instance type of the master - :type slave_instance_type: str - :param slave_instance_type: EC2 instance type of the slave nodes + :type main_instance_type: str + :param main_instance_type: EC2 instance type of the main + :type subordinate_instance_type: str + :param subordinate_instance_type: EC2 instance type of the subordinate nodes :type num_instances: int :param num_instances: Number of instances in the Hadoop cluster :type action_on_failure: str @@ -233,7 +233,7 @@ def run_jobflow(self, name, log_uri, ec2_keyname=None, availability_zone=None, # Instance args instance_params = self._build_instance_args(ec2_keyname, availability_zone, - master_instance_type, slave_instance_type, + main_instance_type, subordinate_instance_type, num_instances, keep_alive, hadoop_version) params.update(instance_params) @@ -310,11 +310,11 @@ def _build_step_list(self, steps): params['Steps.member.%s.%s' % (i+1, key)] = value return params - def _build_instance_args(self, ec2_keyname, availability_zone, master_instance_type, - slave_instance_type, num_instances, keep_alive, hadoop_version): + def _build_instance_args(self, ec2_keyname, availability_zone, main_instance_type, + subordinate_instance_type, num_instances, keep_alive, hadoop_version): params = { - 'Instances.MasterInstanceType' : master_instance_type, - 'Instances.SlaveInstanceType' : slave_instance_type, + 'Instances.MainInstanceType' : main_instance_type, + 'Instances.SubordinateInstanceType' : subordinate_instance_type, 'Instances.InstanceCount' : num_instances, 'Instances.KeepJobFlowAliveWhenNoSteps' : str(keep_alive).lower(), 'Instances.HadoopVersion' : hadoop_version diff --git a/third_party/python/boto/emr/step.py b/third_party/python/boto/emr/step.py index 74bef3a13a..0c603178d0 100644 --- a/third_party/python/boto/emr/step.py +++ b/third_party/python/boto/emr/step.py @@ -122,7 +122,7 @@ def __init__(self, name, mapper, reducer=None, :type output: str :param output: The output uri :type jar: str - :param jar: The hadoop streaming jar. This can be either a local path on the master node, or an s3:// URI. + :param jar: The hadoop streaming jar. This can be either a local path on the main node, or an s3:// URI. """ self.name = name self.mapper = mapper diff --git a/third_party/python/boto/pyami/bootstrap.py b/third_party/python/boto/pyami/bootstrap.py index cd44682fc8..01341dd7b1 100644 --- a/third_party/python/boto/pyami/bootstrap.py +++ b/third_party/python/boto/pyami/bootstrap.py @@ -88,7 +88,7 @@ def load_boto(self): if update.find(':') >= 0: method, version = update.split(':') else: - version = 'master' + version = 'main' self.run('git checkout %s' % version, cwd=location) else: # first remove the symlink needed when running from subversion diff --git a/third_party/python/boto/rds/__init__.py b/third_party/python/boto/rds/__init__.py index 9acf1038cb..6631db6b69 100644 --- a/third_party/python/boto/rds/__init__.py +++ b/third_party/python/boto/rds/__init__.py @@ -113,7 +113,7 @@ def get_all_dbinstances(self, instance_id=None, max_records=None, return self.get_list('DescribeDBInstances', params, [('DBInstance', DBInstance)]) def create_dbinstance(self, id, allocated_storage, instance_class, - master_username, master_password, port=3306, + main_username, main_password, port=3306, engine='MySQL5.1', db_name=None, param_group=None, security_groups=None, availability_zone=None, preferred_maintenance_window=None, @@ -150,13 +150,13 @@ def create_dbinstance(self, id, allocated_storage, instance_class, :type engine: str :param engine: Name of database engine. Must be MySQL5.1 for now. - :type master_username: str - :param master_username: Name of master user for the DBInstance. + :type main_username: str + :param main_username: Name of main user for the DBInstance. Must be 1-15 alphanumeric characters, first must be a letter. - :type master_password: str - :param master_password: Password of master user for the DBInstance. + :type main_password: str + :param main_password: Password of main user for the DBInstance. Must be 4-16 alphanumeric characters. :type port: int @@ -217,8 +217,8 @@ def create_dbinstance(self, id, allocated_storage, instance_class, 'AllocatedStorage' : allocated_storage, 'DBInstanceClass' : instance_class, 'Engine' : engine, - 'MasterUsername' : master_username, - 'MasterUserPassword' : master_password} + 'MainUsername' : main_username, + 'MainUserPassword' : main_password} if port: params['Port'] = port if db_name: @@ -321,7 +321,7 @@ def create_dbinstance_read_replica(self, id, source_id, def modify_dbinstance(self, id, param_group=None, security_groups=None, preferred_maintenance_window=None, - master_password=None, allocated_storage=None, + main_password=None, allocated_storage=None, instance_class=None, backup_retention_period=None, preferred_backup_window=None, @@ -343,8 +343,8 @@ def modify_dbinstance(self, id, param_group=None, security_groups=None, occur. Default is Sun:05:00-Sun:09:00 - :type master_password: str - :param master_password: Password of master user for the DBInstance. + :type main_password: str + :param main_password: Password of main user for the DBInstance. Must be 4-15 alphanumeric characters. :type allocated_storage: int @@ -402,8 +402,8 @@ def modify_dbinstance(self, id, param_group=None, security_groups=None, self.build_list_params(params, l, 'DBSecurityGroups.member') if preferred_maintenance_window: params['PreferredMaintenanceWindow'] = preferred_maintenance_window - if master_password: - params['MasterUserPassword'] = master_password + if main_password: + params['MainUserPassword'] = main_password if allocated_storage: params['AllocatedStorage'] = allocated_storage if instance_class: diff --git a/third_party/python/boto/rds/dbinstance.py b/third_party/python/boto/rds/dbinstance.py index 02f9af6ad2..71f94fca8f 100644 --- a/third_party/python/boto/rds/dbinstance.py +++ b/third_party/python/boto/rds/dbinstance.py @@ -36,7 +36,7 @@ def __init__(self, connection=None, id=None): self.allocated_storage = None self.endpoint = None self.instance_class = None - self.master_username = None + self.main_username = None self.parameter_group = None self.security_group = None self.availability_zone = None @@ -82,8 +82,8 @@ def endElement(self, name, value, connection): self.allocated_storage = int(value) elif name == 'DBInstanceClass': self.instance_class = value - elif name == 'MasterUsername': - self.master_username = value + elif name == 'MainUsername': + self.main_username = value elif name == 'Port': if self._in_endpoint: self._port = int(value) @@ -176,7 +176,7 @@ def stop(self, skip_final_snapshot=False, final_snapshot_id=''): def modify(self, param_group=None, security_groups=None, preferred_maintenance_window=None, - master_password=None, allocated_storage=None, + main_password=None, allocated_storage=None, instance_class=None, backup_retention_period=None, preferred_backup_window=None, @@ -195,8 +195,8 @@ def modify(self, param_group=None, security_groups=None, occur. Default is Sun:05:00-Sun:09:00 - :type master_password: str - :param master_password: Password of master user for the DBInstance. + :type main_password: str + :param main_password: Password of main user for the DBInstance. Must be 4-15 alphanumeric characters. :type allocated_storage: int @@ -245,7 +245,7 @@ def modify(self, param_group=None, security_groups=None, param_group, security_groups, preferred_maintenance_window, - master_password, + main_password, allocated_storage, instance_class, backup_retention_period, diff --git a/third_party/python/boto/rds/dbsnapshot.py b/third_party/python/boto/rds/dbsnapshot.py index 78d0230c21..166501edfd 100644 --- a/third_party/python/boto/rds/dbsnapshot.py +++ b/third_party/python/boto/rds/dbsnapshot.py @@ -33,7 +33,7 @@ def __init__(self, connection=None, id=None): self.port = None self.status = None self.availability_zone = None - self.master_username = None + self.main_username = None self.allocated_storage = None self.instance_id = None self.availability_zone = None @@ -61,8 +61,8 @@ def endElement(self, name, value, connection): self.status = value elif name == 'AvailabilityZone': self.availability_zone = value - elif name == 'MasterUsername': - self.master_username = value + elif name == 'MainUsername': + self.main_username = value elif name == 'AllocatedStorage': self.allocated_storage = int(value) elif name == 'SnapshotTime': diff --git a/tools/hstore/fabric/abstractfabric.py b/tools/hstore/fabric/abstractfabric.py index 2faa41acfe..2b4c2f772b 100644 --- a/tools/hstore/fabric/abstractfabric.py +++ b/tools/hstore/fabric/abstractfabric.py @@ -83,7 +83,7 @@ # H-Store Options "hstore.basedir": None, "hstore.git": "git://github.com/apavlo/h-store.git", - "hstore.git_branch": "master", + "hstore.git_branch": "main", "hstore.git_options": "", "hstore.clean": False, "hstore.exec_prefix": "", diff --git a/tools/hstore/fabric/ec2fabric.py b/tools/hstore/fabric/ec2fabric.py index 8962aaf4c5..1cd67b84af 100644 --- a/tools/hstore/fabric/ec2fabric.py +++ b/tools/hstore/fabric/ec2fabric.py @@ -523,7 +523,7 @@ def setup_nfsclient(rebootInst=True): append("/etc/hosts", hosts_line, use_sudo=True) sudo("apt-get --yes install %s" % " ".join(NFSCLIENT_PACKAGES)) - append("/etc/auto.master", "%s /etc/auto.hstore" % nfs_dir, use_sudo=True) + append("/etc/auto.main", "%s /etc/auto.hstore" % nfs_dir, use_sudo=True) append("/etc/auto.hstore", "* hstore-nfs:%s/&" % nfs_dir, use_sudo=True) sudo("/etc/init.d/autofs start") ## IF