openstack/oslo.rootwrap
Code Issues Proposed changes

Avoid raising a RuntimeError during the shutdown

Browse Source 
When the client stops, sends a shutdown command to the root daemon.
If the socket is still in use, it will return a RuntimeError and
stop the code execution.

Instead of this, this exception is now captured and the shutdown
command re-executed up to 3 times. In case of not succeeding, the
process will continue the client shutdown.

Change-Id: I0302b49e38523d6170be407d4563928cfcc3c1a3
Closes-Bug: #1878222
This commit is contained in:
Rodolfo Alonso Hernandez 2020-05-13 15:21:33 +00:00
parent 0e42d495ba
commit ee39ce31af
1 changed files with 10 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
oslo_rootwrap/client.py
View File

@ -17,6 +17,7 @@ import logging
from multiprocessing import managers from multiprocessing import managers
from multiprocessing import util as mp_util from multiprocessing import util as mp_util
import threading import threading
import time
import weakref import weakref
import oslo_rootwrap import oslo_rootwrap
@ -41,6 +42,7 @@ except AttributeError:
ClientManager = daemon.get_manager_class() ClientManager = daemon.get_manager_class()
LOG = logging.getLogger(__name__) LOG = logging.getLogger(__name__)
SHUTDOWN_RETRIES = 3
class Client(object): class Client(object):
@ -108,10 +110,14 @@ class Client(object):
if process.poll() is None: if process.poll() is None:
LOG.info('Stopping rootwrap daemon process with pid=%s', LOG.info('Stopping rootwrap daemon process with pid=%s',
process.pid) process.pid)
try: for _ in range(SHUTDOWN_RETRIES):
manager.rootwrap().shutdown() try:
except (EOFError, IOError): manager.rootwrap().shutdown()
pass # assume it is dead already break
except (EOFError, IOError):
break # assume it is dead already
except RuntimeError:
time.sleep(0.2)
# We might want to wait for process to exit or kill it, but we # We might want to wait for process to exit or kill it, but we
# can't provide sane timeout on 2.x and we most likely don't have # can't provide sane timeout on 2.x and we most likely don't have
# permisions to do so # permisions to do so