From 0d0dc00822243bd00da25b5b4823eadb50fe02db Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=BCrg=20Billeter?= Date: Thu, 10 Oct 2019 11:08:09 +0200 Subject: workspace.py: Do not close gRPC channels This is now handled in Context.prepare_fork(). --- src/buildstream/plugins/sources/workspace.py | 3 --- src/buildstream/source.py | 2 -- 2 files changed, 5 deletions(-) (limited to 'src') diff --git a/src/buildstream/plugins/sources/workspace.py b/src/buildstream/plugins/sources/workspace.py index 078ac3034..8dbcc6218 100644 --- a/src/buildstream/plugins/sources/workspace.py +++ b/src/buildstream/plugins/sources/workspace.py @@ -103,9 +103,6 @@ class WorkspaceSource(Source): "Failed to stage source: files clash with existing directory", reason='ensure-stage-dir-fail') self.__digest = self.__cas_dir._get_digest().hash - # now close down grpc channels - cas.close_grpc_channels() - assert not cas.has_open_grpc_channels() return (self.path, self.__digest) def init_workspace(self, directory: Directory) -> None: diff --git a/src/buildstream/source.py b/src/buildstream/source.py index 14307387a..1fb318b52 100644 --- a/src/buildstream/source.py +++ b/src/buildstream/source.py @@ -1085,8 +1085,6 @@ class Source(Plugin): sourcecache = self._get_context().sourcecache if self.get_kind() == 'workspace' and not sourcecache.contains(self): sourcecache.commit(self, []) - sourcecache.cas.close_grpc_channels() - assert not sourcecache.cas.has_open_grpc_channels() @property def _key(self): -- cgit v1.2.1