Merge branch 'stable-2.10' into stable-2.11
* stable-2.10:
Set connection timeout to 120 sec for SSH remote operations
Change-Id: Icec15cad4912a5a8c38ab73694fd200fa7f64cd2
diff --git a/src/main/java/com/googlesource/gerrit/plugins/replication/ReplicationQueue.java b/src/main/java/com/googlesource/gerrit/plugins/replication/ReplicationQueue.java
index 789e26a..617dc02 100644
--- a/src/main/java/com/googlesource/gerrit/plugins/replication/ReplicationQueue.java
+++ b/src/main/java/com/googlesource/gerrit/plugins/replication/ReplicationQueue.java
@@ -62,6 +62,7 @@
HeadUpdatedListener {
static final String REPLICATION_LOG_NAME = "replication_log";
static final Logger repLog = LoggerFactory.getLogger(REPLICATION_LOG_NAME);
+ private static final int SSH_REMOTE_TIMEOUT = 120 * 1000;
private static final ReplicationStateLogger stateLog =
new ReplicationStateLogger(repLog);
@@ -423,7 +424,8 @@
}
private static RemoteSession connect(URIish uri) throws TransportException {
- return SshSessionFactory.getInstance().getSession(uri, null, FS.DETECTED, 0);
+ return SshSessionFactory.getInstance().getSession(uri, null, FS.DETECTED,
+ SSH_REMOTE_TIMEOUT);
}
private static OutputStream newErrorBufferStream() {
