Merge pull request #109565 from ajlam/master

MariaDB data-in updates

Author: PRMerger9

articles/mariadb/howto-data-in-replication.md

@@ -5,7 +5,7 @@ author: ajlam
 ms.author: andrela
 ms.service: mariadb
 ms.topic: conceptual
-ms.date: 3/18/2020
+ms.date: 3/30/2020
 ---
 
 # Configure Data-in Replication in Azure Database for MariaDB
@@ -14,6 +14,8 @@ This article describes how to set up Data-in Replication in Azure Database for M
 
 To create a replica in the Azure Database for MariaDB service, Data-in Replication synchronizes data from a master MariaDB server on-premises, in virtual machines (VMs), or in cloud database services.
 
+Review the [limitations and requirements](concepts-data-in-replication.md#limitations-and-considerations) of Data-in replication before performing the steps in this article.
+
 > [!NOTE]
 > If your master server is version 10.2 or newer, we recommend that you set up Data-in Replication by using [Global Transaction ID](https://mariadb.com/kb/en/library/gtid/).
 
@@ -31,11 +33,21 @@ To create a replica in the Azure Database for MariaDB service, Data-in Replicati
 
     User accounts aren't replicated from the master server to the replica server. To provide user access to the replica server, you must manually create all accounts and corresponding privileges on the newly created Azure Database for MariaDB server.
 
+3. Add the master server's IP address to the replica's firewall rules. 
+
+   Update firewall rules using the [Azure portal](howto-manage-firewall-portal.md) or [Azure CLI](howto-manage-firewall-cli.md).
+
 ## Configure the master server
 
 The following steps prepare and configure the MariaDB server hosted on-premises, in a VM, or in a cloud database service for Data-in Replication. The MariaDB server is the master in Data-in Replication.
 
-1. Turn on binary logging.
+1. Review the [master server requirements](concepts-data-in-replication.md#requirements) before proceeding. 
+
+   For example, ensure the master server allows both inbound and outbound traffic on port 3306 and that the master server has a **public IP address**, the DNS is publicly accessible, or has a fully qualified domain name (FQDN). 
+   
+   Test connectivity to the master server by attempting to connect from a tool such as the MySQL command-line hosted on another machine or from the [Azure Cloud Shell](https://docs.microsoft.com/azure/cloud-shell/overview) available in the Azure portal.
+
+2. Turn on binary logging.
 
     To see if binary logging is enabled on the master, enter the following command:
 
@@ -47,15 +59,15 @@ The following steps prepare and configure the MariaDB server hosted on-premises,
 
    If `log_bin` returns the value `OFF`, edit the **my.cnf** file so that `log_bin=ON` turns on binary logging. Restart the server to make the change take effect.
 
-2. Configure master server settings.
+3. Configure master server settings.
 
     Data-in Replication requires the parameter `lower_case_table_names` to be consistent between the master and replica servers. The `lower_case_table_names` parameter is set to `1` by default in Azure Database for MariaDB.
 
    ```sql
    SET GLOBAL lower_case_table_names = 1;
    ```
 
-3. Create a new replication role and set up permissions.
+4. Create a new replication role and set up permissions.
 
    Create a user account on the master server that's configured with replication privileges. You can create an account by using SQL commands or MySQL Workbench. If you plan to replicate with SSL, you must specify this when you create the user account.
 
@@ -100,7 +112,7 @@ The following steps prepare and configure the MariaDB server hosted on-premises,
    ![Replication Slave](./media/howto-data-in-replication/replicationslave.png)
 
 
-4. Set the master server to read-only mode.
+5. Set the master server to read-only mode.
 
    Before you dump a database, the server must be placed in read-only mode. While in read-only mode, the master can't process any write transactions. To help avoid business impact, schedule the read-only window during an off-peak time.
 
@@ -109,7 +121,7 @@ The following steps prepare and configure the MariaDB server hosted on-premises,
    SET GLOBAL read_only = ON;
    ```
 
-5. Get the current binary log file name and offset.
+6. Get the current binary log file name and offset.
 
    To determine the current binary log file name and offset, run the command [`show master status`](https://mariadb.com/kb/en/library/show-master-status/).
 
@@ -122,7 +134,7 @@ The following steps prepare and configure the MariaDB server hosted on-premises,
 
    Note the binary file name, because it'll be used in later steps.
    
-6. Get the GTID position (optional, needed for replication with GTID).
+7. Get the GTID position (optional, needed for replication with GTID).
 
    Run the function [`BINLOG_GTID_POS`](https://mariadb.com/kb/en/library/binlog_gtid_pos/) to get the GTID position for the corresponding binlog file name and offset.
   
@@ -191,7 +203,7 @@ The following steps prepare and configure the MariaDB server hosted on-premises,
 
        ```sql
        SET @cert = '-----BEGIN CERTIFICATE-----
-       PLACE YOUR PUBLIC KEY CERTIFICATE'S CONTEXT HERE
+       PLACE YOUR PUBLIC KEY CERTIFICATE\'S CONTEXT HERE
        -----END CERTIFICATE-----'
        ```
 

articles/mysql/howto-data-in-replication.md

@@ -10,11 +10,11 @@ ms.date: 3/27/2020
 
 # How to configure Azure Database for MySQL Data-in Replication
 
-In this article, you will learn how to set up Data-in Replication in the Azure Database for MySQL service by configuring the master and replica servers. Data-in Replication allows you to synchronize data from a master MySQL server running on-premises, in virtual machines, or database services hosted by other cloud providers into a replica in the Azure Database for MySQL service. 
+This article describes how to set up Data-in Replication in Azure Database for MySQL by configuring the master and replica servers. This article assumes that you have some prior experience with MySQL servers and databases.
 
-This article assumes that you have at least some prior experience with MySQL servers and databases.
+To create a replica in the Azure Database for MySQL service, Data-in Replication synchronizes data from a master MySQL server on-premises, in virtual machines (VMs), or in cloud database services.
 
-Review the [limitations and requirements](concepts-data-in-replication.md#limitations-and-considerations) of Data-in replication prior to performing the steps in this article.
+Review the [limitations and requirements](concepts-data-in-replication.md#limitations-and-considerations) of Data-in replication before performing the steps in this article.
 
 ## Create a MySQL server to be used as replica
 
@@ -42,7 +42,7 @@ The following steps prepare and configure the MySQL server hosted on-premises, i
 
    For example, ensure the master server allows both inbound and outbound traffic on port 3306 and that the master server has a **public IP address**, the DNS is publicly accessible, or has a fully qualified domain name (FQDN). 
 
-   Test connectivity to the master server by attempting to connect from a tool such as the MySQL command-line hosted on another machine or from the [Azure Cloud Shell](https://docs.microsoft.com/azure/cloud-shell/overview) available in the Azure portal 
+   Test connectivity to the master server by attempting to connect from a tool such as the MySQL command-line hosted on another machine or from the [Azure Cloud Shell](https://docs.microsoft.com/azure/cloud-shell/overview) available in the Azure portal.
 
 2. Turn on binary logging