AU: Retry up to 3 times 30 seconds apart on HTTP response code 0.

libcurl_http_fetcher.h

 // Copyright (c) 2009 The Chromium OS Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #ifndef CHROMEOS_PLATFORM_UPDATE_ENGINE_LIBCURL_HTTP_FETCHER_H__
 #define CHROMEOS_PLATFORM_UPDATE_ENGINE_LIBCURL_HTTP_FETCHER_H__
 
 #include <map>
 #include <string>
 #include <curl/curl.h>
@@ skipping 15 matching lines @@
       : HttpFetcher(proxy_resolver),
         curl_multi_handle_(NULL),
         curl_handle_(NULL),
         timeout_source_(NULL),
         transfer_in_progress_(false),
         transfer_size_(0),
         bytes_downloaded_(0),
         resume_offset_(0),
         retry_count_(0),
         retry_seconds_(60),
+        no_network_retry_count_(0),
+        no_network_max_retries_(0),
         idle_seconds_(1),
         force_connection_type_(false),
         forced_expensive_connection_(false),
         force_build_type_(false),
         forced_official_build_(false),
         in_write_callback_(false),
         sent_byte_(false),
         terminate_requested_(false) {}
 
   // Cleans up all internal state. Does not notify delegate
@@ skipping 21 matching lines @@
   // From http://curl.haxx.se/libcurl/c/curl_multi_timeout.html:
   //     if libcurl returns a -1 timeout here, it just means that libcurl
   //     currently has no stored timeout value. You must not wait too long
   //     (more than a few seconds perhaps) before you call
   //     curl_multi_perform() again.
   void set_idle_seconds(int seconds) { idle_seconds_ = seconds; }
 
   // Sets the retry timeout. Useful for testing.
   void set_retry_seconds(int seconds) { retry_seconds_ = seconds; }
 
+  void set_no_network_max_retries(int retries) {
+    no_network_max_retries_ = retries;
+  }
+
   void SetConnectionAsExpensive(bool is_expensive) {
     force_connection_type_ = true;
     forced_expensive_connection_ = is_expensive;
   }
 
   void SetBuildType(bool is_official) {
     force_build_type_ = true;
     forced_official_build_ = is_official;
   }
 
@@ skipping 91 matching lines @@
   // In this class, resume refers to resuming a dropped HTTP connection,
   // not to resuming an interrupted download.
   off_t resume_offset_;
 
   // Number of resumes performed.
   int retry_count_;
 
   // Seconds to wait before retrying a resume.
   int retry_seconds_;
 
+  // Number of resumes due to HTTP response code 0.

[adlr, 2010/11/29 21:23:28]

... due to no network (i.e., HTTP response code 0).

This comment helps make it clear that "no" in the var names is the word "no" and
not the abbreviation for "number."

[petkov, 2010/11/29 21:28:19]

Done.

+  int no_network_retry_count_;
+  int no_network_max_retries_;
+
   // Seconds to wait before asking libcurl to "perform".
   int idle_seconds_;
 
   // If true, assume the network is expensive or not, according to
   // forced_expensive_connection_. (Useful for testing).
   bool force_connection_type_;
   bool forced_expensive_connection_;
 
   // If true, assume the build is official or not, according to
   // forced_official_build_. Useful for testing.
   bool force_build_type_;
   bool forced_official_build_;
 
   // If true, we are currently performing a write callback on the delegate.
   bool in_write_callback_;
-  
+
   // If true, we have returned at least one byte in the write callback
   // to the delegate.
   bool sent_byte_;
 
   // We can't clean everything up while we're in a write callback, so
   // if we get a terminate request, queue it until we can handle it.
   bool terminate_requested_;
 
   DISALLOW_COPY_AND_ASSIGN(LibcurlHttpFetcher);
 };
 
 }  // namespace chromeos_update_engine
 
 #endif  // CHROMEOS_PLATFORM_UPDATE_ENGINE_LIBCURL_HTTP_FETCHER_H__