xCAT/confluent
2
0
Fork 0
mirror of https://github.com/xcat2/confluent.git synced 2025-02-28 16:21:40 +00:00
Code Issues Projects Releases Wiki Activity

Improve error for unserializable collective data

Browse Source 
XML errors turn out to be unserializable.  Catch this general
class of problems and provide a less devastating behavior.

Doing an xml.fromstring('') is an example of how to trigger it.
This commit is contained in:
Jarrod Johnson 2019-06-07 16:47:17 -04:00
parent 56e9a67ef8
commit 6a77a13539
1 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
confluent_server/confluent/core.py
View File

@ -706,7 +706,11 @@ def handle_dispatch(connection, cert, dispatch, peername):
def _forward_rsp(connection, res):
r = pickle.dumps(res)
try:
r = pickle.dumps(res)
except TypeError:
r = pickle.dumps(Exception(
'Cannot serialize error, check collective.manager error logs for details' + str(res)))
rlen = len(r)
if not rlen:
return
@ -915,7 +919,7 @@ def dispatch_request(nodes, manager, element, configmanager, inputdata,
a = configmanager.get_collective_member(manager)
try:
remote = socket.create_connection((a['address'], 13001))
remote.settimeout(90)
remote.settimeout(180)
remote = ssl.wrap_socket(remote, cert_reqs=ssl.CERT_NONE,
keyfile='/etc/confluent/privkey.pem',
certfile='/etc/confluent/srvcert.pem')