From 7aba094fa3500bfb74fcb25cf319ffc29ffa1b7b Mon Sep 17 00:00:00 2001 From: Matthias Sohn Date: Mon, 9 Dec 2019 11:01:37 +0100 Subject: [PATCH 1/2] Rename "slave" to "replica" in backup documentation Per https://en.wikipedia.org/wiki/Master/slave_(technology)#Terminology_concerns the use "slave" is considered offsensive in some circles. Also see change If57df22705dac9450c1cf9900f051d9123d7dd2c. Change-Id: I3dca3ef41549260d311687e96d36a28b91ffb9fd --- Documentation/backup.txt | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/Documentation/backup.txt b/Documentation/backup.txt index ed044ba665..cd247af828 100644 --- a/Documentation/backup.txt +++ b/Documentation/backup.txt @@ -162,9 +162,9 @@ link:https://gerrit.googlesource.com/plugins/pull-replication[pull-replication p Best you use a filesystem supporting snapshots to create a backup archive of such a replica. -For 2.x Gerrit versions also set up a database slave for the data stored in the +For 2.x Gerrit versions also set up a database replica for the data stored in the SQL database. If you are using 2.16 and migrated to _NoteDb_ you may consider to -skip setting up a database slave, instead take a backup of the database which only +skip setting up a database replica, instead take a backup of the database which only contains the current schema version in this case. In addition you need to ensure that no write operations are in flight before you take the replica offline. Otherwise the database backup might be inconsistent @@ -176,8 +176,8 @@ Replication of repository deletions can be switched off using the link:https://gerrit.googlesource.com/plugins/replication/+/refs/heads/master/src/main/resources/Documentation/config.md[server option] `remote.NAME.replicateProjectDeletions`. -If you are using Gerrit slaves to offload read traffic you can use one of these -slaves for creating backups. +If you are using Gerrit replica to offload read traffic you can use one of these +replica for creating backups. [#cons-backup-offline] === Take master offline for backup From 1a11b40373b1576b3360ff7d2d7f25319ba89630 Mon Sep 17 00:00:00 2001 From: Luca Milanesio Date: Mon, 9 Dec 2019 22:41:29 +0000 Subject: [PATCH 2/2] Update replication submodule for fixing test flakiness Verify up-front on the Gerrit CI that the updated replication plugin is now passing reliably without any residual flakiness. Bug: Issue 11843 Change-Id: I5c29c88b5d8259d3f329bb8936fd034168401746 --- plugins/replication | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/plugins/replication b/plugins/replication index 505f2c63c4..f850abddb7 160000 --- a/plugins/replication +++ b/plugins/replication @@ -1 +1 @@ -Subproject commit 505f2c63c41100d215e706c7df6932854d213bd7 +Subproject commit f850abddb7e7bfb8d7c564930181da12145663a6