Merge lp:~wallyworld/gwacl/fix-request-eof-2 into lp:gwacl

[Ian Booth]

The first fix for the request eof issue worked by setting
Close=true on the http request. This seemed to be not always
work so a different approach is used (same as for goose).
Set DisableKeepAlives=true on the http transport.

Fix request eof #2

The first fix for the request eof issue worked by setting
Close=true on the http request. This seemed to be not always
work so a different approach is used (same as for goose).
Set DisableKeepAlives=true on the http transport.

[Ian Booth (wallyworld)]

Please take a look.

[lp:~wallyworld/gwacl/fix-request-eof-2]

228. By Ian Booth on 2013-10-30

Ensure all transports have DisableKeepAlives=true

[Julian Edwards (julian-edwards)]

This is to much Go-fu for me to really understand what's going on.

[Julian Edwards (julian-edwards)]

*too* much, even

[Ian Booth (wallyworld)]

Self approving as this is the same solution as used for goose and juju-core.

review: Approve

=== modified file 'retry_policy.go'
--- retry_policy.go	2013-10-17 03:40:36 +0000
+++ retry_policy.go	2013-10-30 23:15:27 +0000
@@ -73,10 +73,6 @@
 }
 
 func (ret *retrier) RetryRequest(request *http.Request) (*http.Response, error) {
-    // See https://code.google.com/p/go/issues/detail?id=4677
-    // We need to force the connection to close each time so that we don't
-    // hit the above Go bug.
-    request.Close = true
     for {
         response, err := ret.client.Do(request)
         if err != nil {
@@ -107,10 +103,6 @@
 }
 
 func (ret *forkedHttpRetrier) RetryRequest(request *forkedHttp.Request) (*forkedHttp.Response, error) {
-    // See https://code.google.com/p/go/issues/detail?id=4677
-    // We need to force the connection to close each time so that we don't
-    // hit the above Go bug.
-    request.Close = true
     for {
         response, err := ret.client.Do(request)
         if err != nil {
 
=== modified file 'storage_base.go'
--- storage_base.go	2013-09-10 01:11:41 +0000
+++ storage_base.go	2013-10-30 23:15:27 +0000
@@ -41,6 +41,17 @@
     "Range",
 }
 
+func init() {
+	// See https://code.google.com/p/go/issues/detail?id=4677
+	// We need to force the connection to close each time so that we don't
+	// hit the above Go bug.
+	roundTripper := http.DefaultClient.Transport
+	if transport, ok := roundTripper.(*http.Transport); ok {
+		transport.DisableKeepAlives = true
+	}
+	http.DefaultTransport.(*http.Transport).DisableKeepAlives = true
+}
+
 // sign returns the base64-encoded HMAC-SHA256 signature of the given string
 // using the given base64-encoded key.
 func sign(accountKey, signable string) (string, error) {
 
=== modified file 'x509session.go'
--- x509session.go	2013-08-08 15:11:49 +0000
+++ x509session.go	2013-10-30 23:15:27 +0000
@@ -38,6 +38,10 @@
             TLSClientConfig: &tls.Config{
                 Certificates: certs,
             },
+            // See https://code.google.com/p/go/issues/detail?id=4677
+            // We need to force the connection to close each time so that we don't
+            // hit the above Go bug.
+            DisableKeepAlives: true,
         },
     }