Accepting request 408603 from Base:System

1

OBS-URL: https://build.opensuse.org/request/show/408603
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/mdadm?expand=0&rev=107
This commit is contained in:
Dominique Leuenberger 2016-07-24 17:42:38 +00:00 committed by Git OBS Bridge
commit 53e7203303
3 changed files with 57 additions and 0 deletions

View File

@ -0,0 +1,48 @@
From 03bec5cfdd87f25b1669a4b62d19cf872403d37a Mon Sep 17 00:00:00 2001
From: Bill Merriam <bill@merriam.net>
Date: Tue, 17 May 2016 10:16:13 -0400
Subject: [PATCH] The mdcheck script now adds messages to the system log to
report on progress of the array check. These are issued when mdcheck starts
or continues a check and when it suspends a check at the expiration of
duration. The messages either report the check has completed or the block
number of the current and last block in the array and the percentage of
completion.
Signed-off-by: Bill Merriam <bill@merriam.net>
---
misc/mdcheck | 7 +++++++
1 file changed, 7 insertions(+)
diff --git a/misc/mdcheck b/misc/mdcheck
index 2c8f54d..c33e3f6 100644
--- a/misc/mdcheck
+++ b/misc/mdcheck
@@ -100,6 +100,8 @@ do
continue
else
start=`cat "$fl"`
+ size=$(expr $(cat $sys/md/component_size) \* 2)
+ logger $(echo $dev $start $size | awk '{printf "MDCHECK Continuing check on %s at block %i of %i, %6.2f%% complete\n", $1, $2, $3, $2/$3*100 }')
fi
cnt=$[cnt+1]
@@ -129,6 +131,7 @@ do
then
eval MD_${i}_fl=
rm -f $fl
+ logger "MDCHECK check completed on ${sys##*/}, removing $fl"
continue;
fi
read a rest < $sys/md/sync_completed
@@ -156,4 +159,8 @@ do
fi
echo idle > $sys/md/sync_action
cat $sys/md/sync_min > $fl
+ dev=${sys##*/}
+ start=$(cat $fl)
+ size=$(expr $(cat $sys/md/component_size) \* 2)
+ logger $(echo $dev $start $size | awk '{printf "MDCHECK Suspending check on %s at block %i of %i, %6.2f%% complete\n", $1, $2, $3, $2/$3*100 }')
done
--
2.6.6

View File

@ -1,3 +1,10 @@
-------------------------------------------------------------------
Sun May 22 15:01:13 UTC 2016 - bill@merriam.net
- Added 0002-The-mdcheck-script-now-adds-messages-to-the-system.patch
The mdcheck bash script now writes messages to the syslog about
progress with check.
-------------------------------------------------------------------
Fri May 20 05:13:48 UTC 2016 - neilb@suse.com

View File

@ -40,6 +40,7 @@ Source2: sysconfig.mdadm
Source3: cron.d.mdadm
Source7: mdadm.cron
Patch1: 0001-super1-Clear-memory-allocated-for-superblock-bitmap-.patch
Patch2: 0002-The-mdcheck-script-now-adds-messages-to-the-system.patch
%define _udevdir %(pkg-config --variable=udevdir udev)
%define _systemdshutdowndir %{_unitdir}/../system-shutdown
@ -52,6 +53,7 @@ programs but with a very different interface.
%prep
%setup -q -a1
%patch1 -p1
%patch2 -p1
%build
make %{?_smp_mflags} CC="%__cc" CXFLAGS="$RPM_OPT_FLAGS -Wno-error" SUSE=yes