SHA256
1
0
forked from pool/mdadm
mdadm/1001-display-timeout-status.patch
Neil Brown 1bd371d7b6 Accepting request 642513 from home:colyli:branches:openSUSE:Factory
- Update mdadm code base to mdadm-4.1 (bsc#1111960)
- All backport patches are deleted since they are in mdadm-4.1
  already.
- Fix Makefile to install mdadm_env.sh to /usr/lib/mdadm/
  (bsc#1111960)
  0001-Makefile-install-mdadm_env.sh-to-usr-lib-mdadm.patch

- Add missing patches which exist in SLE12-SP3 and should be in
  SLE15 too,
  - mdadm: improve the dlm locking mechanism for clustered raid
    (bsc#1049126)
    0218-mdadm-improve-the-dlm-locking-mechanism-for-clustere.patch
  - Assemble: provide protection when clustered raid do assemble
    (bsc#1049126)
    0219-Assemble-provide-protection-when-clustered-raid-do-a.patch
  - Assemble: cleanup the failure path
    (bsc#1049126)
    0220-Assemble-cleanup-the-failure-path.patch
  - Assemble: remove the protection when clustered raid do assemble
    (bsc#1101348)
    0221-Assemble-remove-the-protection-when-clustered-raid-d.patch
  - 1001-display-timeout-status.patch 

- mdadm.spec
  Change %doc to %license for COPYING file, which was warned during
  'osc ci'. 

- imsm: change reserved space to 4MB
  (bsc#1101110)
  0212-imsm-change-reserved-space-to-4MB.patch

OBS-URL: https://build.opensuse.org/request/show/642513
OBS-URL: https://build.opensuse.org/package/show/Base:System/mdadm?expand=0&rev=166
2018-10-17 05:01:26 +00:00

31 lines
928 B
Diff

---
Detail.c | 1 +
md_p.h | 1 +
2 files changed, 2 insertions(+)
Index: mdadm-4.0/Detail.c
===================================================================
--- mdadm-4.0.orig/Detail.c
+++ mdadm-4.0/Detail.c
@@ -693,6 +693,8 @@ This is pretty boring
disk.raid_disk >= 0)
failed++;
}
+ if (disk.state & (1<<MD_DISK_TIMEOUT))
+ printf(" timeout");
if (disk.state & (1 << MD_DISK_ACTIVE))
printf(" active");
if (disk.state & (1 << MD_DISK_SYNC)) {
Index: mdadm-4.0/md_p.h
===================================================================
--- mdadm-4.0.orig/md_p.h
+++ mdadm-4.0/md_p.h
@@ -90,6 +90,7 @@
* dire need
*/
#define MD_DISK_FAILFAST 10 /* Fewer retries, more failures */
+#define MD_DISK_TIMEOUT 11 /* disk is faulty due to timeout */
#define MD_DISK_REPLACEMENT 17
#define MD_DISK_JOURNAL 18 /* disk is used as the write journal in RAID-5/6 */