[Notes] [Git][BuildStream/buildstream][danielsilverstone-ct/bwrap-check-runtime-only] 4 commits: sandbox/_sandboxdummy.py: Take a reason for use

[Daniel <gitlab mg gitlab com>]

Title: GitLab

Daniel pushed to branch danielsilverstone-ct/bwrap-check-runtime-only at BuildStream / buildstream

Commits:

• 400c9f3e
  by Daniel Silverstone at 2018-10-02T12:33:33Z

  sandbox/_sandboxdummy.py: Take a reason for use
  
  Since the SandboxDummy sandbox is only used in very specific
  circumstances and with good reason, this adjusts the SandboxDummy
  class to take a reason and to return it if `.run()` has to
  raise an exception because this is a dummy sandbox.
  
  Signed-off-by: Daniel Silverstone <daniel silverstone codethink co uk>
  

• d184c743
  by Daniel Silverstone at 2018-10-02T12:33:33Z

  _platform/darwin.py: Give reason for use of dummy sandbox
  
  Since Darwin is limited to the dummy sandbox for now due to OSXFUSE
  being unsupported as yet, and there being no suitable sandboxing option
  for use on OSX, give this as the reason so that it can be reported if
  the user attempts a local build.
  
  Signed-off-by: Daniel Silverstone <daniel silverstone codethink co uk>
  

• 3bcfd7fe
  by Daniel Silverstone at 2018-10-02T12:33:33Z

  _platform/linux.py: Refactor checks for sandboxing
  
  To better report issues in the absence of a suitable bwrap, or the
  FUSE devices, this refactors the checks for sandboxing in the Linux
  platform to cover the various possibilities.  The reasons are then
  collated and passed to the dummy sandbox for later reporting to the
  user if a local build is attempted.
  
  Signed-off-by: Daniel Silverstone <daniel silverstone codethink co uk>
  

• 674e83cf
  by Daniel Silverstone at 2018-10-02T12:33:33Z

  _site.py: Protect against failure running `bwrap --version`
  
  On some potentially broken systems, running `bwrap --version` might
  fail with an error code.  This patch corrects the oversight ensuring
  that we cleanly return False for version checking in such cases.
  
  Signed-off-by: Daniel Silverstone <daniel silverstone codethink co uk>
  

4 changed files:

• buildstream/_platform/darwin.py
• buildstream/_platform/linux.py
• buildstream/_site.py
• buildstream/sandbox/_sandboxdummy.py

Changes:

buildstream/_platform/darwin.py

---

...	...	@@ -34,6 +34,9 @@ class Darwin(Platform):
34	34	super().__init__()
35	35
36	36	def create_sandbox(self, *args, **kwargs):
	37	+ kwargs['dummy_reason'] = \
	38	+ "OSXFUSE is not supported and there are no supported sandbox" + \
	39	+ "technologies for OSX at this time"
37	40	return SandboxDummy(*args, **kwargs)
38	41
39	42	def check_sandbox_config(self, config):

buildstream/_platform/linux.py

---

...	...	@@ -37,15 +37,29 @@ class Linux(Platform):
37	37	self._uid = os.geteuid()
38	38	self._gid = os.getegid()
39	39
	40	+ self._have_fuse = os.path.exists("/dev/fuse")
	41	+ self._bwrap_exists = _site.check_bwrap_version(0, 0, 0)
	42	+ self._have_good_bwrap = _site.check_bwrap_version(0, 1, 2)
	43	+
40	44	self._die_with_parent_available = _site.check_bwrap_version(0, 1, 8)
41	45
42		- if self._local_sandbox_available():
	46	+ if self._have_fuse and self._have_good_bwrap:
43	47	self._user_ns_available = self._check_user_ns_available()
44	48	else:
45	49	self._user_ns_available = False
46	50
47	51	def create_sandbox(self, *args, **kwargs):
48		- if not self._local_sandbox_available():
	52	+ if not (self._have_fuse and self._have_good_bwrap):
	53	+ reasons = []
	54	+ if not self._have_fuse:
	55	+ reasons.append("FUSE is unavailable")
	56	+ if not self._have_good_bwrap:
	57	+ if self._bwrap_exists:
	58	+ reasons.append("`bwrap` is too old (bst needs at least 0.1.2)")
	59	+ else:
	60	+ reasons.append("`bwrap` executable not found")
	61	+
	62	+ kwargs['dummy_reason'] = " and ".join(reasons)
49	63	return SandboxDummy(*args, **kwargs)
50	64	else:
51	65	from ..sandbox._sandboxbwrap import SandboxBwrap
...	...	@@ -66,11 +80,6 @@ class Linux(Platform):
66	80	################################################
67	81	# Private Methods #
68	82	################################################
69		- def _local_sandbox_available(self):
70		- try:
71		- return os.path.exists(utils.get_host_tool('bwrap')) and os.path.exists('/dev/fuse')
72		- except utils.ProgramNotFoundError:
73		- return False
74	83
75	84	def _check_user_ns_available(self):
76	85	# Here, lets check if bwrap is able to create user namespaces,

buildstream/_site.py

---

...	...	@@ -78,7 +78,11 @@ def check_bwrap_version(major, minor, patch):
78	78	if not bwrap_path:
79	79	return False
80	80	cmd = [bwrap_path, "--version"]
81		- version = str(subprocess.check_output(cmd).split()[1], "utf-8")
	81	+ try:
	82	+ version = str(subprocess.check_output(cmd).split()[1], "utf-8")
	83	+ except subprocess.CalledProcessError:
	84	+ # Failure trying to run bubblewrap
	85	+ return False
82	86	_bwrap_major, _bwrap_minor, _bwrap_patch = map(int, version.split("."))
83	87
84	88	# Check whether the installed version meets the requirements

buildstream/sandbox/_sandboxdummy.py

---

...	...	@@ -23,6 +23,7 @@ from . import Sandbox
23	23	class SandboxDummy(Sandbox):
24	24	def __init__(self, *args, **kwargs):
25	25	super().__init__(*args, **kwargs)
	26	+ self._reason = kwargs.get("dummy_reason", "no reason given")
26	27
27	28	def run(self, command, flags, *, cwd=None, env=None):
28	29
...	...	@@ -37,4 +38,4 @@ class SandboxDummy(Sandbox):
37	38	"'{}'".format(command[0]),
38	39	reason='missing-command')
39	40
40		- raise SandboxError("This platform does not support local builds")
	41	+ raise SandboxError("This platform does not support local builds: {}".format(self._reason))

—
View it on GitLab.
You're receiving this email because of your account on gitlab.com. If you'd like to receive fewer emails, you can adjust your notification settings.