Revert of 112134 of Revert 112130 - Close idle connections / SPDY sessions when needed.

Due to the idle connection state being held by different socket pools, it's possible for one socket pool to hold an idle socket in a lower layer socket pool. From the lower level socket pool's perspective, the socket is being "actively" used. From the higher socket pool's (including SpdySession, which is more of a connection manager) perspective, the connection is idle and can be closed if we have hit a limit.

Normally this isn't a big deal, except when we have a lot of idle SPDY connections and are connecting via a proxy, so we have low connection limits through the proxy server. We address this problem by allowing lower-level socket pools to tell higher level socket pools to close a socket. 

Fixed ASAN test failures by removing  .Times(1) and .Times(2)  from CloseMultipleIdleSocketsHeldByLayeredPoolWhenNeeded unittest (this removes the tests relying on the order of std::set in CloseOneIdleConnectionInLayeredPool). ASAN is probably causing the memory allocator to allocate the pools differently. The std::set is ordered by LayeredPool* which is the address of the LayeredPool (willchan).


BUG=62364,92244, 105839
TEST=none


Review URL: http://codereview.chromium.org/8340012

TBR=willchan@chromium.org
Review URL: http://codereview.chromium.org/8745007

TBR=willchan@chromium.org

Review URL: http://codereview.chromium.org/8803019

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@113300 0039d316-1c4b-4281-b951-d872f2087c98

3 files changed, 223 insertions, 3 deletions

diff --git a/net/http/http_network_transaction_unittest.cc b/net/http/http_network_transaction_unittest.cc
index 86ea90c..c3a9d11 100644
--- a/net/http/http_network_transaction_unittest.cc
+++ b/net/http/http_network_transaction_unittest.cc
@@ -9642,4 +9642,182 @@ TEST_F(HttpNetworkTransactionTest, SendPipelineEvictionFallback) {
   EXPECT_EQ("hello world", out.response_data);
 }
 
