|
 |
67735e |
From 2dbd93153df83aef0d413c104335b4e035a81c02 Mon Sep 17 00:00:00 2001
|
|
|
67735e |
From: Gratien D'haese <gratien.dhaese@gmail.com>
|
|
|
67735e |
Date: Thu, 16 Apr 2020 16:54:18 +0200
|
|
|
67735e |
Subject: [PATCH] skip Longhorn Engine replica devices
|
|
|
67735e |
|
|
|
67735e |
Resolves: https://github.com/rear/rear/issues/2365
|
|
|
67735e |
|
|
|
67735e |
Signed-off-by: Gratien D'haese <gratien.dhaese@gmail.com>
|
|
|
67735e |
---
|
|
|
67735e |
.../save/GNU/Linux/230_filesystem_layout.sh | 31 ++++++++++++++++++-
|
|
|
67735e |
1 file changed, 30 insertions(+), 1 deletion(-)
|
|
|
67735e |
|
|
|
67735e |
diff --git a/usr/share/rear/layout/save/GNU/Linux/230_filesystem_layout.sh b/usr/share/rear/layout/save/GNU/Linux/230_filesystem_layout.sh
|
|
|
67735e |
index 60306718..afc658a6 100644
|
|
|
67735e |
--- a/usr/share/rear/layout/save/GNU/Linux/230_filesystem_layout.sh
|
|
|
67735e |
+++ b/usr/share/rear/layout/save/GNU/Linux/230_filesystem_layout.sh
|
|
|
67735e |
@@ -111,10 +111,39 @@ fi
|
|
|
67735e |
# but ensure docker_root_dir is not empty (otherwise any mountpoint string matches "^" which
|
|
|
67735e |
# would skip all mountpoints), see https://github.com/rear/rear/issues/1989#issuecomment-456054278
|
|
|
67735e |
if test "$docker_root_dir" ; then
|
|
|
67735e |
- if echo "$mountpoint" | grep -q "^$docker_root_dir" ; then
|
|
|
67735e |
+ if echo "$mountpoint" | grep -q "^${docker_root_dir}/" ; then
|
|
|
67735e |
Log "Filesystem $fstype on $device mounted at $mountpoint is below Docker Root Dir $docker_root_dir, skipping."
|
|
|
67735e |
continue
|
|
|
67735e |
fi
|
|
|
67735e |
+ # In case Longhorn is rebuilding a replica device it will show up as a pseudo-device and when that is the
|
|
|
67735e |
+ # case then you would find traces of it in the /var/lib/rear/layout/disklayout.conf file, which would
|
|
|
67735e |
+ # break the recovery as Longhorn Engine replica's are under control of Rancher Longhorn software and these are
|
|
|
67735e |
+ # rebuild automatically via kubernetes longhorn-engine pods.
|
|
|
67735e |
+ # Issue where we discovered this behavior was #2365
|
|
|
67735e |
+ # In normal situations you will find traces of longhorn in the log saying skipping non-block devices.
|
|
|
67735e |
+ # For example an output of the 'df' command:
|
|
|
67735e |
+ # /dev/longhorn/pvc-ed09c0f2-c086-41c8-a38a-76ee8c289792 82045336 4500292 77528660 6% /var/lib/kubelet/pods/7f47aa55-30e2-4e7b-8fec-ec9a1e761352/volumes/kubernetes.io~csi/pvc-ed09c0f2-c086-41c8-a38a-76ee8c289792/mount
|
|
|
67735e |
+ # lsscsi shows it as:
|
|
|
67735e |
+ # [34:0:0:0] storage IET Controller 0001 -
|
|
|
67735e |
+ # [34:0:0:1] disk IET VIRTUAL-DISK 0001 /dev/sdf
|
|
|
67735e |
+ # ls -l /dev/sdf /dev/longhorn/pvc-ed09c0f2-c086-41c8-a38a-76ee8c289792
|
|
|
67735e |
+ # brw-rw---- 1 root disk 8, 80 Apr 17 12:02 /dev/sdf
|
|
|
67735e |
+ # brw-rw---- 1 root root 8, 64 Apr 17 10:36 /dev/longhorn/pvc-ed09c0f2-c086-41c8-a38a-76ee8c289792
|
|
|
67735e |
+ # and parted says:
|
|
|
67735e |
+ # parted /dev/longhorn/pvc-ed09c0f2-c086-41c8-a38a-76ee8c289792 print
|
|
|
67735e |
+ # Model: IET VIRTUAL-DISK (scsi)
|
|
|
67735e |
+ # Disk /dev/longhorn/pvc-ed09c0f2-c086-41c8-a38a-76ee8c289792: 85.9GB
|
|
|
67735e |
+ # Sector size (logical/physical): 512B/512B
|
|
|
67735e |
+ # Partition Table: loop
|
|
|
67735e |
+ # Disk Flags:
|
|
|
67735e |
+ # Number Start End Size File system Flags
|
|
|
67735e |
+ # 1 0.00B 85.9GB 85.9GB ext4
|
|
|
67735e |
+ # => as result (without the next if clausule) we would end up with an entry in the disklayout.conf file:
|
|
|
67735e |
+ # fs /dev/longhorn/pvc-ed09c0f2-c086-41c8-a38a-76ee8c289792 /var/lib/kubelet/pods/61ed399a-d51b-40b8-8fe8-a78e84a1dd0b/volumes/kubernetes.io~csi/pvc-c65df331-f1c5-466a-9731-b2aa5e6da714/mount ext4 uuid=4fafdd40-a9ae-4b62-8bfb-f29036dbe3b9 label= blocksize=4096 reserved_blocks=0% max_mounts=-1 check_interval=0d bytes_per_inode=16384 default_mount_options=user_xattr,acl options=rw,relatime,data=ordered
|
|
|
67735e |
+ if echo "$device" | grep -q "^/dev/longhorn/pvc-" ; then
|
|
|
67735e |
+ Log "Longhorn Engine replica $device, skipping."
|
|
|
67735e |
+ continue
|
|
|
67735e |
+ fi
|
|
|
67735e |
fi
|
|
|
67735e |
fi
|
|
|
67735e |
# Replace a symbolic link /dev/disk/by-uuid/a1b2c3 -> ../../sdXn
|
|
|
67735e |
--
|
|
|
67735e |
2.25.4
|
|
|
67735e |
|