JE-58122 Replace master/slave w primary/secondary

Author: Vadym Lobzakov

README.md

@@ -1,10 +1,10 @@
 # PostgreSQL Database Replication
 
-Basic ready-to-use PostgreSQL cluster, which implements asynchronous master-slave data replication within a pair of preconfigured database containers.
+Basic ready-to-use PostgreSQL cluster, which implements asynchronous primary-secondary data replication within a pair of preconfigured database containers.
 
 ## Package Implementation Specifics
 
-The presented PostgreSQL Replication solution is built upon Jelastic certified stack template for **PostgreSQL 9.5.5**. It operates two database containers (master and slave, one per role) and makes data from primary DB server to be asynchronously replicated to a standby one.
+The presented PostgreSQL Replication solution is built upon Jelastic certified stack template for **PostgreSQL 9.5.5**. It operates two database containers (primary and secondary, one per role) and makes data from primary DB server to be asynchronously replicated to a standby one.
 
 <p align="left">
 <img src="images/postgresql-replication-topology.svg" width="350">

addons/auto-cluster.yaml

@@ -2,7 +2,7 @@ type: update
 id: postgres-master-slave-auto-cluster
 baseUrl: https://raw.githubusercontent.com/jelastic-jps/postgres/master
 logo: /images/postgres-70x70.png
-name: PostgreSQL Master-Slave Auto-Cluster
+name: PostgreSQL Primary-Secondary Auto-Cluster
 
 targetNodes: none
 nodeGroupAlias:
@@ -49,7 +49,7 @@ actions:
                 jcm updatePrimaryConnInfo &>> /var/log/run.log
                 sudo jem service restart
     - else: 
-      - setNodeDisplayName[${nodes.sqldb.master.id}]: Master
+      - setNodeDisplayName[${nodes.sqldb.master.id}]: Primary
       - getPswd
       - forEach(nodes.sqldb):
           if (${@i.id} != ${nodes.sqldb.master.id}): 
@@ -65,7 +65,7 @@ actions:
         pswd: ${response.out}    
 
   initSlave:
-    - setNodeDisplayName[${this.id}]: Slave
+    - setNodeDisplayName[${this.id}]: Secondary
     - cmd[${nodes.sqldb.master.id}]: |-
         jcm addReplicaHost ${this.ip} &>> /var/log/run.log
         sudo jem service reload

addons/cluster.json

@@ -16,5 +16,5 @@
     "recommended": {
         "cloudlets": 32
     },
-    "description": "<h3>Master-Slave with Scalable Slaves</h3>Pre-configured PostgreSQL database cluster with master-slave replication. New nodes are automatically added into the cluster as slaves. <a href='https://jelastic.com/blog/postgresql-auto-clustering-master-slave-replication/'>Learn More</a><img width='217' height='168' src='https://raw.githubusercontent.com/jelastic/icons/master/postgres/jelastic/images/tip-cluster-ms.svg?sanitize=true'>"
+    "description": "<h3>Primary-Secondary with Scalable Secondaries</h3>Pre-configured PostgreSQL database cluster with primary-secondary replication. New nodes are automatically added into the cluster as secondaries. <a href='https://jelastic.com/blog/postgresql-auto-clustering-master-slave-replication/'>Learn More</a><img width='217' height='168' src='https://raw.githubusercontent.com/jelastic/icons/master/postgres/jelastic/images/tip-cluster-ms.svg?sanitize=true'>"
 }

images/postgresql-replication-installation.png

@@ -4,12 +4,12 @@ id: postgres-master-slave
 baseUrl: https://raw.githubusercontent.com/jelastic-jps/postgres/master
 homepage: http://docs.jelastic.com/postgresql-database-replication
 logo: /images/postgres-70x70.png
-name: PostgreSQL Master-Slave Cluster
+name: PostgreSQL Primary-Secondary Cluster
 description:
   text: |
-    PostgreSQL Master-Slave Cluster for improving data availability with asynchronous replication. 
+    PostgreSQL Primary-Secondary Cluster for improving data availability with asynchronous replication. 
     PostgreSQL is a powerful, open source object-relational database system with over 30 years of active development that has earned it a strong reputation for reliability, feature robustness, and performance.
-  short: PostgreSQL Master-Slave Cluster with asynchronous replication.
+  short: PostgreSQL Primary-Secondary Cluster with asynchronous replication.
 
 categories:
   - apps/clustered-dbs

images/postgresql-replication-success-message.png

@@ -1,10 +1,10 @@
 type: update
 id: postgres-master-slave-test
-name: PostreSQL Master-Slave Test
+name: PostreSQL Primary-Secondary Test
 homepage: https://www.postgresql.org/
 baseUrl: https://raw.githubusercontent.com/jelastic-jps/postgres/master
 logo: /images/postgres-70x70.png
-description: Test of Master-Slave cluster status
+description: Test of Primary-Secondary cluster status
 
 onInstall:
   - cmd[${nodes.sqldb.master.id}]: |-
@@ -14,7 +14,7 @@ onInstall:
       if (rows == slaves) {
         return {result: 0} 
       } else {
-        return {result: "error", message: "Number of replicas (" + rows + ") does not match the number of slave nodes (" + slaves + ")"}
+        return {result: "error", message: "Number of replicas (" + rows + ") does not match the number of secondary nodes (" + slaves + ")"}
       }
 success:
-  text: PostreSQL Master-Slave is up and running. All slaves are healthy!
+  text: PostreSQL Primary-Secondary is up and running. All secondaries are healthy!