[Notes] [Git][BuildStream/buildstream][willsalmon/APIFix] 3 commits: Kee

Will Salmon pushed to branch willsalmon/APIFix at BuildStream / buildstream

Commits:

8aa33e23

by Valentin David at 2018-08-09T12:49:17Z

Keep original flags for create in SafeHardlinks.

When open(2) is used with flags O_CREAT|O_RDWR, the file descriptor
must be readable. Unfortunately O_RDWR was not passed which made
read fail with EBADF and mmap to signal SIGBUS.

This issue happened with man-db for example.

Fixes #143.

ef7810f3

by Valentin David at 2018-08-09T14:06:50Z

Merge branch 'valentindavid/fuse-create-flags' into 'master'

Keep original flags for create in SafeHardlinks.

Closes #143

See merge request BuildStream/buildstream!624

c2f755a1

by William Salmon at 2018-08-09T16:08:26Z

Updating the no track or ref fix to match the buildstream style

Firstly this will cause the error much sooner, and may catch more errors.

Second this will remove any knowledge of plugins from the bst core, to
match the bst style.

Changes:

buildstream/_fuse/fuse.py

@@ -757,7 +757,11 @@ class FUSE(object):
          if self.raw_fi:
              return self.operations('create', path, mode, fi)
          else:
 -            fi.fh = self.operations('create', path, mode)
 +            # This line is different from upstream to fix issues
 +            # reading file opened with O_CREAT|O_RDWR.
 +            # See issue #143.
 +            fi.fh = self.operations('create', path, mode, fi.flags)
 +            # END OF MODIFICATION
              return 0
      def ftruncate(self, path, length, fip):

buildstream/_fuse/hardlinks.py

@@ -185,12 +185,12 @@ class SafeHardlinkOps(Operations):
          return os.open(full_path, flags)
 -    def create(self, path, mode, fi=None):
 +    def create(self, path, mode, flags):
          full_path = self._full_path(path)
          # If it already exists, ensure it's a copy first
          self._ensure_copy(full_path)
 -        return os.open(full_path, os.O_WRONLY | os.O_CREAT, mode)
 +        return os.open(full_path, flags, mode)
      def read(self, path, length, offset, fh):
          os.lseek(fh, offset, os.SEEK_SET)

buildstream/_pipeline.py

@@ -360,22 +360,13 @@ class Pipeline():
          if inconsistent:
              detail = "Exact versions are missing for the following elements:\n\n"
 -            missingTrack = 0
              for element in inconsistent:
                  detail += "  " + element._get_full_name()
                  for source in element.sources():
                      if not source._get_consistency() and not source.get_ref():
 -                        if hasattr(source, 'tracking') and source.tracking is None:
 -                            detail += ": Source {} is missing ref and track. ".format(source._get_full_name()) + \
 -                                      "Please specify a ref or branch/tag to track."
 -                            missingTrack = 1
 +                        detail += ": Source {} is missing ref\n".format(source)
 +            detail += "\nTry tracking these elements first with `bst track`\n"
 -                detail += "\n"
+-
 -            if missingTrack:
 -                detail += "\nThen track these elements with `bst track`\n"
 -            else:
 -                detail += "\nTry tracking these elements first with `bst track`\n"
              raise PipelineError("Inconsistent pipeline", detail=detail, reason="inconsistent-pipeline")
      #############################################################

buildstream/plugins/sources/git.py

@@ -81,6 +81,7 @@ from configparser import RawConfigParser
  from buildstream import Source, SourceError, Consistency, SourceFetcher
  from buildstream import utils
 +from buildstream._exceptions import LoadError, LoadErrorReason
  GIT_MODULES = '.gitmodules'
@@ -300,6 +301,12 @@ class GitSource(Source):
          self.original_url = self.node_get_member(node, str, 'url')
          self.mirror = GitMirror(self, '', self.original_url, ref)
          self.tracking = self.node_get_member(node, str, 'track', None)
++
 +        # At this point we now know if the source has a ref and/or a track.
 +        # If it is missing both then we will be unable to track or build.
 +        if self.mirror.ref is None and self.tracking is None:
 +            raise LoadError(LoadErrorReason.INVALID_DATA, "{}: Git sources require a ref and/or track".format(self))
++
          self.checkout_submodules = self.node_get_member(node, bool, 'checkout-submodules', True)
          self.submodules = []

tests/sources/git.py

  import os
  import pytest
 -from buildstream._exceptions import ErrorDomain
 +from buildstream._exceptions import ErrorDomain, LoadErrorReason
  from buildstream import _yaml
  from tests.testutils import cli, create_repo
@@ -384,20 +384,16 @@ def test_submodule_track_no_ref_or_track(cli, tmpdir, datafiles):
      # Track will encounter an inconsistent submodule without any ref
      result = cli.run(project=project, args=['track', 'target.bst'])
 -    result.assert_main_error(ErrorDomain.STREAM, None)
 -    result.assert_task_error(ErrorDomain.SOURCE, 'track-attempt-no-track')
 +    result.assert_main_error(ErrorDomain.LOAD, LoadErrorReason.INVALID_DATA)
 +    result.assert_task_error(None, None)
      # Assert that we are just fine without it, and emit a warning to the user.
 -    assert "FAILURE git source at" in result.stderr
 -    assert "Without a tracking branch ref can not be updated. Please " + \
 -        "provide a ref or a track." in result.stderr
 +    assert "Git sources require a ref and/or track" in result.stderr
      # Track will encounter an inconsistent submodule without any ref
      result = cli.run(project=project, args=['build', 'target.bst'])
 -    result.assert_main_error(ErrorDomain.PIPELINE, 'inconsistent-pipeline')
 +    result.assert_main_error(ErrorDomain.LOAD, LoadErrorReason.INVALID_DATA)
      result.assert_task_error(None, None)
      # Assert that we are just fine without it, and emit a warning to the user.
 -    assert "Exact versions are missing for the following elements" in result.stderr
 -    assert "is missing ref and track." in result.stderr
 -    assert "Then track these elements with `bst track`" in result.stderr
 +    assert "Git sources require a ref and/or track" in result.stderr

[Notes] [Git][BuildStream/buildstream][willsalmon/APIFix] 3 commits: Keep original flags for create in SafeHardlinks.

Will Salmon pushed to branch willsalmon/APIFix at BuildStream / buildstream

Commits:

5 changed files:

Changes: