Changeset 10096

Timestamp:

Feb 5, 2010, 1:47:33 AM (12 years ago)

Author:

charles

Message:

(trunk libT) #2854 "Tracker did not respond" -- when calculating the interval to wait before retrying a failed announce or scrape, take into account that tracker's responses to other torrents' announces/scrapes

File:

• trunk/libtransmission/announcer.c (modified) (12 diffs)

trunk/libtransmission/announcer.c

@@ -48 +48 @@
     DEFAULT_ANNOUNCE_MIN_INTERVAL_SEC = ( 60 * 2 ),
 
-    /* how long to wait before a reannounce the first time we get an error */
-    FIRST_ANNOUNCE_RETRY_INTERVAL_SEC = 30,
-
-    /* how long to wait before a rescrape the first time we get an error */
-    FIRST_SCRAPE_RETRY_INTERVAL_SEC = 120,
-
     /* the length of the 'key' argument passed in tracker requests */
     KEYLEN = 8,
@@ -110 +104 @@
     /* the last time we sent an announce or scrape message */
     time_t lastRequestTime;
+
+    /* the last successful announce/scrape time for this host */
+    time_t lastSuccessfulRequest;
 }
 tr_host;
@@ -376 +373 @@
     int announceIntervalSec;
     int announceMinIntervalSec;
-    int retryAnnounceIntervalSec;
-    int retryScrapeIntervalSec;
 
     int lastAnnouncePeerCount;
@@ -432 +427 @@
     tier->announceIntervalSec = DEFAULT_ANNOUNCE_INTERVAL_SEC;
     tier->announceMinIntervalSec = DEFAULT_ANNOUNCE_MIN_INTERVAL_SEC;
-    tier->retryAnnounceIntervalSec = FIRST_ANNOUNCE_RETRY_INTERVAL_SEC;
-    tier->retryScrapeIntervalSec = FIRST_SCRAPE_RETRY_INTERVAL_SEC;
     tier->isAnnouncing = FALSE;
     tier->isScraping = FALSE;
@@ -974 +967 @@
 
 static int
+getRetryInterval( const tr_host * host )
+{
+    int interval;
+    const int jitter = tr_cryptoWeakRandInt( 120 );
+    const time_t timeSinceLastSuccess = tr_time() - host->lastSuccessfulRequest;
+         if( timeSinceLastSuccess < 15*60 ) interval = 0;
+    else if( timeSinceLastSuccess < 30*60 ) interval = 60*4;
+    else if( timeSinceLastSuccess < 45*60 ) interval = 60*8;
+    else if( timeSinceLastSuccess < 60*60 ) interval = 60*16;
+    else                                    interval = 60*32;
+    return interval + jitter;
+}
+
+static int
 compareTiers( const void * va, const void * vb )
 {
@@ -1086 +1093 @@
         success = TRUE;
 
-        tier->retryAnnounceIntervalSec = FIRST_ANNOUNCE_RETRY_INTERVAL_SEC;
-
         if( tr_bencDictFindStr( &benc, "failure reason", &str ) )
         {
@@ -1258 +1263 @@
         if( responseCode == 0 )
         {
-            const int interval = tr_cryptoWeakRandInt( 120 );
+            const int interval = getRetryInterval( tier->currentTracker->host );
             dbgmsg( tier, "No response from tracker... retrying in %d seconds.", interval );
             tier->manualAnnounceAllowedAt = ~(time_t)0;
@@ -1306 +1311 @@
              * incapable of performing the request.  So we pause a bit and
              * try again. */
+            const int interval = getRetryInterval( tier->currentTracker->host );
             tier->manualAnnounceAllowedAt = ~(time_t)0;
-            tierSetNextAnnounce( tier, tier->announceEvent, now + tier->retryAnnounceIntervalSec );
-            tier->retryAnnounceIntervalSec *= 2;
+            tierSetNextAnnounce( tier, tier->announceEvent, now + interval );
         }
         else
@@ -1322 +1327 @@
 
         if( success )
+        {
             tier->isRunning = data->isRunningOnSuccess;
+
+            if( tier->currentTracker->host )
+                tier->currentTracker->host->lastSuccessfulRequest = now;
+        }
 
         if( !success )
@@ -1435 +1445 @@
                        "Scrape successful. Rescraping in %d seconds.",
                        tier->scrapeIntervalSec );
-
-            tier->retryScrapeIntervalSec = FIRST_SCRAPE_RETRY_INTERVAL_SEC;
         }
     }
@@ -1504 +1512 @@
         else
         {
-            const int interval = tier->retryScrapeIntervalSec;
-            tier->retryScrapeIntervalSec *= 2;
+            const int interval = getRetryInterval( tier->currentTracker->host );
 
             /* Don't retry on a 4xx.
@@ -1526 +1533 @@
 
         tier->lastScrapeSucceeded = success;
+
+        if( success && tier->currentTracker->host )
+            tier->currentTracker->host->lastSuccessfulRequest = now;
     }