Skip to contentSkip to conversation

volatile-binds: Mitigate workdir cleanup issues

PATCH New [email protected] 1 participant 3 messages Jul 18, 2024

lore
Share & tools
lore
#0 lore raw

cover volatile-binds: Mitigate workdir cleanup issues

From: Ricardo Simoes <[email protected]>

The recipe volatile-binds relies on the mount-copybind script to create volatile mount points. In commit [1], the script was modified to use OverlayFS as the primary mount strategy. If OverlayFS fails, it falls back to an old-school bind mount.

To meet the requirements of OverlayFS, the script now unconditionally creates a workdir. However, the newly created directory is left in place in case the bind mount strategy is used.

Commit [2] introduced support for avoiding the OverlayFS strategy by setting the MOUNT_COPYBIND_AVOID_OVERLAYFS environment variable. However, the workdir is unconditionally created.

This patch series addresses both problems. Firstly, it only creates the workdir if the MOUNT_COPYBIND_AVOID_OVERLAYFS variable is not asserted. Secondly, it unconditionally attempts to remove the workdir in case a bind mount is done.

[1] b4976f3cf8cd028f165100b67867adb862da4d7f
volatile-binds: use overlayfs if available

[2] a8e7dca69054798b1c9843a0de889cef3e261c4f
mount-copybind: add MOUNT_COPYBIND_AVOID_OVERLAYFS env var to skip OverlayFS

Ricardo Simoes (2):
volatile-binds: Do not create workdir if OverlayFS is disabled
volatile-binds: Remove workdir if OverlayFS fails

 meta/recipes-core/volatile-binds/files/mount-copybind | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)
Signature · 1 line
2.25.1
#1 lore raw

PATCH 1/2 volatile-binds: Do not create workdir if OverlayFS is disabled

From: Ricardo Simoes <[email protected]>

When the mountpoint parameter is a directory, the mount-copybind will first try to use OverlayFS. Because of that, it needs to create the OverlayFS workdir (determined by the overlay_workdir).

But if the environment variable MOUNT_COPYBIND_AVOID_OVERLAYFS is set to "1", the script uses bind mount. In that case, the overlay_workdir is useless, leaving the spec parent directory in a dirty state.

This commit changes mount-copybind so that the overlay_workdir is only created when MOUNT_COPYBIND_AVOID_OVERLAYFS is not set to 1.

---
 meta/recipes-core/volatile-binds/files/mount-copybind | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)
meta/recipes-core/volatile-binds/files/mount-copybind +3 -1
index ddc4357615..da88d160ee 100755
@@ -45,7 +45,9 @@ if [ -d "$mountpoint" ]; then
 
     # Fast version of calculating `dirname ${spec}`/.`basename ${spec}`-work
     overlay_workdir="${spec%/*}/.${spec##*/}-work"
-    mkdir "${overlay_workdir}"
+    if [ "$MOUNT_COPYBIND_AVOID_OVERLAYFS" != 1 ]; then
+        mkdir "${overlay_workdir}"
+    fi
 
     # Try to mount using overlay, which is must faster than copying files.
     # If that fails, fall back to slower copy.
Signature · 1 line
2.25.1
#2 lore raw

PATCH 2/2 volatile-binds: Remove workdir if OverlayFS fails

In reply to [email protected]

From: Ricardo Simoes <[email protected]>

To fulfill OverlayFS workdir requirements, the mount-copybind script creates a workdir. But if the mount operation fails for any reason, the workdir is left there.

Then, subsequent runs of mount-copybind will again try to create the directory and pollute system logs with failed mkdir error messages.

This commit mitigates the problem by unconditionally removing workdir if the OverlayFS is not used or fails to run.

---
 meta/recipes-core/volatile-binds/files/mount-copybind | 1 +
 1 file changed, 1 insertion(+)
meta/recipes-core/volatile-binds/files/mount-copybind +1 -0
index da88d160ee..4f373412be 100755
@@ -57,6 +57,7 @@ if [ -d "$mountpoint" ]; then
         fi
     fi
     if [ "$MOUNT_COPYBIND_AVOID_OVERLAYFS" = 1 ] || ! mount -t overlay overlay -olowerdir="$mountpoint",upperdir="$spec",workdir="$overlay_workdir""$mountcontext" "$mountpoint" > /dev/null 2>&1; then
+        rm -rf "$overlay_workdir"
 
         if [ "$specdir_existed" != "yes" ]; then
             cp -aPR "$mountpoint"/. "$spec/"
Signature · 1 line
2.25.1