From d661414a43b60ffdcd1df18bc8d5da773e49e912 Mon Sep 17 00:00:00 2001
From: Aaron Rosen <aaronorosen@gmail.com>
Date: Thu, 9 Jan 2014 17:45:47 -0800
Subject: [PATCH] Work around for httplib2 retries on timeout

httplib2 automatically retries a request on a timeout even if the request
is a POST. This can lead to orphaned objects being created that we
don't know about. This patch sets httplib2.RETRIES to 1 to avoid this.

Note: httplib2.RETRIES is only available in new versions of httplib2.
See: https://code.google.com/p/httplib2/issues/detail?id=124 for more
details.

Co-Authored-By: Ashwin Raveendran <ashw7n@gmail.com>
Co-Authored-By: Sudheendra Murthy <sudhi.vm@gmail.com

Change-Id: I5648b644bb9df1fd2ea219159794d9d122696af0
Closes-bug: #1267649
---
 neutronclient/client.py | 4 ++++
 requirements.txt        | 2 +-
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/neutronclient/client.py b/neutronclient/client.py
index 83d66b8c0..f89b2ef90 100644
--- a/neutronclient/client.py
+++ b/neutronclient/client.py
@@ -30,6 +30,10 @@ from neutronclient.openstack.common.gettextutils import _
 
 _logger = logging.getLogger(__name__)
 
+# httplib2 retries requests on socket.timeout which
+# is not idempotent and can lead to orhan objects.
+# See: https://code.google.com/p/httplib2/issues/detail?id=124
+httplib2.RETRIES = 1
 
 if os.environ.get('NEUTRONCLIENT_DEBUG'):
     ch = logging.StreamHandler()
diff --git a/requirements.txt b/requirements.txt
index a91f572d0..d6d98bf9f 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -1,7 +1,7 @@
 pbr>=0.5.21,<1.0
 argparse
 cliff>=1.4.3
-httplib2
+httplib2>=0.7.5
 iso8601>=0.1.4
 simplejson>=2.0.9
 six>=1.4.1