summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSimon Rettberg2019-08-28 13:12:57 +0200
committerSimon Rettberg2019-08-28 13:12:57 +0200
commitbfdbeec41fcdc5ba41a5f4a33271f374e1f801b1 (patch)
tree3f1ac18f89d245a4e83bad65acf9058c5edee0e6
parent[SERVER] Make signal handling more POSIX (diff)
parent[FUSE] Increase socket timeout from 1 to 3 seconds (diff)
downloaddnbd3-bfdbeec41fcdc5ba41a5f4a33271f374e1f801b1.tar.gz
dnbd3-bfdbeec41fcdc5ba41a5f4a33271f374e1f801b1.tar.xz
dnbd3-bfdbeec41fcdc5ba41a5f4a33271f374e1f801b1.zip
Merge branch 'master' into atomic
-rw-r--r--src/fuse/connection.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/fuse/connection.c b/src/fuse/connection.c
index fc9f05b..98b1d36 100644
--- a/src/fuse/connection.c
+++ b/src/fuse/connection.c
@@ -141,7 +141,7 @@ bool connection_init(const char *hosts, const char *lowerImage, const uint16_t r
if ( i >= altIndex ) {
// Additional iteration - no corresponding slot in altservers, this
// is just so we can make a final calls with longer timeout
- sock = sock_multiConnect( cons, NULL, 400, 1000 );
+ sock = sock_multiConnect( cons, NULL, 400, 3000 );
if ( sock == -2 ) {
logadd( LOG_ERROR, "Could not connect to any host" );
sock = -1;
@@ -151,7 +151,7 @@ bool connection_init(const char *hosts, const char *lowerImage, const uint16_t r
if ( altservers[i].host.type == 0 )
continue;
// Try to connect - 100ms timeout
- sock = sock_multiConnect( cons, &altservers[i].host, 100, 1000 );
+ sock = sock_multiConnect( cons, &altservers[i].host, 100, 3000 );
}
if ( sock == -2 || sock == -1 )
continue;