Issue 5395004: AU: Always retry on failed connections, even manual checks.

Issue 5395004: AU: Always retry on failed connections, even manual checks. (Closed)

Created:
10 years ago by adlr

Modified:
9 years ago

Reviewers:
petkov

CC:
chromium-os-reviews_chromium.org, adlr

Base URL:
http://git.chromium.org/git/update_engine.git@master

Visibility:
Public.

Description

AU: Always retry on failed connections, even manual checks. This is a temporary workaround for a bug discovered w/ httpdate and the oobe. BUG=9736 TEST=unittests Change-Id: Ic7bbc867be0298d01686a9ea56ce9b012def5f7b Committed: http://chrome-svn/viewvc/chromeos?view=rev&revision=5d0783d

Patch Set 1 #

Created: 10 years ago

Download [raw] [tar.bz2]

		Unified diffs	Side-by-side diffs	Delta from patch set	Stats (+4 lines, -6 lines)			Patch
	M	libcurl_http_fetcher.cc	View		1 chunk	+1 line, -1 line	0 comments	Download
	M	update_attempter.cc	View		1 chunk	+3 lines, -5 lines	0 comments	Download

Messages

Total messages: 4 (0 generated)

Expand Messages | Collapse Messages

adlr

pushed. integrating to the branch and rerunning unittests... will push in the branch shortly. On ...

10 years ago (2010-11-30 02:16:39 UTC) #2

pushed. integrating to the branch and rerunning unittests... will push in
the branch shortly.

On Mon, Nov 29, 2010 at 6:13 PM, <adlr@chromium.org> wrote:

> Reviewers: ,
>
> Message:
> TBRing...
>
> Description:
> AU: Always retry on failed connections, even manual checks.
>
> This is a temporary workaround for a bug discovered w/ httpdate and
> the oobe.
>
> BUG=9736
> TEST=unittests
>
> Change-Id: Ic7bbc867be0298d01686a9ea56ce9b012def5f7b
>
> Please review this at http://codereview.chromium.org/5395004/
>
> SVN Base: http://git.chromium.org/git/update_engine.git@master
>
> Affected files:
>  M libcurl_http_fetcher.cc
>  M update_attempter.cc
>
>
> Index: libcurl_http_fetcher.cc
> diff --git a/libcurl_http_fetcher.cc b/libcurl_http_fetcher.cc
> index
>
170abfa702e5892ada8dce93b39b6913d646a416..2502b6dda5da0ce9f37717d7bee05b4524cb46fb
> 100644
> --- a/libcurl_http_fetcher.cc
> +++ b/libcurl_http_fetcher.cc
> @@ -25,7 +25,7 @@ namespace chromeos_update_engine {
>
>  namespace {
>  const int kMaxRetriesCount = 20;
> -const int kNoNetworkRetrySeconds = 30;
> +const int kNoNetworkRetrySeconds = 10;
>  const char kCACertificatesPath[] = "/usr/share/chromeos-ca-certificates";
>  }  // namespace {}
>
> Index: update_attempter.cc
> diff --git a/update_attempter.cc b/update_attempter.cc
> index
>
7c958cb777fb07fd7a8ec17bd0e2e8eb849fda23..529338a83ee0e00e45e712ca64b1db5216fe7e64
> 100644
> --- a/update_attempter.cc
> +++ b/update_attempter.cc
> @@ -164,11 +164,9 @@ void UpdateAttempter::Update(const std::string&
> app_version,
>   // Actions:
>   LibcurlHttpFetcher* update_check_fetcher =
>       new LibcurlHttpFetcher(GetProxyResolver());
> -  // If this is an automatic check, try harder to connect to the network.
> See
> -  // comment in libcurl_http_fetcher.cc.
> -  if (!obey_proxies) {
> -    update_check_fetcher->set_no_network_max_retries(3);
> -  }
> +  // Try harder to connect to the network. See comment in
> +  // libcurl_http_fetcher.cc.
> +  update_check_fetcher->set_no_network_max_retries(3);
>   shared_ptr<OmahaRequestAction> update_check_action(
>       new OmahaRequestAction(prefs_,
>                              omaha_request_params_,
>
>
>

adlr

pushed to the branch On Mon, Nov 29, 2010 at 6:16 PM, Andrew de los ...

10 years ago (2010-11-30 02:21:38 UTC) #3

pushed to the branch

On Mon, Nov 29, 2010 at 6:16 PM, Andrew de los Reyes <adlr@chromium.org>wrote:

> pushed. integrating to the branch and rerunning unittests... will push in
> the branch shortly.
>
>
> On Mon, Nov 29, 2010 at 6:13 PM, <adlr@chromium.org> wrote:
>
>> Reviewers: ,
>>
>> Message:
>> TBRing...
>>
>> Description:
>> AU: Always retry on failed connections, even manual checks.
>>
>> This is a temporary workaround for a bug discovered w/ httpdate and
>> the oobe.
>>
>> BUG=9736
>> TEST=unittests
>>
>> Change-Id: Ic7bbc867be0298d01686a9ea56ce9b012def5f7b
>>
>> Please review this at http://codereview.chromium.org/5395004/
>>
>> SVN Base: http://git.chromium.org/git/update_engine.git@master
>>
>> Affected files:
>>  M libcurl_http_fetcher.cc
>>  M update_attempter.cc
>>
>>
>> Index: libcurl_http_fetcher.cc
>> diff --git a/libcurl_http_fetcher.cc b/libcurl_http_fetcher.cc
>> index
>>
170abfa702e5892ada8dce93b39b6913d646a416..2502b6dda5da0ce9f37717d7bee05b4524cb46fb
>> 100644
>> --- a/libcurl_http_fetcher.cc
>> +++ b/libcurl_http_fetcher.cc
>> @@ -25,7 +25,7 @@ namespace chromeos_update_engine {
>>
>>  namespace {
>>  const int kMaxRetriesCount = 20;
>> -const int kNoNetworkRetrySeconds = 30;
>> +const int kNoNetworkRetrySeconds = 10;
>>  const char kCACertificatesPath[] = "/usr/share/chromeos-ca-certificates";
>>  }  // namespace {}
>>
>> Index: update_attempter.cc
>> diff --git a/update_attempter.cc b/update_attempter.cc
>> index
>>
7c958cb777fb07fd7a8ec17bd0e2e8eb849fda23..529338a83ee0e00e45e712ca64b1db5216fe7e64
>> 100644
>> --- a/update_attempter.cc
>> +++ b/update_attempter.cc
>> @@ -164,11 +164,9 @@ void UpdateAttempter::Update(const std::string&
>> app_version,
>>   // Actions:
>>   LibcurlHttpFetcher* update_check_fetcher =
>>       new LibcurlHttpFetcher(GetProxyResolver());
>> -  // If this is an automatic check, try harder to connect to the network.
>> See
>> -  // comment in libcurl_http_fetcher.cc.
>> -  if (!obey_proxies) {
>> -    update_check_fetcher->set_no_network_max_retries(3);
>> -  }
>> +  // Try harder to connect to the network. See comment in
>> +  // libcurl_http_fetcher.cc.
>> +  update_check_fetcher->set_no_network_max_retries(3);
>>   shared_ptr<OmahaRequestAction> update_check_action(
>>       new OmahaRequestAction(prefs_,
>>                              omaha_request_params_,
>>
>>
>>
>

LGTM

Expand Messages | Collapse Messages