+TEST_F(HttpNetworkTransactionTest, CloseOldSpdySessionToOpenNewOne) {
+  HttpStreamFactory::set_next_protos(SpdyNextProtos());
+  int old_max_sockets_per_group =
+      ClientSocketPoolManager::max_sockets_per_group();
+  int old_max_sockets_per_proxy_server =
+      ClientSocketPoolManager::max_sockets_per_proxy_server();
+  int old_max_sockets_per_pool =
+      ClientSocketPoolManager::max_sockets_per_pool();
+  ClientSocketPoolManager::set_max_sockets_per_group(1);
+  ClientSocketPoolManager::set_max_sockets_per_proxy_server(1);
+  ClientSocketPoolManager::set_max_sockets_per_pool(1);
+
+  // Use two different hosts with different IPs so they don't get pooled.
+  SessionDependencies session_deps;
+  session_deps.host_resolver->rules()->AddRule("a.com", "10.0.0.1");
+  session_deps.host_resolver->rules()->AddRule("b.com", "10.0.0.2");
+  scoped_refptr<HttpNetworkSession> session(CreateSession(&session_deps));
+
+  SSLSocketDataProvider ssl1(true, OK);
+  ssl1.next_proto_status = SSLClientSocket::kNextProtoNegotiated;
+  ssl1.next_proto = "spdy/2";
+  ssl1.was_npn_negotiated = true;
+  SSLSocketDataProvider ssl2(true, OK);
+  ssl2.next_proto_status = SSLClientSocket::kNextProtoNegotiated;
+  ssl2.next_proto = "spdy/2";
+  ssl2.was_npn_negotiated = true;
+  session_deps.socket_factory.AddSSLSocketDataProvider(&ssl1);
+  session_deps.socket_factory.AddSSLSocketDataProvider(&ssl2);
+
+  scoped_ptr<spdy::SpdyFrame> host1_req(ConstructSpdyGet(
+      "https://www.a.com", false, 1, LOWEST));
+  MockWrite spdy1_writes[] = {
+    CreateMockWrite(*host1_req, 1),
+  };
+  scoped_ptr<spdy::SpdyFrame> host1_resp(ConstructSpdyGetSynReply(NULL, 0, 1));
+  scoped_ptr<spdy::SpdyFrame> host1_resp_body(ConstructSpdyBodyFrame(1, true));
+  MockRead spdy1_reads[] = {
+    CreateMockRead(*host1_resp, 2),
+    CreateMockRead(*host1_resp_body, 3),
+    MockRead(true, ERR_IO_PENDING, 4),
+  };
+
+  scoped_refptr<OrderedSocketData> spdy1_data(
+      new OrderedSocketData(
+          spdy1_reads, arraysize(spdy1_reads),
+          spdy1_writes, arraysize(spdy1_writes)));
+  session_deps.socket_factory.AddSocketDataProvider(spdy1_data);
+
+  scoped_ptr<spdy::SpdyFrame> host2_req(ConstructSpdyGet(
+      "https://www.b.com", false, 1, LOWEST));
+  MockWrite spdy2_writes[] = {
+    CreateMockWrite(*host2_req, 1),
+  };
+  scoped_ptr<spdy::SpdyFrame> host2_resp(ConstructSpdyGetSynReply(NULL, 0, 1));
+  scoped_ptr<spdy::SpdyFrame> host2_resp_body(ConstructSpdyBodyFrame(1, true));
+  MockRead spdy2_reads[] = {
+    CreateMockRead(*host2_resp, 2),
+    CreateMockRead(*host2_resp_body, 3),
+    MockRead(true, ERR_IO_PENDING, 4),
+  };
+
+  scoped_refptr<OrderedSocketData> spdy2_data(
+      new OrderedSocketData(
+          spdy2_reads, arraysize(spdy2_reads),
+          spdy2_writes, arraysize(spdy2_writes)));
+  session_deps.socket_factory.AddSocketDataProvider(spdy2_data);
+
+  MockWrite http_write[] = {
+    MockWrite("GET / HTTP/1.1\r\n"
+              "Host: www.a.com\r\n"
+              "Connection: keep-alive\r\n\r\n"),
+  };
+
+  MockRead http_read[] = {
+    MockRead("HTTP/1.1 200 OK\r\n"),
+    MockRead("Content-Type: text/html; charset=iso-8859-1\r\n"),
+    MockRead("Content-Length: 6\r\n\r\n"),
+    MockRead("hello!"),
+  };
+
+  StaticSocketDataProvider http_data(http_read, arraysize(http_read),
+                                     http_write, arraysize(http_write));
+  session_deps.socket_factory.AddSocketDataProvider(&http_data);
+
+  HostPortPair host_port_pair_a("www.a.com", 443);
+  HostPortProxyPair host_port_proxy_pair_a(
+      host_port_pair_a, ProxyServer::Direct());
+  EXPECT_FALSE(
+      session->spdy_session_pool()->HasSession(host_port_proxy_pair_a));
+
+  TestOldCompletionCallback callback;
+  HttpRequestInfo request1;
+  request1.method = "GET";
+  request1.url = GURL("https://www.a.com/");
+  request1.load_flags = 0;
+  scoped_ptr<HttpNetworkTransaction> trans(new HttpNetworkTransaction(session));
+
+  int rv = trans->Start(&request1, &callback, BoundNetLog());
+  EXPECT_EQ(ERR_IO_PENDING, rv);
+  EXPECT_EQ(OK, callback.WaitForResult());
+
+  const HttpResponseInfo* response = trans->GetResponseInfo();
+  ASSERT_TRUE(response != NULL);
+  ASSERT_TRUE(response->headers != NULL);
+  EXPECT_EQ("HTTP/1.1 200 OK", response->headers->GetStatusLine());
+  EXPECT_TRUE(response->was_fetched_via_spdy);
+  EXPECT_TRUE(response->was_npn_negotiated);
+
+  std::string response_data;
+  ASSERT_EQ(OK, ReadTransaction(trans.get(), &response_data));
+  EXPECT_EQ("hello!", response_data);
+  trans.reset();
+  EXPECT_TRUE(
+      session->spdy_session_pool()->HasSession(host_port_proxy_pair_a));
+
+  HostPortPair host_port_pair_b("www.b.com", 443);
+  HostPortProxyPair host_port_proxy_pair_b(
+      host_port_pair_b, ProxyServer::Direct());
+  EXPECT_FALSE(
+      session->spdy_session_pool()->HasSession(host_port_proxy_pair_b));
+  HttpRequestInfo request2;
+  request2.method = "GET";
+  request2.url = GURL("https://www.b.com/");
+  request2.load_flags = 0;
+  trans.reset(new HttpNetworkTransaction(session));
+
+  rv = trans->Start(&request2, &callback, BoundNetLog());
+  EXPECT_EQ(ERR_IO_PENDING, rv);
+  EXPECT_EQ(OK, callback.WaitForResult());
+
+  response = trans->GetResponseInfo();
+  ASSERT_TRUE(response != NULL);
+  ASSERT_TRUE(response->headers != NULL);
+  EXPECT_EQ("HTTP/1.1 200 OK", response->headers->GetStatusLine());
+  EXPECT_TRUE(response->was_fetched_via_spdy);
+  EXPECT_TRUE(response->was_npn_negotiated);
+  ASSERT_EQ(OK, ReadTransaction(trans.get(), &response_data));
+  EXPECT_EQ("hello!", response_data);
+  EXPECT_FALSE(
+      session->spdy_session_pool()->HasSession(host_port_proxy_pair_a));
+  EXPECT_TRUE(
+      session->spdy_session_pool()->HasSession(host_port_proxy_pair_b));
+
+  HostPortPair host_port_pair_a1("www.a.com", 80);
+  HostPortProxyPair host_port_proxy_pair_a1(
+      host_port_pair_a1, ProxyServer::Direct());
+  EXPECT_FALSE(
+      session->spdy_session_pool()->HasSession(host_port_proxy_pair_a1));
+  HttpRequestInfo request3;
+  request3.method = "GET";
+  request3.url = GURL("http://www.a.com/");
+  request3.load_flags = 0;
+  trans.reset(new HttpNetworkTransaction(session));
+
+  rv = trans->Start(&request3, &callback, BoundNetLog());
+  EXPECT_EQ(ERR_IO_PENDING, rv);
+  EXPECT_EQ(OK, callback.WaitForResult());
+
+  response = trans->GetResponseInfo();
+  ASSERT_TRUE(response != NULL);
+  ASSERT_TRUE(response->headers != NULL);
+  EXPECT_EQ("HTTP/1.1 200 OK", response->headers->GetStatusLine());
+  EXPECT_FALSE(response->was_fetched_via_spdy);
+  EXPECT_FALSE(response->was_npn_negotiated);
+  ASSERT_EQ(OK, ReadTransaction(trans.get(), &response_data));
+  EXPECT_EQ("hello!", response_data);
+  EXPECT_FALSE(
+      session->spdy_session_pool()->HasSession(host_port_proxy_pair_a));
+  EXPECT_FALSE(
+      session->spdy_session_pool()->HasSession(host_port_proxy_pair_b));
+
+  HttpStreamFactory::set_next_protos(std::vector<std::string>());
+  ClientSocketPoolManager::set_max_sockets_per_pool(old_max_sockets_per_pool);
+  ClientSocketPoolManager::set_max_sockets_per_proxy_server(
+      old_max_sockets_per_proxy_server);
+  ClientSocketPoolManager::set_max_sockets_per_group(old_max_sockets_per_group);
+}
+
 }  // namespace net
