b24095eccc
- Upversion code tar from 8.4 to 9.15
- Modify drbd.spec to apply code patches
- Porting 8.4 code patches to 9.15
(Combine several current patches by target file)
Test
- drbd resize operation. Ensure no outstanding alarms
and drbd-overview indicates insync; and 'sudo lvs'
indicates resized correctly
- drbd resize operation prior to upgrade and then
performing the upgrade.
e.g. drbd may be resized via
'system controllerfs-modify etcd=<largervalue>',
when both controllers are
unlocked-enabled-available
Story: 2009067
Task: 42873
Depends-On: https://review.opendev.org/806736
Signed-off-by: Takamasa Takenaka <takamasa.takenaka@windriver.com>
Change-Id: I25cb46e4b77f90c91d5d7e4dcfa79125776163d1
25 lines
782 B
Diff
25 lines
782 B
Diff
diff --git a/scripts/drbd b/scripts/drbd
|
|
index 5b610f9..6fea91c 100755
|
|
--- a/scripts/drbd
|
|
+++ b/scripts/drbd
|
|
@@ -211,7 +211,9 @@ case "$1" in
|
|
|
|
[ -d /var/lock/subsys ] && touch /var/lock/subsys/drbd # for RedHat
|
|
run_hook start_before-wait
|
|
- $DRBDADM wait-con-int # User interruptible version of wait-connect all
|
|
+ if [ ! -e /etc/platform/simplex ] ; then # Skip if simplex
|
|
+ $DRBDADM wait-con-int # User interruptible version of wait-connect all
|
|
+ fi
|
|
run_hook start
|
|
|
|
# Become primary if configured
|
|
@@ -265,7 +267,7 @@ case "$1" in
|
|
for d in /dev/drbd* ; do
|
|
[ -L "$d" ] && continue
|
|
[ -b "$d" ] || continue
|
|
- M=$(umount "$d" 2>&1)
|
|
+ M=$(umount --all-targets "$d" 2>&1)
|
|
case $M in
|
|
*" not mounted") :;;
|
|
*) stop_failed=1; echo "$M" >&2 ;;
|