[Notes] [Git][BuildStream/buildstream][mablanch/447-stack-trace-checkout

Martin Blanchard pushed to branch mablanch/447-stack-trace-checkout at BuildStream / buildstream

Commits:

60ddb193
by Josh Smith at 2018-08-01T14:17:17Z
```
message.py: MessagesType.SKIPPED added
```

0756c615

by Josh Smith at 2018-08-01T14:17:17Z

cascache.py: Display SKIPPED message for each remote skipped

62a250fe

by Qinusty at 2018-08-01T15:01:25Z

Merge branch 'Qinusty/481' into 'master'

Add SKIPPED message type for actions being skipped

See merge request BuildStream/buildstream!562

00ddcbd7

by Martin Blanchard at 2018-08-01T15:16:33Z

element.py: Raise an exception on unbuilt element checkout

Trying to checkout an element that has no cached artifacts should be and
handled failure. See BuildStream/buildstream#447.

4c739e2a
by Martin Blanchard at 2018-08-01T15:16:33Z
```
_stream.py: Print details on checkout failure
```

Changes:

buildstream/_artifactcache/cascache.py

@@ -32,6 +32,7 @@ from .._protos.google.bytestream import bytestream_pb2, bytestream_pb2_grpc
  from .._protos.build.bazel.remote.execution.v2 import remote_execution_pb2, remote_execution_pb2_grpc
  from .._protos.buildstream.v2 import buildstream_pb2, buildstream_pb2_grpc
 +from .._message import MessageType, Message
  from .. import _signals, utils
  from .._exceptions import ArtifactError
@@ -264,7 +265,7 @@ class CASCache(ArtifactCache):
          for remote in push_remotes:
              remote.init()
+-
 +            skipped_remote = True
              element.info("Pushing {} -> {}".format(element._get_brief_display_key(), remote.spec.url))
              try:
@@ -280,8 +281,6 @@ class CASCache(ArtifactCache):
                          if response.digest.hash == tree.hash and response.digest.size_bytes == tree.size_bytes:
                              # ref is already on the server with the same tree
 -                            element.info("Skipping {}, remote ({}) already has artifact cached".format(
 -                                element._get_brief_display_key(), remote.spec.url))
                              continue
                      except grpc.RpcError as e:
@@ -309,6 +308,7 @@ class CASCache(ArtifactCache):
                              missing_blobs[d.hash] = d
                      # Upload any blobs missing on the server
 +                    skipped_remote = False
                      for digest in missing_blobs.values():
                          def request_stream():
                              resource_name = os.path.join(digest.hash, str(digest.size_bytes))
@@ -344,6 +344,13 @@ class CASCache(ArtifactCache):
                  if e.code() != grpc.StatusCode.RESOURCE_EXHAUSTED:
                      raise ArtifactError("Failed to push artifact {}: {}".format(refs, e), temporary=True) from e
 +            if skipped_remote:
 +                self.context.message(Message(
 +                    None,
 +                    MessageType.SKIPPED,
 +                    "Remote ({}) already has {} cached".format(
 +                        remote.spec.url, element._get_brief_display_key())
 +                ))
          return pushed
      ################################################

buildstream/_frontend/widget.py

@@ -160,6 +160,7 @@ class TypeName(Widget):
          MessageType.START: "blue",
          MessageType.SUCCESS: "green",
          MessageType.FAIL: "red",
 +        MessageType.SKIPPED: "yellow",
          MessageType.ERROR: "red",
          MessageType.BUG: "red",
+     }

buildstream/_message.py

@@ -36,6 +36,7 @@ class MessageType():
      START = "start"        # Status start message
      SUCCESS = "success"    # Successful status complete message
      FAIL = "failure"       # Failing status complete message
 +    SKIPPED = "skipped"
  # Messages which should be reported regardless of whether

buildstream/_stream.py

@@ -434,7 +434,7 @@ class Stream():
          except BstError as e:
              raise StreamError("Error while staging dependencies into a sandbox"
 -                              ": '{}'".format(e), reason=e.reason) from e
 +                              ": '{}'".format(e), detail=e.detail, reason=e.reason) from e
      # workspace_open
+     #

buildstream/element.py

@@ -623,6 +623,12 @@ class Element(Plugin):
                dep.stage_artifact(sandbox)
          """
 +        if not self._cached():
 +            detail = "No artifacts have been cached yet for that element\n" + \
 +                     "Try building the element first with `bst build`\n"
 +            raise ElementError("No artifacts to stage",
 +                               detail=detail, reason="uncached-checkout-attempt")
++
          if update_mtimes is None:
              update_mtimes = []

tests/frontend/buildcheckout.py

@@ -96,6 +96,16 @@ def test_build_checkout_deps(datafiles, cli, deps):
          assert not os.path.exists(filename)
 +@pytest.mark.datafiles(DATA_DIR)
 +def test_build_checkout_unbuilt(datafiles, cli):
 +    project = os.path.join(datafiles.dirname, datafiles.basename)
 +    checkout = os.path.join(cli.directory, 'checkout')
++
 +    # Check that checking out an unbuilt element fails nicely
 +    result = cli.run(project=project, args=['checkout', 'target.bst', checkout])
 +    result.assert_main_error(ErrorDomain.STREAM, "uncached-checkout-attempt")
++
++
  @pytest.mark.datafiles(DATA_DIR)
  def test_build_checkout_tarball(datafiles, cli):
      project = os.path.join(datafiles.dirname, datafiles.basename)

[Notes] [Git][BuildStream/buildstream][mablanch/447-stack-trace-checkout] 5 commits: message.py: MessagesType.SKIPPED added

Martin Blanchard pushed to branch mablanch/447-stack-trace-checkout at BuildStream / buildstream

Commits:

6 changed files:

Changes: