Merge pull request #6354 from yuters/fix-snapshot-locate-and-timeline-leak

Fix locate index on Btrfs: skip snapshots, index /home, drain leaked timeline snapshots

migrations/1784809451.sh

@@ -0,0 +1,30 @@
+echo "Configure locate to skip Btrfs snapshots and index Btrfs subvolumes"
+
+OMARCHY_PATH="${OMARCHY_PATH:-/usr/share/omarchy}"
+locate_config_script="$OMARCHY_PATH/install/config/locate.sh"
+UPDATEDB_CONF_PATH="${OMARCHY_UPDATEDB_CONF_PATH:-/etc/updatedb.conf}"
+
+as_root() {
+  if (( EUID == 0 )); then
+    "$@"
+  else
+    sudo "$@"
+  fi
+}
+
+[[ -f $UPDATEDB_CONF_PATH ]] || exit 0
+[[ -f $locate_config_script ]] || exit 0
+
+if grep -q '^PRUNE_BIND_MOUNTS = "no"' "$UPDATEDB_CONF_PATH" &&
+  grep -E '^PRUNEPATHS' "$UPDATEDB_CONF_PATH" | grep -qE '(^|[[:space:]"])/\.snapshots([[:space:]"]|$)'; then
+  exit 0
+fi
+
+as_root env OMARCHY_UPDATEDB_CONF_PATH="$UPDATEDB_CONF_PATH" bash -euo pipefail "$locate_config_script"
+
+# Rebuild the index with the new exclusions; pruning /.snapshots turns
+# multi-hour runs on snapshot-heavy systems back into one-minute runs. Restart
+# rather than start: the machines this targets are the ones with an updatedb
+# already grinding through every snapshot, and a run that started before the
+# rewrite keeps using the config it read at startup.
+as_root systemctl restart --no-block plocate-updatedb.service >/dev/null 2>&1 || true

migrations/1784809452.sh

@@ -0,0 +1,56 @@
+echo "Remove Snapper timeline snapshots leaked by earlier defaults"
+
+SNAPPER_CONFIG_PATH="${OMARCHY_SNAPPER_CONFIG_PATH:-/etc/snapper/configs/root}"
+
+as_root() {
+  if (( EUID == 0 )); then
+    "$@"
+  else
+    sudo "$@"
+  fi
+}
+
+command -v snapper >/dev/null || exit 0
+[[ -f $SNAPPER_CONFIG_PATH ]] || exit 0
+
+# Only clean up when timeline snapshotting is off, as Omarchy configures it.
+# Anyone who deliberately turned it back on keeps their snapshots. Snapper's
+# own create-config leaves the file readable by root alone, and a config this
+# user cannot read must not pass for one that wants its snapshots kept.
+if [[ -r $SNAPPER_CONFIG_PATH ]]; then
+  grep -qFx 'TIMELINE_CREATE="no"' "$SNAPPER_CONFIG_PATH" || exit 0
+else
+  as_root grep -qFx 'TIMELINE_CREATE="no"' "$SNAPPER_CONFIG_PATH" || exit 0
+fi
+
+# Earlier installs ran hourly timeline snapshots. Later configs stopped
+# creating them but never deleted the existing ones, and number cleanup
+# skips snapshots marked Cleanup=timeline, so they pile up forever:
+# hundreds of snapshots pinning 100+ GB of extents on long-running machines.
+leaked=$(as_root snapper -c root --csvout list --columns number,cleanup 2>/dev/null | awk -F, '$2 == "timeline" { print $1 }' || true)
+[[ -n $leaked ]] || exit 0
+
+echo "Deleting $(wc -w <<<"$leaked") leaked timeline snapshots (disk space is reclaimed in the background)"
+
+# Delete in small batches; one big delete can die on a DBus timeout partway.
+# A failed batch must not take the rest of the migration run down with it, so
+# the drain is best effort. omarchy-migrate records the migration either way,
+# so say what is left rather than counting on a rerun that will not come.
+failed=0
+batch=()
+
+for number in $leaked; do
+  batch+=("$number")
+  if (( ${#batch[@]} == 20 )); then
+    as_root snapper -c root delete "${batch[@]}" || failed=$((failed + ${#batch[@]}))
+    batch=()
+  fi
+done
+
+if (( ${#batch[@]} > 0 )); then
+  as_root snapper -c root delete "${batch[@]}" || failed=$((failed + ${#batch[@]}))
+fi
+
+if (( failed > 0 )); then
+  echo "$failed snapshots could not be deleted. Finish with: sudo snapper -c root delete <number>"
+fi