summaryrefslogtreecommitdiffstats
path: root/src/fuse
diff options
context:
space:
mode:
authorSimon Rettberg2015-12-01 18:17:48 +0100
committerSimon Rettberg2015-12-01 18:17:48 +0100
commitb0aa020c4130fefef84691d08b0c101cf491016d (patch)
tree7fa2f5e996e8e093b39d35543b95de76cf7c3752 /src/fuse
parent[FUSE] Fix losing requests on server change (diff)
downloaddnbd3-b0aa020c4130fefef84691d08b0c101cf491016d.tar.gz
dnbd3-b0aa020c4130fefef84691d08b0c101cf491016d.tar.xz
dnbd3-b0aa020c4130fefef84691d08b0c101cf491016d.zip
[FUSE] Remove debug code that forced server switches all the time
Diffstat (limited to 'src/fuse')
-rw-r--r--src/fuse/connection.c3
1 files changed, 1 insertions, 2 deletions
diff --git a/src/fuse/connection.c b/src/fuse/connection.c
index c0bcd6d..0c0374e 100644
--- a/src/fuse/connection.c
+++ b/src/fuse/connection.c
@@ -403,7 +403,6 @@ static void probeAltServers()
srv->rtt += srv->rtts[i];
}
srv->rtt /= RTT_COUNT;
- srv->rtt += rand() % 30000;
// Remember rtt if this server matches the current one
if ( isSameAddressPort( &srv->host, &connection.currentServer ) ) {
currentRtt = srv->rtt;
@@ -424,7 +423,7 @@ fail:;
}
// Switch if a better server was found
if ( bestIndex != -1
- && ( currentRtt > altservers[bestIndex].rtt || currentRtt > altservers[bestIndex].rtt + RTT_ABSOLUTE_THRESHOLD
+ && ( currentRtt > altservers[bestIndex].rtt + RTT_ABSOLUTE_THRESHOLD
|| RTT_THRESHOLD_FACTOR(currentRtt) > altservers[bestIndex].rtt + 1500 ) ) {
logadd( LOG_INFO, "Current: %dµs, best: %dµs. Will switch!", currentRtt, altservers[bestIndex].rtt );
switchConnection( bestSock, &altservers[bestIndex] );