shill: Revert "shill: resolver: Use (even) smaller DNS timeout"
The short DNS timeout was intended to work around an issue with
some DNS servers. The belief was that the DNS failure was
transient, and that a quick retry would improve DNS lookup times.
Field results didn't show any improvement, so back out this change.
Note further that, as of M25 stable, Chrome uses its own DNS
resolver. That resolver has a fixed one second timeout for the
first try, and exponential backoff thereafter.
Consequently, if this code remained in the tree, this code would
only affect system processes.
BUG=chromium:220150
TEST=unit tests
This reverts commit bf667617d573e3af4b808ed317b1d6ca04747ee4.
Conflicts:
connection.cc
connection_unittest.cc
default_profile_unittest.cc
manager.cc
manager.h
mock_resolver.h
resolver.cc
resolver.h
resolver_unittest.cc
Change-Id: Ic96c6c014a973de441ab1771539a0d9f3d5c5967
Reviewed-on: https://gerrit.chromium.org/gerrit/46944
Reviewed-by: Paul Stewart <pstew@chromium.org>
Commit-Queue: mukesh agrawal <quiche@chromium.org>
Tested-by: mukesh agrawal <quiche@chromium.org>
diff --git a/resolver_unittest.cc b/resolver_unittest.cc
index a5ee72d..bafcd05 100644
--- a/resolver_unittest.cc
+++ b/resolver_unittest.cc
@@ -30,17 +30,12 @@
"nameserver 8.8.8.8\n"
"nameserver 8.8.9.9\n"
"search chromium.org google.com\n"
- "options single-request timeout:1 attempts:3\n";
-const char kExpectedShortTimeoutOutput[] =
- "nameserver 8.8.8.8\n"
- "nameserver 8.8.9.9\n"
- "search chromium.org google.com\n"
- "options single-request timeout-ms:300 attempts:15\n";
+ "options single-request timeout:1\n";
const char kExpectedIgnoredSearchOutput[] =
"nameserver 8.8.8.8\n"
"nameserver 8.8.9.9\n"
"search google.com\n"
- "options single-request timeout:1 attempts:3\n";
+ "options single-request timeout:1\n";
} // namespace {}
class ResolverTest : public Test {
@@ -84,34 +79,13 @@
domain_search.push_back(kSearchDomain0);
domain_search.push_back(kSearchDomain1);
- EXPECT_TRUE(resolver_->SetDNSFromLists(
- dns_servers, domain_search, Resolver::kDefaultTimeout));
+ EXPECT_TRUE(resolver_->SetDNSFromLists(dns_servers, domain_search));
EXPECT_TRUE(file_util::PathExists(path_));
EXPECT_EQ(kExpectedOutput, ReadFile());
EXPECT_TRUE(resolver_->ClearDNS());
}
-TEST_F(ResolverTest, ShortTimeout) {
- EXPECT_FALSE(file_util::PathExists(path_));
- EXPECT_TRUE(resolver_->ClearDNS());
-
- MockControl control;
- vector<string> dns_servers;
- vector<string> domain_search;
- dns_servers.push_back(kNameServer0);
- dns_servers.push_back(kNameServer1);
- domain_search.push_back(kSearchDomain0);
- domain_search.push_back(kSearchDomain1);
-
- EXPECT_TRUE(resolver_->SetDNSFromLists(
- dns_servers, domain_search, Resolver::kShortTimeout));
- EXPECT_TRUE(file_util::PathExists(path_));
- EXPECT_EQ(kExpectedShortTimeoutOutput, ReadFile());
-
- EXPECT_TRUE(resolver_->ClearDNS());
-}
-
TEST_F(ResolverTest, Empty) {
EXPECT_FALSE(file_util::PathExists(path_));
@@ -119,8 +93,7 @@
vector<string> dns_servers;
vector<string> domain_search;
- EXPECT_TRUE(resolver_->SetDNSFromLists(
- dns_servers, domain_search, Resolver::kDefaultTimeout));
+ EXPECT_TRUE(resolver_->SetDNSFromLists(dns_servers, domain_search));
EXPECT_FALSE(file_util::PathExists(path_));
}
@@ -139,8 +112,7 @@
ignored_search.push_back(kSearchDomain0);
ignored_search.push_back(kSearchDomain2);
resolver_->set_ignored_search_list(ignored_search);
- EXPECT_TRUE(resolver_->SetDNSFromLists(
- dns_servers, domain_search, Resolver::kDefaultTimeout));
+ EXPECT_TRUE(resolver_->SetDNSFromLists(dns_servers, domain_search));
EXPECT_TRUE(file_util::PathExists(path_));
EXPECT_EQ(kExpectedIgnoredSearchOutput, ReadFile());