From 57d333b8d7b77be83872ad39007940bb93e2cfa0 Mon Sep 17 00:00:00 2001
From: Simon Rettberg
Date: Wed, 8 Nov 2017 16:57:08 +0100
Subject: [SERVER] altservers: Short timeout during RTT measurement, round
 request range

Rounding to 4k so caching works efficiently
This should now close #3231
---
 src/server/altservers.c | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

(limited to 'src/server/altservers.c')

diff --git a/src/server/altservers.c b/src/server/altservers.c
index d0bb206..27fb27e 100644
--- a/src/server/altservers.c
+++ b/src/server/altservers.c
@@ -451,6 +451,7 @@ static void *altservers_main(void *data UNUSED)
 				logadd( LOG_DEBUG1, "Image has gone away that was queued for RTT measurement\n" );
 				continue;
 			}
+			logadd( LOG_DEBUG2, "Running altcheck for '%s:%d'", image->name, (int)image->rid );
 			assert( uplink->rttTestResult == RTT_INPROGRESS );
 			// Now get 4 alt servers
 			numAlts = altservers_getListForUplink( servers, ALTS, uplink->fd == -1 );
@@ -474,7 +475,7 @@ static void *altservers_main(void *data UNUSED)
 				usleep( 1000 ); // Wait a very short moment for the network to recover (we might be doing lots of measurements...)
 				// Connect
 				clock_gettime( BEST_CLOCK_SOURCE, &start );
-				int sock = sock_connect( &servers[itAlt], 750, _uplinkTimeout );
+				int sock = sock_connect( &servers[itAlt], 750, 1000 );
 				if ( sock < 0 ) continue;
 				// Select image ++++++++++++++++++++++++++++++
 				if ( !dnbd3_select_image( sock, image->name, image->rid, SI_SERVER_FLAGS ) ) {
@@ -560,6 +561,7 @@ static void *altservers_main(void *data UNUSED)
 			if ( bestSock != -1 && (uplink->fd == -1 || (bestRtt < 10000000 && RTT_THRESHOLD_FACTOR(currentRtt) > bestRtt)) ) {
 				// yep
 				logadd( LOG_DEBUG1, "Change @ %s - best: %luµs, current: %luµs\n", image->name, bestRtt, currentRtt );
+				sock_setTimeout( bestSock, _uplinkTimeout );
 				spin_lock( &uplink->rttLock );
 				uplink->betterFd = bestSock;
 				uplink->betterServer = servers[bestIndex];
-- 
cgit v1.2.3-55-g7522