Merging upstream version 4.4.
Signed-off-by: Daniel Baumann <daniel@debian.org>
This commit is contained in:
parent
d98b081a3d
commit
dfe7ded19c
48 changed files with 181 additions and 105 deletions
|
@ -19,7 +19,7 @@ check all nobitmap
|
|||
mdadm --grow $md0 --bitmap=internal
|
||||
[ $? -eq '0' ] ||
|
||||
die "$NODE1: change bitmap 'none' to 'internal' failed."
|
||||
sleep 1
|
||||
sleep 2
|
||||
mdadm -X $dev0 $dev1 &> /dev/null
|
||||
[ $? -eq '0' ] ||
|
||||
die "$NODE1: create 'internal' bitmap failed."
|
||||
|
@ -37,7 +37,7 @@ mdadm --grow $md0 --bitmap=clustered
|
|||
[ $? -eq '0' ] ||
|
||||
die "$NODE1: change bitmap 'none' to 'clustered' failed."
|
||||
ssh $NODE2 mdadm -A $md0 $dev0 $dev1
|
||||
sleep 1
|
||||
sleep 2
|
||||
for ip in $NODES
|
||||
do
|
||||
ssh $ip "mdadm -X $dev0 $dev1 | grep -q 'Cluster name'" ||
|
||||
|
|
|
@ -85,7 +85,7 @@ check_dlm()
|
|||
crm configure clone base-clone base-group \
|
||||
meta interleave=true
|
||||
fi
|
||||
sleep 1
|
||||
sleep 2
|
||||
for ip in $NODE1 $NODE2
|
||||
do
|
||||
ssh $ip "pgrep dlm_controld > /dev/null" || {
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue