various bug fixes

[distro-setup] / check-subvol-stale

diff --git a/check-subvol-stale b/check-subvol-stale
index bdb47492ef07b132914b21ec6773014675dca38f..6a63124cd3ac749028a794117e0da2df384dbcfd 100644 (file)
--- a/check-subvol-stale
+++ b/check-subvol-stale
@@ -13,16 +13,6 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-# usage: $0 SUBVOL_MOUNTPOINT...
-#
-# In git, this is not not executable because it's meant to be installed
-# using ./install-my-scripts
-#
-# If latest subvols $@ are not mounted, exit 1, print message, and touch
-# /nocow/btrfs-stale/$subvol
-#
-# Either SUBVOL_MOUNTPOINT is a snapshot of the latest, or
-# the latest snapshot is snapshot of SUBVOL_MOUNTPOINT.
 
 [[ $EUID == 0 ]] || exec sudo -E "$BASH_SOURCE" "$@"
 
@@ -31,6 +21,42 @@ trap 'echo "$0:$LINENO:error: \"$BASH_COMMAND\" returned $?" >&2' ERR
 
 shopt -s nullglob
 
+usage() {
+  cat <<EOF
+usage: $0 SUBVOL_MOUNTPOINT...
+
+In git this is not not executable because it's meant to be installed
+using ./install-my-scripts
+
+If latest subvols \$@ are not mounted, exit 1, print message, and print
+the unstale subvol name into /nocow/btrfs-stale/\$subvol
+
+Fresh is opposite of stale. To be fresh, either SUBVOL_MOUNTPOINT is a
+snapshot of the latest, or the latest snapshot is snapshot of
+SUBVOL_MOUNTPOINT.
+
+-d         Enable debug output
+-h|--help  Print help and exit.
+
+Note: Uses GNU getopt options parsing style
+EOF
+  exit $1
+}
+
+##### begin command line parsing ########
+
+debug=false # default
+temp=$(getopt -l help,d hd "$@") || usage 1
+eval set -- "$temp"
+while true; do
+  case $1 in
+    -d) debug=true; shift ;;
+    -h|--help) usage ;;
+    --) shift; break ;;
+    *) echo "$0: Internal error! unexpected args: $*" ; exit 1 ;;
+  esac
+done
+
 if [[ ! $@ ]]; then
     echo "$0: error: expected mountpoint argument"
 fi
@@ -47,39 +73,54 @@ stale-file() {
     fi
 
 }
+d() {
+  if $debug; then
+    printf "%s\n" "$*"
+    fi
+}
 
 ret=0
 for d; do
     vol=${d##*/}
-    dev=$(sed -rn "s,^\s*([^#]\S*)\s+$d\s.*,\1,p" /etc/fstab|head -n1)
-    subvol_dir=$(sed -rn "s,^\s*[^#]\S*\s+$d\s.*\bsubvol=([a-zA-A/]+).*,\1,p" /etc/fstab|head -n1)
+    # second field, non-comment line == $d
+    dev=$(sed -rn "s,^\s*([^#]\S*)\s+$d\s.*,\1,p" /etc/fstab /etc/mtab|head -n1)
+    d dev=$dev
+    subvol_dir=$(sed -rn "s,^\s*[^#]\S*\s+$d\s.*\bsubvol=([a-zA-A/]+).*,\1,p" /etc/fstab /etc/mtab|head -n1)
+    d subvol_dir=$subvol_dir
     # note, we need $dev because $d might not be mounted, and we do this loop
     # because the device in fstab for the rootfs can be different.
     for devx in $(btrfs fi show $dev| sed -rn 's#.*path (/\S+)$#\1#p'); do
-        root_dir=$(sed -rn "s,^\s*$devx\s+(\S+).*\bsubvolid=0\b.*,\1,p" /etc/fstab|head -n1)
+        root_dir=$(sed -rn "s,^\s*$devx\s+(\S+).*\bsubvolid=[05]\b.*,\1,p" /etc/mtab|head -n1)
         if [[ $root_dir ]]; then break; fi
     done
-    svp=$root_dir/$subvol_dir # subvolume path
+    if [[ ! $root_dir ]]; then
+      echo "$0: error could not find root subvol mount for $dev" >&2
+      exit 1
+    fi
+    svp=$root_dir/$subvol_dir
+    d "svp=$svp # subvolume path"
 
     snaps=($root_dir/btrbk/$subvol_dir.20*) # Assumes we are in the 21st century.
     if [[ ! $snaps ]]; then
         # no snapshots yet
-        echo "$0: warning. no snapshots found. this is expected for a brand new volume"
+      echo "$0: warning: no snapshots found at $root_dir/btrbk/$subvol_dir.20*. this is expected for a brand new volume"
         continue
     fi
 
     # get info on last received sub
-    last_received_gen=0
+    last_received_cgen=0
     for f in ${snaps[@]}; do
         show="$(btrfs sub show $f)"
         if echo "$show" | grep -E "Received UUID:\s+[[:alnum:]]" &>/dev/null; then
             cgen=$(echo "$show" | sed -rn 's,^\s*Gen at creation:\s+([0-9]+).*,\1,p')
-            if [[ $cgen -gt $last_received_gen ]]; then
+            if [[ $cgen -gt $last_received_cgen ]]; then
                 last_received_cgen=$cgen
                 last_received=$f
             fi
         fi
     done
+    d last_received_cgen=$cgen
+    d last_received=$f
 
     # Get last_snap by date.
     # when a btrbk bugfix makes it into the distro,
@@ -111,6 +152,7 @@ for d; do
     # if there is a last_received, we can assume stale or fresh if we are newer/older
     if [[ $last_received ]]; then
         svp_cgen=$(btrfs sub show $svp | sed -rn 's,^\s*Gen at creation:\s+([0-9]+).*,\1,p')
+        d svp_cgen=$svp_cgen
         if [[ $svp_cgen -ge $last_received_cgen ]]; then
             stale=false
         else