Commit 0fafa40a authored by Jim Fulton's avatar Jim Fulton

Try harder not to error (and fail tests) when shutting down servers

parent fd755510
...@@ -166,9 +166,16 @@ def runner(config, qin, qout, timeout=None, ...@@ -166,9 +166,16 @@ def runner(config, qin, qout, timeout=None,
ZEO.asyncio.server.best_protocol_version = old_protocol ZEO.asyncio.server.best_protocol_version = old_protocol
ZEO.asyncio.server.ServerProtocol.protocols = old_protocols ZEO.asyncio.server.ServerProtocol.protocols = old_protocols
def stop_runner(thread, config, qin, qout, stop_timeout=9, pid=None): def stop_runner(thread, config, qin, qout, stop_timeout=19, pid=None):
qin.put('stop') qin.put('stop')
try:
dirty = qout.get(timeout=stop_timeout) dirty = qout.get(timeout=stop_timeout)
except Empty:
print("WARNING Couldn't stop server", file=sys.stderr)
if hasattr(thread, 'terminate'):
thread.terminate()
os.waitpid(thread.pid, 0)
else:
if dirty: if dirty:
print("WARNING SERVER DIDN'T STOP CLEANLY", file=sys.stderr) print("WARNING SERVER DIDN'T STOP CLEANLY", file=sys.stderr)
...@@ -176,13 +183,11 @@ def stop_runner(thread, config, qin, qout, stop_timeout=9, pid=None): ...@@ -176,13 +183,11 @@ def stop_runner(thread, config, qin, qout, stop_timeout=9, pid=None):
# give it some time to exit # give it some time to exit
if hasattr(thread, 'pid') and thread.pid: if hasattr(thread, 'pid') and thread.pid:
os.waitpid(thread.pid, 0) os.waitpid(thread.pid, 0)
else:
# Gaaaa, force gc in hopes of maybe getting the unclosed
# sockets to get GCed
gc.collect()
thread.join(stop_timeout) thread.join(stop_timeout)
gc.collect()
def start_zeo_server(storage_conf=None, zeo_conf=None, port=None, keep=False, def start_zeo_server(storage_conf=None, zeo_conf=None, port=None, keep=False,
path='Data.fs', protocol=None, blob_dir=None, path='Data.fs', protocol=None, blob_dir=None,
suicide=True, debug=False, suicide=True, debug=False,
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment