Pull-replication plugin should warn about inconsistent timeouts The pull-replication uses the `connectionTimeout` for all the socket-related timeouts, including the read/write timeouts. At the moment, the only way to assure a reliable replication is to have a `connectionTimeout` > `timeout`. The replication plugin should provide a warning when an inconsistent configuration is found in any of the remotes. Bug: Issue 40014561 Change-Id: I04f18d5307de2333b8a50294c557bdd0213410a8
diff --git a/src/main/java/com/googlesource/gerrit/plugins/replication/pull/SourceConfiguration.java b/src/main/java/com/googlesource/gerrit/plugins/replication/pull/SourceConfiguration.java index 0e840bd..b6647bd 100644 --- a/src/main/java/com/googlesource/gerrit/plugins/replication/pull/SourceConfiguration.java +++ b/src/main/java/com/googlesource/gerrit/plugins/replication/pull/SourceConfiguration.java
@@ -16,6 +16,7 @@ import com.google.common.base.MoreObjects; import com.google.common.collect.ImmutableList; +import com.google.common.flogger.FluentLogger; import com.google.gerrit.server.config.ConfigUtil; import com.googlesource.gerrit.plugins.replication.RemoteConfiguration; import java.util.concurrent.TimeUnit; @@ -23,6 +24,7 @@ import org.eclipse.jgit.transport.RemoteConfig; public class SourceConfiguration implements RemoteConfiguration { + private static final FluentLogger logger = FluentLogger.forEnclosingClass(); static final int DEFAULT_REPLICATION_DELAY = 4; static final int DEFAULT_RESCHEDULE_DELAY = 3; static final int DEFAULT_SLOW_LATENCY_THRESHOLD_SECS = 900; @@ -64,6 +66,13 @@ apis = ImmutableList.copyOf(cfg.getStringList("remote", name, "apiUrl")); connectionTimeout = cfg.getInt("remote", name, "connectionTimeout", DEFAULT_CONNECTION_TIMEOUT_MS); + int connectionTimeoutInSec = connectionTimeout / 1000; + if (connectionTimeoutInSec < getRemoteConfig().getTimeout()) { + logger.atWarning().log( + "The connection timeout is currently set to %s sec, which is less than the timeout value of %s sec. " + + "To avoid potential issues, consider increasing the connection timeout to exceed the timeout value.", + connectionTimeoutInSec, getRemoteConfig().getTimeout()); + } idleTimeout = cfg.getInt("remote", name, "idleTimeout", DEFAULT_MAX_CONNECTION_INACTIVITY_MS); maxConnectionsPerRoute = cfg.getInt("replication", "maxConnectionsPerRoute", DEFAULT_CONNECTIONS_PER_ROUTE);