Merge "Rename "slave" to "replica" in documentation and command-line"
diff --git a/Documentation/config-accounts.txt b/Documentation/config-accounts.txt
index 4f4685b..45aa42a 100644
--- a/Documentation/config-accounts.txt
+++ b/Documentation/config-accounts.txt
@@ -417,7 +417,7 @@
* `refs/meta/external-ids` (external IDs)
* `refs/starred-changes/*` (star labels)
* `refs/sequences/accounts` (account sequence numbers, not needed for Gerrit
- slaves)
+ replicas)
GERRIT
------
diff --git a/Documentation/config-gerrit.txt b/Documentation/config-gerrit.txt
index a0e7b3e..4fa4ba9 100644
--- a/Documentation/config-gerrit.txt
+++ b/Documentation/config-gerrit.txt
@@ -826,7 +826,7 @@
+
Default value is 0 (disabled). It is disabled by default due to the fact
that change updates are not communicated between Gerrit servers. Hence
-this cache should be disabled in an multi-master/multi-slave setup.
+this cache should be disabled in an multi-master/multi-replica setup.
+
The cache should be flushed whenever the database changes table is modified
outside of Gerrit.
@@ -1561,8 +1561,8 @@
[[container.slave]]container.slave::
+
-Used on Gerrit slave installations. If set to true the Gerrit JVM is
-called with the '--slave' switch, enabling slave mode. If no value is
+Used on Gerrit replica installations. If set to true the Gerrit JVM is
+called with the '--replica' switch, enabling replica mode. If no value is
set (or any other value), Gerrit defaults to master mode.
[[container.startupTimeout]]container.startupTimeout::
@@ -2742,28 +2742,28 @@
==== Subsection index.scheduledIndexer
This section configures periodic indexing. Periodic indexing is
-intended to run only on slaves and only updates the group index.
-Replication to slaves happens on Git level so that Gerrit is not aware
-of incoming replication events. But slaves need an updated group index
+intended to run only on replicas and only updates the group index.
+Replication to replicas happens on Git level so that Gerrit is not aware
+of incoming replication events. But replicas need an updated group index
to resolve memberships of users for ACL validation. To keep the group
-index in slaves up-to-date the Gerrit slave periodically scans the
+index in replicas up-to-date the Gerrit replica periodically scans the
group refs in the All-Users repository to reindex groups if they are
stale.
The scheduled reindexer is not able to detect group deletions that
-happened while the slave was offline, but since group deletions are not
+happened while the replica was offline, but since group deletions are not
supported this should never happen. If nevertheless groups refs were
-deleted while a slave was offline a full offline link:pgm-reindex.html[
+deleted while a replica was offline a full offline link:pgm-reindex.html[
reindex] must be performed.
-This section is only used if Gerrit runs in slave mode, otherwise it is
+This section is only used if Gerrit runs in replica mode, otherwise it is
ignored.
[[index.scheduledIndexer.runOnStartup]]index.scheduledIndexer.runOnStartup::
+
Whether the scheduled indexer should run once immediately on startup.
-If set to `true` the slave startup is blocked until all stale groups
-were reindexed. Enabling this allows to prevent that slaves that were
+If set to `true` the replica startup is blocked until all stale groups
+were reindexed. Enabling this allows to prevent that replicas that were
offline for a longer period of time run with outdated group information
until the first scheduled indexing is done.
+
@@ -2773,7 +2773,7 @@
+
Whether the scheduled indexer is enabled. If the scheduled indexer is
disabled you must implement other means to keep the group index for the
-slave up-to-date (e.g. by using ElasticSearch for the indexes).
+replica up-to-date (e.g. by using ElasticSearch for the indexes).
+
Defaults to `true`.
@@ -4260,7 +4260,7 @@
SSH-compression since git does not compress the ref announcement during
handshake.
+
-Compression can be especially useful when Gerrit slaves are being used
+Compression can be especially useful when Gerrit replicas are being used
for the larger clones and fetches and the master server mostly takes
small receive-packs.
+
diff --git a/Documentation/config-groups.txt b/Documentation/config-groups.txt
index 4db4cb3..327cab6 100644
--- a/Documentation/config-groups.txt
+++ b/Documentation/config-groups.txt
@@ -103,7 +103,7 @@
== Replication
-In a replicated setting (eg. backups and or master/slave
+In a replicated setting (eg. backups and or master/replica
configurations), all refs in the `All-Users` project must be copied
onto all replicas, including `refs/groups/*`, `refs/meta/group-names`
and `refs/sequences/groups`.
diff --git a/Documentation/dev-design-doc-solution-template.md b/Documentation/dev-design-doc-solution-template.md
index 8935902..8b2a8c0 100644
--- a/Documentation/dev-design-doc-solution-template.md
+++ b/Documentation/dev-design-doc-solution-template.md
@@ -36,7 +36,7 @@
* data size increase
* traffic increase
-* effects on replication across sites (master-slave and master-master)
+* effects on replication across sites (master-replica and master-master)
## <a id="alternatives-considered"> Alternatives Considered
diff --git a/Documentation/dev-design.txt b/Documentation/dev-design.txt
index 1285404..fd53cac 100644
--- a/Documentation/dev-design.txt
+++ b/Documentation/dev-design.txt
@@ -520,7 +520,7 @@
Because of the distributed nature of Git, end-users don't need to
contact the central Gerrit Code Review server very often. For `git
-fetch` traffic, link:pgm-daemon.html[slave mode] is known to be an
+fetch` traffic, link:pgm-daemon.html[replica mode] is known to be an
effective way to offload traffic from the main server, permitting it
to scale to a large user base without needing an excessive number of
cores in a single system.
diff --git a/Documentation/dev-inspector.txt b/Documentation/dev-inspector.txt
index b1559ca..39736d7 100644
--- a/Documentation/dev-inspector.txt
+++ b/Documentation/dev-inspector.txt
@@ -11,7 +11,7 @@
[--enable-httpd | --disable-httpd]
[--enable-sshd | --disable-sshd]
[--console-log]
- [--slave]
+ [--replica]
-s
--
diff --git a/Documentation/pgm-daemon.txt b/Documentation/pgm-daemon.txt
index ad07cfa..210b1cb 100644
--- a/Documentation/pgm-daemon.txt
+++ b/Documentation/pgm-daemon.txt
@@ -11,7 +11,7 @@
[--enable-httpd | --disable-httpd]
[--enable-sshd | --disable-sshd]
[--console-log]
- [--slave]
+ [--replica]
[--headless]
[--init]
[-s]
@@ -32,15 +32,15 @@
--enable-httpd::
--disable-httpd::
Enable (or disable) the internal HTTP daemon, answering
- web requests. Enabled by default when --slave is not used.
+ web requests. Enabled by default when --replica is not used.
--enable-sshd::
--disable-sshd::
Enable (or disable) the internal SSH daemon, answering SSH
clients and remotely executed commands. Enabled by default.
---slave::
- Run in slave mode, permitting only read operations
+--replica::
+ Run in replica mode, permitting only read operations
by clients. Commands which modify state such as
link:cmd-receive-pack.html[receive-pack] (creates new changes
or updates existing ones) or link:cmd-review.html[review]
@@ -80,9 +80,9 @@
external log cleaning service to clean up the prior logs.
== KNOWN ISSUES
-Slave daemon caches can quickly become out of date when modifications
+Replica daemon caches can quickly become out of date when modifications
are made on the master. The following configuration is suggested in
-a slave to reduce the maxAge for each cache entry, so that changes
+a replica to reduce the maxAge for each cache entry, so that changes
are recognized in a reasonable period of time:
----
@@ -106,7 +106,7 @@
maxAge = 5 min
----
-Automatic cache coherency between master and slave systems is
+Automatic cache coherency between master and replica systems is
planned to be implemented in a future version.
GERRIT
diff --git a/java/com/google/gerrit/acceptance/GerritServer.java b/java/com/google/gerrit/acceptance/GerritServer.java
index adc1f1d..a5066b7 100644
--- a/java/com/google/gerrit/acceptance/GerritServer.java
+++ b/java/com/google/gerrit/acceptance/GerritServer.java
@@ -450,7 +450,7 @@
@Nullable InMemoryRepositoryManager inMemoryRepoManager)
throws Exception {
Config cfg = desc.buildConfig(baseConfig);
- daemon.setSlave(isSlave(baseConfig) || isSlave(cfg));
+ daemon.setReplica(isReplica(baseConfig) || isReplica(cfg));
mergeTestConfig(cfg);
// Set the log4j configuration to an invalid one to prevent system logs
// from getting configured and creating log files.
@@ -463,7 +463,7 @@
cfg.setString(
"accountPatchReviewDb", null, "url", JdbcAccountPatchReviewStore.TEST_IN_MEMORY_URL);
daemon.setEnableHttpd(desc.httpd());
- daemon.setLuceneModule(LuceneIndexModule.singleVersionAllLatest(0, isSlave(baseConfig)));
+ daemon.setLuceneModule(LuceneIndexModule.singleVersionAllLatest(0, isReplica(baseConfig)));
daemon.setDatabaseForTesting(
ImmutableList.of(
new InMemoryTestingDatabaseModule(cfg, site, inMemoryRepoManager),
@@ -479,7 +479,7 @@
return new GerritServer(desc, null, createTestInjector(daemon), daemon, null);
}
- private static boolean isSlave(Config baseConfig) {
+ private static boolean isReplica(Config baseConfig) {
return baseConfig.getBoolean("container", "slave", false);
}
diff --git a/java/com/google/gerrit/pgm/Daemon.java b/java/com/google/gerrit/pgm/Daemon.java
index ab570a2..a67973e 100644
--- a/java/com/google/gerrit/pgm/Daemon.java
+++ b/java/com/google/gerrit/pgm/Daemon.java
@@ -147,8 +147,11 @@
sshd = false;
}
- @Option(name = "--slave", usage = "Support fetch only")
- private boolean slave;
+ @Option(
+ name = "--replica",
+ aliases = {"--slave"},
+ usage = "Support fetch only")
+ private boolean replica;
@Option(name = "--console-log", usage = "Log to console (not $site_path/logs)")
private boolean consoleLog;
@@ -214,8 +217,8 @@
httpd = enable;
}
- public void setSlave(boolean slave) {
- this.slave = slave;
+ public void setReplica(boolean replica) {
+ this.replica = replica;
}
@Override
@@ -240,7 +243,7 @@
}
if (httpd == null) {
- httpd = !slave;
+ httpd = !replica;
}
if (!httpd && !sshd) {
@@ -368,8 +371,8 @@
private String myVersion() {
List<String> versionParts = new ArrayList<>();
- if (slave) {
- versionParts.add("[slave]");
+ if (replica) {
+ versionParts.add("[replica]");
}
if (headless) {
versionParts.add("[headless]");
@@ -405,7 +408,7 @@
modules.add(new GerritApiModule());
modules.add(new PluginApiModule());
- modules.add(new SearchingChangeCacheImpl.Module(slave));
+ modules.add(new SearchingChangeCacheImpl.Module(replica));
modules.add(new InternalAccountDirectory.Module());
modules.add(new DefaultPermissionBackendModule());
modules.add(new DefaultMemoryCacheModule());
@@ -457,7 +460,8 @@
new AbstractModule() {
@Override
protected void configure() {
- bind(GerritOptions.class).toInstance(new GerritOptions(headless, slave, polyGerritDev));
+ bind(GerritOptions.class)
+ .toInstance(new GerritOptions(headless, replica, polyGerritDev));
if (inMemoryTest) {
bind(String.class)
.annotatedWith(SecureStoreClassName.class)
@@ -467,7 +471,7 @@
}
});
modules.add(new GarbageCollectionModule());
- if (slave) {
+ if (replica) {
modules.add(new PeriodicGroupIndexer.Module());
} else {
modules.add(new AccountDeactivator.Module());
@@ -486,10 +490,10 @@
return luceneModule;
}
if (indexType.isLucene()) {
- return LuceneIndexModule.latestVersion(slave);
+ return LuceneIndexModule.latestVersion(replica);
}
if (indexType.isElasticsearch()) {
- return ElasticIndexModule.latestVersion(slave);
+ return ElasticIndexModule.latestVersion(replica);
}
throw new IllegalStateException("unsupported index.type = " + indexType);
}
@@ -515,10 +519,10 @@
}
modules.add(
new DefaultCommandModule(
- slave,
+ replica,
sysInjector.getInstance(DownloadConfig.class),
sysInjector.getInstance(LfsPluginAuthCommand.Module.class)));
- if (!slave) {
+ if (!replica) {
modules.add(new IndexCommandsModule(sysInjector));
}
return sysInjector.createChildInjector(modules);
diff --git a/resources/com/google/gerrit/pgm/init/gerrit.sh b/resources/com/google/gerrit/pgm/init/gerrit.sh
index d92ec51..eba7e4b 100755
--- a/resources/com/google/gerrit/pgm/init/gerrit.sh
+++ b/resources/com/google/gerrit/pgm/init/gerrit.sh
@@ -346,7 +346,7 @@
test -z "$GERRIT_USER" && GERRIT_USER=`whoami`
RUN_ARGS="-jar $GERRIT_WAR daemon -d $GERRIT_SITE"
if test "`get_config --bool container.slave`" = "true" ; then
- RUN_ARGS="$RUN_ARGS --slave --enable-httpd --headless"
+ RUN_ARGS="$RUN_ARGS --replica --enable-httpd --headless"
fi
DAEMON_OPTS=`get_config --get-all container.daemonOpt`
if test -n "$DAEMON_OPTS" ; then
