[release-1.41] Exclude pulled up parent directories at commit-time #6306
+167
−18
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Add an optional ModTimeNew field to MkdirOptions, for setting the timestamp on newly-created directories. Note that the timestamps on parent directories of the topmost newly-created directories are not something we affect, so they'll be updated as usual. Signed-off-by: Nalin Dahyabhai <[email protected]>
Have Ensure() also return the parent directories of items that it created, along with information about them that can be used to filter them out of the layer at commit-time. This modifies the signature of Ensure(), but it was added in 1.41.0, and shouldn't (yet) have any external users. Signed-off-by: Nalin Dahyabhai <[email protected]>
When Ensure() tells us about the parent directories of a mountpoint target that it created for us, add them to the list of items that we'll exclude from the commit unless something else causes them to be modified. The "native" overlay diff method just walks the diff directory, so we can get directories in the committed layer that look exactly like the ones in the previous layer, depending on the storage driver. And while it's barely noticeable, we can still control for it. Signed-off-by: Nalin Dahyabhai <[email protected]>
Add a test that causes parent directories of mount targets to be "pulled up" if we're running on top of overlay in a situation where its native diff method is available, and ensure that we can still avoid adding those directories to the committed layer when we're the only reason they were pulled up. Signed-off-by: Nalin Dahyabhai <[email protected]>
|
Would like this and #6302 together. |
|
[APPROVALNOTIFIER] This PR is APPROVED This pull-request has been approved by: Luap99, openshift-cherrypick-robot The full list of commands accepted by this bot can be found here. The pull request process is described here
Needs approval from an approver in each of these files:
Approvers can indicate their approval by writing |
openshift-merge-bot
bot
merged commit 2ab5981
into
containers:release-1.41
37 checks passed
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
This is an automated cherry-pick of #6296
/assign nalind