68 lines
1.9 KiB
Diff
68 lines
1.9 KiB
Diff
|
From 23f45965a0abe3506885c8e8005ee79473a66422 Mon Sep 17 00:00:00 2001
|
||
|
From: Xiao Ni <xni@redhat.com>
|
||
|
Date: Wed, 22 May 2024 16:50:44 +0800
|
||
|
Subject: [PATCH 082/157] mdadm/tests: 03assem-incr enhance
|
||
|
|
||
|
It fails when hostname lenght > 32. Because the super1 metadata name
|
||
|
doesn't include hostname when hostname length > 32. Then mdadm thinks
|
||
|
the array is a foreign array if no device link is specified when
|
||
|
assembling the array. It chooses a minor number from 127.
|
||
|
|
||
|
Signed-off-by: Xiao Ni <xni@redhat.com>
|
||
|
Signed-off-by: Mariusz Tkaczyk <mariusz.tkaczyk@linux.intel.com>
|
||
|
---
|
||
|
test | 3 +++
|
||
|
tests/03assem-incr | 20 +++++++++++++-------
|
||
|
2 files changed, 16 insertions(+), 7 deletions(-)
|
||
|
|
||
|
diff --git a/test b/test
|
||
|
index 814ce199..1fce6be2 100755
|
||
|
--- a/test
|
||
|
+++ b/test
|
||
|
@@ -33,6 +33,9 @@ LVM_VOLGROUP=mdtest
|
||
|
md0=/dev/md0
|
||
|
md1=/dev/md1
|
||
|
md2=/dev/md2
|
||
|
+# if user doesn't specify minor number, mdadm chooses minor number
|
||
|
+# automatically from 127.
|
||
|
+md127=/dev/md127
|
||
|
mdp0=/dev/md_d0
|
||
|
mdp1=/dev/md_d1
|
||
|
|
||
|
diff --git a/tests/03assem-incr b/tests/03assem-incr
|
||
|
index 38880a7f..21215a34 100644
|
||
|
--- a/tests/03assem-incr
|
||
|
+++ b/tests/03assem-incr
|
||
|
@@ -9,15 +9,21 @@ set -x -e
|
||
|
levels=(raid0 raid1 raid5)
|
||
|
|
||
|
if [ "$LINEAR" == "yes" ]; then
|
||
|
- levels+=( linear )
|
||
|
+ levels+=( linear )
|
||
|
fi
|
||
|
|
||
|
for l in ${levels[@]}
|
||
|
do
|
||
|
- mdadm -CR $md0 -l $l -n5 $dev0 $dev1 $dev2 $dev3 $dev4 --assume-clean
|
||
|
- mdadm -S md0
|
||
|
- mdadm -I $dev1
|
||
|
- mdadm -I $dev3
|
||
|
- mdadm -A /dev/md0 $dev0 $dev1 $dev2 $dev3 $dev4
|
||
|
- mdadm -S /dev/md0
|
||
|
+ mdadm -CR $md0 -l $l -n5 $dev0 $dev1 $dev2 $dev3 $dev4 --assume-clean
|
||
|
+ mdadm -S $md0
|
||
|
+ mdadm -I $dev1
|
||
|
+ mdadm -I $dev3
|
||
|
+ mdadm -A $md0 $dev0 $dev1 $dev2 $dev3 $dev4
|
||
|
+ # If one array is foreign (metadata name doesn't have the machine's
|
||
|
+ # hostname), mdadm chooses a minor number automatically from 127
|
||
|
+ if [ $is_foreign == "no" ]; then
|
||
|
+ mdadm -S $md0
|
||
|
+ else
|
||
|
+ mdadm -S $md127
|
||
|
+ fi
|
||
|
done
|
||
|
--
|
||
|
2.41.0
|
||
|
|