diff options
| author | Angelos Evripiotis <jevripiotis@bloomberg.net> | 2019-10-11 13:32:21 +0100 |
|---|---|---|
| committer | Angelos Evripiotis <jevripiotis@bloomberg.net> | 2019-10-15 15:37:57 +0100 |
| commit | 5c159ff48d2a766dd4735f589f0121f32dd1e822 (patch) | |
| tree | 7d916a3e9010df52603af1cebb5418910c423ddd | |
| parent | 998942215c7a33227ead23bc182f379ef062c47a (diff) | |
| download | buildstream-5c159ff48d2a766dd4735f589f0121f32dd1e822.tar.gz | |
CASDProcessManager: 'release_resources' convention
Elsewhere in cascache, cleaning up is called 'release_resources', so
follow that convention for consistency.
Also fix a case where self._process was not set to None in terminate().
| -rw-r--r-- | src/buildstream/_cas/cascache.py | 3 | ||||
| -rw-r--r-- | src/buildstream/_cas/casdprocessmanager.py | 25 |
2 files changed, 12 insertions, 16 deletions
diff --git a/src/buildstream/_cas/cascache.py b/src/buildstream/_cas/cascache.py index 7c37d0ee1..3e8edce7a 100644 --- a/src/buildstream/_cas/cascache.py +++ b/src/buildstream/_cas/cascache.py @@ -177,8 +177,7 @@ class CASCache(): if self._casd_process_manager: self.close_grpc_channels() - self._casd_process_manager.terminate(messenger) - self._casd_process_manager.clean_up() + self._casd_process_manager.release_resources(messenger) self._casd_process_manager = None # contains(): diff --git a/src/buildstream/_cas/casdprocessmanager.py b/src/buildstream/_cas/casdprocessmanager.py index 1ae5e8e62..6c4072599 100644 --- a/src/buildstream/_cas/casdprocessmanager.py +++ b/src/buildstream/_cas/casdprocessmanager.py @@ -100,14 +100,20 @@ class CASDProcessManager: return os.path.join(self._log_dir, str(self.start_time) + ".log") - # terminate() + # release_resources() # - # Terminate the buildbox casd process + # Terminate the process and release related resources. # - # Args: - # messenger (buildstream._messenger.Messenger): Messenger to forward information to the frontend + def release_resources(self, messenger=None): + self._terminate(messenger) + self._process = None + shutil.rmtree(self._socket_tempdir) + + # _terminate() + # + # Terminate the buildbox casd process. # - def terminate(self, messenger=None): + def _terminate(self, messenger=None): assert self._watcher is None assert self._failure_callback is None @@ -115,7 +121,6 @@ class CASDProcessManager: if return_code is not None: # buildbox-casd is already dead - self._process = None if messenger: messenger.message( @@ -149,7 +154,6 @@ class CASDProcessManager: messenger.message( Message(MessageType.WARN, "Buildbox-casd didn't exit in time and has been killed") ) - self._process = None return if return_code != 0 and messenger: @@ -162,13 +166,6 @@ class CASDProcessManager: ) ) - # clean_up() - # - # After termination, clean up any additional resources - # - def clean_up(self): - shutil.rmtree(self._socket_tempdir) - # set_failure_callback() # # Call this function if the CASD process stops unexpectedly. |