Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add protection for 0 byte cache entries #36

Merged
merged 1 commit into from
Oct 12, 2023
Merged

Add protection for 0 byte cache entries #36

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions gcpbuildcache/src/main/kotlin/androidx/build/gradle/gcpbuildcache/GcpBuildCacheService.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -64,6 +64,7 @@ internal class GcpBuildCacheService(
}

override fun store(key: BuildCacheKey, writer: BuildCacheEntryWriter) {
if (writer.size == 0L) return // do not store empty entries into the cache
logger.info("Storing ${key.blobKey()}")
val cacheKey = key.blobKey()
val output = ByteArrayOutputStream()
Expand Down
6 changes: 4 additions & 2 deletions gcpbuildcache/src/main/kotlin/androidx/build/gradle/gcpbuildcache/GcpStorageService.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,6 @@ internal class GcpStorageService(
}

override fun store(cacheKey: String, contents: ByteArray): Boolean {

if (!isEnabled) {
logger.info("Not Enabled")
return false
Expand Down Expand Up @@ -123,7 +122,10 @@ internal class GcpStorageService(
if (storage == null) return null
return try {
val blob = storage.service.get(blobId) ?: return null
return if (blob.size > sizeThreshold) {
return if (blob.size == 0L) {
// return empty entries as a cache miss
null
} else if (blob.size > sizeThreshold) {
val path = FileHandleInputStream.create()
blob.downloadTo(path)
path.handleInputStream()
Expand Down