[Manual backport 2.x] Backport cache maintenance PR and its recent fix #2390
+180
−4
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Description
The auto-created backport PR #2383 failed and revealed an issue that needs to make it into mainline as well. Because only the backport PR failed, the original commit was not merged into the backport branch, so this PR manually backports the commits of both PRs by cherry-picking both onto the checked out 2.x branch. (#2387 and #2308).
Related Issues
#2308 (original cache maintenance PR)
#2387 (new fix to the above)
Check List
--signoff
.By submitting this pull request, I confirm that my contribution is made under the terms of the Apache 2.0 license.
For more information on following Developer Certificate of Origin and signing off your commits, please check here.