Martin Blanchard pushed to branch mablanch/77-cas-uploader at BuildGrid / buildgrid
Commits:
-
763e49b1
by Martin Blanchard at 2018-09-11T10:57:40Z
-
ed14ba20
by Martin Blanchard at 2018-09-11T10:58:25Z
-
a7a81c16
by Martin Blanchard at 2018-09-11T11:21:18Z
6 changed files:
- + buildgrid/_protos/__init__.py
- + buildgrid/_protos/build/bazel/remote/execution/v2/__init__.py
- + buildgrid/_protos/google/devtools/__init__.py
- + buildgrid/client/__init__.py
- buildgrid/client/cas.py
- buildgrid/utils.py
Changes:
... | ... | @@ -126,9 +126,11 @@ class Uploader: |
126 | 126 |
else:
|
127 | 127 |
return self._queue_blob(directory.SerializeToString())
|
128 | 128 |
|
129 |
- def send_message(self, message):
|
|
129 |
+ def put_message(self, message):
|
|
130 | 130 |
"""Stores a message into the remote CAS storage.
|
131 | 131 |
|
132 |
+ Message is send immediately, upload is never be deferred.
|
|
133 |
+ |
|
132 | 134 |
Args:
|
133 | 135 |
message (:obj:`Message`): a protobuf message object.
|
134 | 136 |
|
... | ... | @@ -251,8 +251,12 @@ def tree_maker(directory_path, cas=None): |
251 | 251 |
tree.children.extend(child_directories)
|
252 | 252 |
tree.root.CopyFrom(directory)
|
253 | 253 |
|
254 |
+ # Ensure that we've uploded the tree structure first
|
|
254 | 255 |
if cas is not None:
|
255 |
- tree_digest = cas.send_message(tree)
|
|
256 |
+ cas.flush()
|
|
257 |
+ |
|
258 |
+ if cas is not None:
|
|
259 |
+ tree_digest = cas.put_message(tree)
|
|
256 | 260 |
else:
|
257 | 261 |
tree_digest = create_digest(tree.SerializeToString())
|
258 | 262 |
|