[Notes] [Git][BuildStream/buildstream][valentindavid/python3.7-1.2] 3 commits: Fix crash when --debug is passed

[Valentin David <gitlab mg gitlab com>]

Title: GitLab

Valentin David pushed to branch valentindavid/python3.7-1.2 at BuildStream / buildstream

Commits:

• 064abe66
  by Sam Thursfield at 2018-08-13T13:50:08Z

  Fix crash when --debug is passed
  
  I hit the following backtrace running `bst --debug push` and `bst
  --debug build`:
  
      pid:16736 id:000[--:--:--][][] START   Push
      pid:16736 id:000[--:--:--][][] START   Loading pipeline
      pid:16736 id:000[00:00:00][][] SUCCESS Loading pipeline
      pid:16736 id:000[--:--:--][][] START   Resolving pipeline
      pid:16736 id:000[--:--:--][][] BUG     'MesonElement' object has no attribute '_Element__cache_key'
  
          Traceback (most recent call last):
            File "/home/sam/.local/bin/bst", line 8, in <module>
              sys.exit(cli())
            File "/home/sam/.local/lib/python3.6/site-packages/click/core.py", line 722, in __call__
              return self.main(*args, **kwargs)
            File "/home/sam/.local/lib/python3.6/site-packages/buildstream/_frontend/cli.py", line 162, in override_main
              standalone_mode=standalone_mode, **extra)
            File "/home/sam/.local/lib/python3.6/site-packages/click/core.py", line 697, in main
              rv = self.invoke(ctx)
            File "/home/sam/.local/lib/python3.6/site-packages/click/core.py", line 1066, in invoke
              return _process_result(sub_ctx.command.invoke(sub_ctx))
            File "/home/sam/.local/lib/python3.6/site-packages/click/core.py", line 895, in invoke
              return ctx.invoke(self.callback, **ctx.params)
            File "/home/sam/.local/lib/python3.6/site-packages/click/core.py", line 535, in invoke
              return callback(*args, **kwargs)
            File "/home/sam/.local/lib/python3.6/site-packages/click/decorators.py", line 27, in new_func
              return f(get_current_context().obj, *args, **kwargs)
            File "/home/sam/.local/lib/python3.6/site-packages/buildstream/_frontend/cli.py", line 471, in push
              app.stream.push(elements, selection=deps, remote=remote)
            File "/home/sam/.local/lib/python3.6/site-packages/buildstream/_stream.py", line 341, in push
              fetch_subprojects=True)
            File "/home/sam/.local/lib/python3.6/site-packages/buildstream/_stream.py", line 814, in _load
              fetch_subprojects=fetch_subprojects)
            File "/home/sam/.local/lib/python3.6/site-packages/buildstream/_pipeline.py", line 119, in load
              for meta in meta_elements
            File "/home/sam/.local/lib/python3.6/site-packages/buildstream/_pipeline.py", line 119, in <listcomp>
              for meta in meta_elements
            File "/home/sam/.local/lib/python3.6/site-packages/buildstream/element.py", line 894, in _new_from_meta
              element = project.create_element(artifacts, meta)
            File "/home/sam/.local/lib/python3.6/site-packages/buildstream/_project.py", line 184, in create_element
              element = self._element_factory.create(self._context, self, artifacts, meta)
            File "/home/sam/.local/lib/python3.6/site-packages/buildstream/_elementfactory.py", line 57, in create
              return element_type(context, project, artifacts, meta, default_config)
            File "/home/sam/.local/lib/python3.6/site-packages/buildstream/element.py", line 196, in __init__
              super().__init__(meta.name, context, project, meta.provenance, "element")
            File "/home/sam/.local/lib/python3.6/site-packages/buildstream/plugin.py", line 171, in __init__
              self.debug("Created: {}".format(self))
            File "/home/sam/.local/lib/python3.6/site-packages/buildstream/plugin.py", line 407, in debug
              self.__message(MessageType.DEBUG, brief, detail=detail)
            File "/home/sam/.local/lib/python3.6/site-packages/buildstream/plugin.py", line 652, in __message
              self.__context.message(message)
            File "/home/sam/.local/lib/python3.6/site-packages/buildstream/_context.py", line 338, in message
              self._message_handler(message, context=self)
            File "/home/sam/.local/lib/python3.6/site-packages/buildstream/_frontend/app.py", line 665, in _message_handler
              text = self.logger.render(message)
            File "/home/sam/.local/lib/python3.6/site-packages/buildstream/_frontend/widget.py", line 585, in render
              return self._render(message)
            File "/home/sam/.local/lib/python3.6/site-packages/buildstream/_frontend/widget.py", line 620, in _render
              text += widget.render(message)
            File "/home/sam/.local/lib/python3.6/site-packages/buildstream/_frontend/widget.py", line 228, in render
              _, key, missing = plugin._get_display_key()
            File "/home/sam/.local/lib/python3.6/site-packages/buildstream/element.py", line 1138, in _get_display_key
              cache_key = self._get_cache_key()
            File "/home/sam/.local/lib/python3.6/site-packages/buildstream/element.py", line 991, in _get_cache_key
              return self.__cache_key
          AttributeError: 'MesonElement' object has no attribute '_Element__cache_key'
  
  The issue here is that when `--debug` is enabled, Plugin.__init__()
  tries to log a message like this:
  
          pid:16929 id:001[--:--:--][????????][ main:tracker.bst                   ] DEBUG   Created: meson element at tracker.bst [line 1 column 0]
  
  The log formatter is trying to get the cache key of the element in
  order to show it in the log, but the attribute hasn't yet been set
  because we've not got to the Element() constructor.
  