diff --git a/net/http/http_proxy_client_socket_pool.cc b/net/http/http_proxy_client_socket_pool.cc
index d4c080f..f7d3206 100644
--- a/net/http/http_proxy_client_socket_pool.cc
+++ b/net/http/http_proxy_client_socket_pool.cc
@@ -391,9 +391,21 @@ HttpProxyClientSocketPool::HttpProxyClientSocketPool(
             new HttpProxyConnectJobFactory(transport_pool,
                                            ssl_pool,
                                            host_resolver,
-                                           net_log)) {}
+                                           net_log)) {
+  // We should always have a |transport_pool_| except in unit tests.
+  if (transport_pool_)
+    transport_pool_->AddLayeredPool(this);
+  if (ssl_pool_)
+    ssl_pool_->AddLayeredPool(this);
+}
 
-HttpProxyClientSocketPool::~HttpProxyClientSocketPool() {}
+HttpProxyClientSocketPool::~HttpProxyClientSocketPool() {
+  if (ssl_pool_)
+    ssl_pool_->RemoveLayeredPool(this);
+  // We should always have a |transport_pool_| except in unit tests.
+  if (transport_pool_)
+    transport_pool_->RemoveLayeredPool(this);
+}
 
 int HttpProxyClientSocketPool::RequestSocket(const std::string& group_name,
                                              const void* socket_params,
@@ -434,6 +446,12 @@ void HttpProxyClientSocketPool::Flush() {
   base_.Flush();
 }
 
+bool HttpProxyClientSocketPool::IsStalled() const {
+  return base_.IsStalled() ||
+      (transport_pool_ && transport_pool_->IsStalled()) ||
+      (ssl_pool_ && ssl_pool_->IsStalled());
+}
+
 void HttpProxyClientSocketPool::CloseIdleSockets() {
   base_.CloseIdleSockets();
 }
@@ -452,6 +470,14 @@ LoadState HttpProxyClientSocketPool::GetLoadState(
   return base_.GetLoadState(group_name, handle);
 }
 
+void HttpProxyClientSocketPool::AddLayeredPool(LayeredPool* layered_pool) {
+  base_.AddLayeredPool(layered_pool);
+}
+
+void HttpProxyClientSocketPool::RemoveLayeredPool(LayeredPool* layered_pool) {
+  base_.RemoveLayeredPool(layered_pool);
+}
+
 DictionaryValue* HttpProxyClientSocketPool::GetInfoAsValue(
     const std::string& name,
     const std::string& type,
@@ -482,4 +508,10 @@ ClientSocketPoolHistograms* HttpProxyClientSocketPool::histograms() const {
   return base_.histograms();
 }
 
+bool HttpProxyClientSocketPool::CloseOneIdleConnection() {
+  if (base_.CloseOneIdleSocket())
+    return true;
+  return base_.CloseOneIdleConnectionInLayeredPool();
+}
+
 }  // namespace net
diff --git a/net/http/http_proxy_client_socket_pool.h b/net/http/http_proxy_client_socket_pool.h
index 6fe83dd..31d21cb 100644
--- a/net/http/http_proxy_client_socket_pool.h
+++ b/net/http/http_proxy_client_socket_pool.h
@@ -167,7 +167,8 @@ class HttpProxyConnectJob : public ConnectJob {
   DISALLOW_COPY_AND_ASSIGN(HttpProxyConnectJob);
 };
 
-class NET_EXPORT_PRIVATE HttpProxyClientSocketPool : public ClientSocketPool {
+class NET_EXPORT_PRIVATE HttpProxyClientSocketPool
+    : public ClientSocketPool, public LayeredPool {
  public:
   HttpProxyClientSocketPool(
       int max_sockets,
@@ -202,6 +203,8 @@ class NET_EXPORT_PRIVATE HttpProxyClientSocketPool : public ClientSocketPool {
 
   virtual void Flush() OVERRIDE;
 
+  virtual bool IsStalled() const OVERRIDE;
+
   virtual void CloseIdleSockets() OVERRIDE;
 
   virtual int IdleSocketCount() const OVERRIDE;
@@ -213,6 +216,10 @@ class NET_EXPORT_PRIVATE HttpProxyClientSocketPool : public ClientSocketPool {
       const std::string& group_name,
       const ClientSocketHandle* handle) const OVERRIDE;
 
+  virtual void AddLayeredPool(LayeredPool* layered_pool) OVERRIDE;
+
+  virtual void RemoveLayeredPool(LayeredPool* layered_pool) OVERRIDE;
+
   virtual base::DictionaryValue* GetInfoAsValue(
       const std::string& name,
       const std::string& type,
@@ -222,6 +229,9 @@ class NET_EXPORT_PRIVATE HttpProxyClientSocketPool : public ClientSocketPool {
 
   virtual ClientSocketPoolHistograms* histograms() const OVERRIDE;
 
+  // LayeredPool methods:
+  virtual bool CloseOneIdleConnection() OVERRIDE;
+
  private:
   typedef ClientSocketPoolBase<HttpProxySocketParams> PoolBase;