* Treat 'UGood' and 'UBad' as free disk.
* Update algorithm of disk status query to support show spare disk with
sector error as SPARE|ERROR
Changes in V2:
* Fix the incorrect data assign:
disk_status == Disk.STATUS_UNKNOWN
Should be:
disk_status = Disk.STATUS_UNKNOWN
Signed-off-by: Gris Ge <f...@redhat.com>
---
plugin/megaraid/megaraid.py | 25 ++++++++++++++++---------
1 file changed, 16 insertions(+), 9 deletions(-)
diff --git a/plugin/megaraid/megaraid.py b/plugin/megaraid/megaraid.py
index 111e223..30d48dc 100644
--- a/plugin/megaraid/megaraid.py
+++ b/plugin/megaraid/megaraid.py
@@ -91,29 +91,36 @@ def _disk_type_of(disk_show_basic_dict):
'Offln': Disk.STATUS_ERROR,
'GHS': Disk.STATUS_SPARE_DISK | Disk.STATUS_OK,
'DHS': Disk.STATUS_SPARE_DISK | Disk.STATUS_OK,
- 'UGood': Disk.STATUS_STOPPED | Disk.STATUS_OK,
- 'UBad': Disk.STATUS_STOPPED | Disk.STATUS_ERROR,
+ 'UGood': Disk.STATUS_FREE | Disk.STATUS_OK,
+ 'UBad': Disk.STATUS_FREE | Disk.STATUS_ERROR,
'Rbld': Disk.STATUS_RECONSTRUCT,
}
def _disk_status_of(disk_show_basic_dict, disk_show_stat_dict):
+ disk_status = _DISK_STATE_MAP.get(
+ disk_show_basic_dict['State'], 0)
+
if disk_show_stat_dict['Media Error Count'] or \
disk_show_stat_dict['Other Error Count'] or \
disk_show_stat_dict['S.M.A.R.T alert flagged by drive'] != 'No':
- return Disk.STATUS_ERROR
+ disk_status -= Disk.STATUS_OK
+ disk_status |= Disk.STATUS_ERROR
- if disk_show_stat_dict['Predictive Failure Count']:
- return Disk.STATUS_PREDICTIVE_FAILURE
+ elif disk_show_stat_dict['Predictive Failure Count']:
+ disk_status -= Disk.STATUS_OK
+ disk_status |= Disk.STATUS_PREDICTIVE_FAILURE
if disk_show_basic_dict['Sp'] == 'D':
- return Disk.STATUS_STOPPED
+ disk_status |= Disk.STATUS_STOPPED
if disk_show_basic_dict['Sp'] == 'F':
- return Disk.STATUS_OTHER
+ disk_status |= Disk.STATUS_OTHER
+
+ if disk_status == 0:
+ disk_status = Disk.STATUS_UNKNOWN
- return _DISK_STATE_MAP.get(
- disk_show_basic_dict['State'], Disk.STATUS_UNKNOWN)
+ return disk_status
def _mega_size_to_lsm(mega_size):
--
1.8.3.1
------------------------------------------------------------------------------
Dive into the World of Parallel Programming The Go Parallel Website, sponsored
by Intel and developed in partnership with Slashdot Media, is your hub for all
things parallel software development, from weekly thought leadership blogs to
news, videos, case studies, tutorials and more. Take a look and join the
conversation now. http://goparallel.sourceforge.net/
_______________________________________________
Libstoragemgmt-devel mailing list
Libstoragemgmt-devel@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/libstoragemgmt-devel
