diff options
| author | bst-marge-bot <marge-bot@buildstream.build> | 2020-05-28 20:42:15 +0000 |
|---|---|---|
| committer | bst-marge-bot <marge-bot@buildstream.build> | 2020-05-28 20:42:15 +0000 |
| commit | 976439c2be5a457f28c2f291f8823d711f09d2d0 (patch) | |
| tree | 56935630facb891c019058747e198db4663dd8c4 | |
| parent | a7b5f2ac2a2412a6f1379fba399e01892fe59b41 (diff) | |
| parent | 71a3639c042d79539ca27294fc210e95677484a5 (diff) | |
| download | buildstream-976439c2be5a457f28c2f291f8823d711f09d2d0.tar.gz | |
Merge branch 'juerg/cas-send-directory' into 'master'
cascache.py: Drop unnecessary FindMissingBlobs from _send_directory()
See merge request BuildStream/buildstream!1944
| -rw-r--r-- | src/buildstream/_cas/cascache.py | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/src/buildstream/_cas/cascache.py b/src/buildstream/_cas/cascache.py index 8df0c4640..9394ac5b2 100644 --- a/src/buildstream/_cas/cascache.py +++ b/src/buildstream/_cas/cascache.py @@ -691,10 +691,12 @@ class CASCache: batch.send() def _send_directory(self, remote, digest): - missing_blobs = self.remote_missing_blobs_for_directory(remote, digest) + required_blobs = self.required_blobs_for_directory(digest) - # Upload any blobs missing on the server - self.send_blobs(remote, missing_blobs) + # Upload any blobs missing on the server. + # buildbox-casd will call FindMissingBlobs before the actual upload + # and skip blobs that already exist on the server. + self.send_blobs(remote, required_blobs) # get_cache_usage(): # |