Migrating from master-slave terminology

python/mysql_gadgets/command/sandbox.py

@@ -563,9 +563,9 @@ def create_sandbox(**kwargs):
         "log_error": os.path.join(datadir, "error.log").replace("\\", "/"),
         "relay_log_info_repository": "TABLE",
         "binlog_checksum": "NONE",
-        "master_info_repository": "TABLE",
+        "main_info_repository": "TABLE",
         "gtid_mode": "ON",
-        "log_slave_updates": "ON",
+        "log_subordinate_updates": "ON",
         "transaction_write_set_extraction": "XXHASH64",
         "binlog_format": "ROW",
         "log_bin": None,

python/mysql_gadgets/common/server.py

@@ -415,7 +415,7 @@ def __init__(self, options):
                            object. Supported key values:
             conn_info      a dictionary containing connection information
                            (user, passwd, host, port, socket)
-            role           Name or role of server (e.g., server, master)
+            role           Name or role of server (e.g., server, main)
             verbose        print extra data during operations (optional)
                            default value = False
             charset        Default character set for the connection.

unittest/scripts/auto/py_adminapi/validation/dba_help.py

@@ -472,7 +472,7 @@
         instance will attempt to rejoin the cluster after being expelled.
       - clearReadOnly: boolean value used to confirm that super_read_only must
         be disabled. Deprecated.
-      - multiMaster: boolean value used to define an InnoDB cluster with
+      - multiMain: boolean value used to define an InnoDB cluster with
         multiple writable instances. Deprecated.
 
       An InnoDB cluster may be setup in two ways:
@@ -664,7 +664,7 @@
 
       ATTENTION: The clearReadOnly option will be removed in a future release.
 
-      ATTENTION: The multiMaster option will be removed in a future release.
+      ATTENTION: The multiMain option will be removed in a future release.
                  Please use the multiPrimary option instead.
 
       ATTENTION: The failoverConsistency option will be removed in a future
@@ -711,7 +711,7 @@
       The created replicaset object.
 
 DESCRIPTION
-      This function will create a managed replicaset using MySQL master/slave
+      This function will create a managed replicaset using MySQL main/subordinate
       replication, as opposed to Group Replication. The MySQL instance the
       shell is connected to will be the initial PRIMARY of the replica set.
 

unittest/scripts/auto/py_adminapi_async/validation/simple_plain.py

@@ -181,7 +181,7 @@
 |                "mode": "R/O", |
 |                "replication": {|
 |                    "applierStatus": "APPLIED_ALL", |
-|                    "applierThreadState": "Slave has read all relay log; waiting for more updates", |
+|                    "applierThreadState": "Subordinate has read all relay log; waiting for more updates", |
 |                    "receiverStatus": "ERROR", |
 |                    "receiverThreadState": "", |
 |                    "replicationLag": null|
@@ -194,7 +194,7 @@
 |                "mode": "R/O", |
 |                "replication": {|
 |                    "applierStatus": "APPLIED_ALL", |
-|                    "applierThreadState": "Slave has read all relay log; waiting for more updates", |
+|                    "applierThreadState": "Subordinate has read all relay log; waiting for more updates", |
 |                    "receiverStatus": "ERROR", |
 |                    "receiverThreadState": "", |
 |                    "replicationLag": null|
@@ -338,9 +338,9 @@
                 "mode": "R/O", 
                 "replication": {
                     "applierStatus": "APPLIED_ALL", 
-                    "applierThreadState": "Slave has read all relay log; waiting for more updates", 
+                    "applierThreadState": "Subordinate has read all relay log; waiting for more updates", 
                     "receiverStatus": "ON", 
-                    "receiverThreadState": "Waiting for master to send event", 
+                    "receiverThreadState": "Waiting for main to send event", 
                     "replicationLag": null
                 }, 
                 "status": "ONLINE"

unittest/scripts/py_devapi/setup/setup.py

@@ -127,49 +127,49 @@ def check_super_read_only_done(connection):
 
 
 recov_cluster = None
-recov_master_uri = None
-recov_slave_uri = None
+recov_main_uri = None
+recov_subordinate_uri = None
 recov_state_list = None
 
 
-def _check_slave_state():
+def _check_subordinate_state():
     global recov_cluster
-    global recov_slave_uri
+    global recov_subordinate_uri
     global recov_state_list
 
     full_status = recov_cluster.status()
-    slave_status = full_status.defaultReplicaSet.topology[
-        recov_slave_uri].status
+    subordinate_status = full_status.defaultReplicaSet.topology[
+        recov_subordinate_uri].status
 
-    print("--->%s: %s" % (recov_slave_uri, slave_status))
+    print("--->%s: %s" % (recov_subordinate_uri, subordinate_status))
 
     ret_val = False
     for state in recov_state_list:
-        if state == slave_status:
+        if state == subordinate_status:
             ret_val = True
             print("Done!")
             break
 
     return ret_val
 
 
-def wait_slave_state(cluster, slave_uri, states):
+def wait_subordinate_state(cluster, subordinate_uri, states):
     global recov_cluster
-    global recov_slave_uri
+    global recov_subordinate_uri
     global recov_state_list
 
     recov_cluster = cluster
-    recov_slave_uri = slave_uri
+    recov_subordinate_uri = subordinate_uri
 
     if type(states) is list:
         recov_state_list = states
     else:
         recov_state_list = [states]
 
-    print("WAITING for %s to be in one of these states: %s" % (slave_uri,
+    print("WAITING for %s to be in one of these states: %s" % (subordinate_uri,
                                                                states))
 
-    wait(60, 1, _check_slave_state)
+    wait(60, 1, _check_subordinate_state)
 
     recov_cluster = None