• 6a2f3b59
  by Valentin David at 2018-08-13T15:25:42Z

  Merge branch 'valentindavid/fix-debug-crash-1.2' into 'bst-1.2'
  
  Fix crash when --debug is passed
  
  See merge request BuildStream/buildstream!648

• 002749b5
  by Jürg Billeter at 2018-08-13T15:39:22Z

  _artifactcache/cascache.py: Fix for PEP 479 / Python 3.7
  
  Do not rely on `StopIteration` bubbling up.
  
  https://www.python.org/dev/peps/pep-0479/
  

2 changed files:

• buildstream/_artifactcache/cascache.py
• buildstream/element.py

Changes:

buildstream/_artifactcache/cascache.py

---

...	...	@@ -845,6 +845,9 @@ class _CASRemote():
845	845
846	846
847	847	def _grouper(iterable, n):
848		- # pylint: disable=stop-iteration-return
849	848	while True:
850		- yield itertools.chain([next(iterable)], itertools.islice(iterable, n - 1))
	849	+ try:
	850	+ current = next(iterable)
	851	+ except StopIteration:
	852	+ return
	853	+ yield itertools.chain([current], itertools.islice(iterable, n - 1))

buildstream/element.py

---

...	...	@@ -194,6 +194,9 @@ class Element(Plugin):
194	194
195	195	def __init__(self, context, project, artifacts, meta, plugin_conf):
196	196
	197	+ self.__cache_key_dict = None # Dict for cache key calculation
	198	+ self.__cache_key = None # Our cached cache key
	199	+
197	200	super().__init__(meta.name, context, project, meta.provenance, "element")
198	201
199	202	self.__is_junction = meta.kind == "junction"
...	...	@@ -212,8 +215,6 @@ class Element(Plugin):
212	215	self.__runtime_dependencies = [] # Direct runtime dependency Elements
213	216	self.__build_dependencies = [] # Direct build dependency Elements
214	217	self.__sources = [] # List of Sources
215		- self.__cache_key_dict = None # Dict for cache key calculation
216		- self.__cache_key = None # Our cached cache key
217	218	self.__weak_cache_key = None # Our cached weak cache key
218	219	self.__strict_cache_key = None # Our cached cache key for strict builds
219	220	self.__artifacts = artifacts # Artifact cache

—
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.