xCAT/pyghmi
2
0
Fork 0
mirror of https://opendev.org/x/pyghmi synced 2025-01-14 19:57:47 +00:00
Code Issues Projects Releases Wiki Activity

Make the webclient primitives a bit more resilient

Browse Source 
The underlying class state machine can get hairy if
things race with each other.  Transparently create
independent instances to have dedicated state machines
for transactions.

Change-Id: I17616a437374f6dfdcd46d459cfc7ed00405b311
This commit is contained in:
Jarrod Johnson 2017-11-01 10:40:09 -04:00
parent 87cc663751
commit f4ece6cd42
2 changed files with 10 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pyghmi/ipmi/oem/lenovo/imm.py
View File

@ -622,7 +622,7 @@ class XCCClient(IMMClient):
if rsv['return'] != 0:
raise Exception('Unexpected return to reservation: ' + repr(rsv))
xid = random.randint(0, 1000000000)
uploadthread = FileUploader(self.wc.dupe(),
uploadthread = FileUploader(self.wc,
'/upload?X-Progress-ID={0}'.format(xid),
filename, data)
uploadthread.start()

16
pyghmi/util/webclient.py
View File

@ -75,8 +75,8 @@ class SecureHTTPConnection(httplib.HTTPConnection, object):
self.cert_reqs = ssl.CERT_NONE # verification will be done ssh style..
if clone:
self._certverify = clone._certverify
self.cookies = clone.cookies.copy()
self.stdheaders = clone.stdheaders.copy()
self.cookies = clone.cookies
self.stdheaders = clone.stdheaders
else:
self._certverify = verifycallback
self.cookies = {}
@ -113,11 +113,12 @@ class SecureHTTPConnection(httplib.HTTPConnection, object):
return rsp
def grab_json_response(self, url, data=None, referer=None):
webclient = self.dupe()
if data:
self.request('POST', url, data, referer=referer)
webclient.request('POST', url, data, referer=referer)
else:
self.request('GET', url, referer=referer)
rsp = self.getresponse()
webclient.request('GET', url, referer=referer)
rsp = webclient.getresponse()
if rsp.status == 200:
return json.loads(rsp.read())
rsp.read()
@ -138,8 +139,9 @@ class SecureHTTPConnection(httplib.HTTPConnection, object):
form = get_upload_form(filename, data, formname, otherfields)
ulheaders = self.stdheaders.copy()
ulheaders['Content-Type'] = 'multipart/form-data; boundary=' + BND
self.request('POST', url, form, ulheaders)
rsp = self.getresponse()
webclient = self.dupe()
webclient.request('POST', url, form, ulheaders)
rsp = webclient.getresponse()
# peer updates in progress should already have pointers,
# subsequent transactions will cause memory to needlessly double,
# but easiest way to keep memory relatively low