scsi: relax mount re-use constraint #2280
Merged
Conversation
This file contains 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
|
Remove the cherry-pick bit from the commit message. That wasn't a merged commit so it isn't needed. |
This is to fix a case with shared scratch enabled where the pause container scratch and workload container scratch should be the same mountpoint. This effectively changes the SCSI mount logic to have the same semantics as before the SCSI refactor, which mainly affected: * where the `runc` config.json for a container is written * scratch encryption The old semantics ensured that the scratch (in a shared scratch case) is encrypted only once and also ensured that runc config.json for a given container is written to a unique location: either container's scratch (when scratch isn't shared) or tmpfs (when scratch is shared). As before, the eventual hope is to remove guestPath support, and always generate a path, but that requires more extensive work to pass this path to the GCS. Signed-off-by: Kevin Parsons <kevpar@microsoft.com> Signed-off-by: Maksim An <maksiman@microsoft.com>
anmaxvl
force-pushed
the
scsi-mount-fix-2
branch
from
69c322d
to
4c003e7
Compare
katiewasnothere
approved these changes
Oct 1, 2024
# for free
to join this conversation on GitHub.
Already have an account?
# 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 to fix a case with shared scratch enabled where the pause container scratch and workload container scratch should be the same mountpoint. This effectively changes the SCSI mount logic to have the same semantics as before the SCSI refactor, which mainly affected:
runcconfig.json for a container is writtenThe old semantics ensured that the scratch (in a shared scratch case) is encrypted only once and also ensured that runc config.json for a given container is written to a unique location: either container's scratch (when scratch isn't shared) or tmpfs (when scratch is shared).
As before, the eventual hope is to remove guestPath support, and always generate a path, but that requires more extensive work to pass this path to the GCS.