x
/
nova-zvm-virt-driver
Code Issues Proposed changes

ignore error 6312 

6312 means dirmaint limit reached, we need ignore this error
and proceed further operations.

Change-Id: Ic84b496ea8dce3d427d705eac487e3016cf916f1
This commit is contained in:
biao cao 2016-11-16 13:20:06 +08:00 committed by jichenjc
parent e60b54fdba
commit 97a889ef62
2 changed files with 15 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
nova/tests/unit/virt/zvm/test_zvm.py
View File

@ -2251,6 +2251,18 @@ class ZVMNetworkTestCases(ZVMTestCase):
data = 'Return Code: 596\n Reason Code: 1185'
self.assertTrue(zvmutils._is_recoverable_issue(data))
data = 'Return Code: 596\n Reason Code: 6313'
self.assertFalse(zvmutils._is_recoverable_issue(data))
data = 'Return Code: 597\n Reason Code: 6312'
self.assertFalse(zvmutils._is_recoverable_issue(data))
data = 'Return Code: 597\n Reason Code: 6313'
self.assertFalse(zvmutils._is_recoverable_issue(data))
data = 'Return Code: 596\n Reason Code: 6312'
self.assertTrue(zvmutils._is_recoverable_issue(data))
class ZVMUtilsTestCases(ZVMTestCase):

4
nova/virt/zvm/utils.py
View File

@ -550,7 +550,9 @@ def _is_warning_or_recoverable_issue(err_str):
def _is_recoverable_issue(err_str):
dirmaint_request_counter_save = ['Return Code: 596', 'Reason Code: 1185']
recoverable_issues = [dirmaint_request_counter_save]
dirmaint_request_limit = ['Return Code: 596', 'Reason Code: 6312']
recoverable_issues = [dirmaint_request_counter_save,
dirmaint_request_limit]
for issue in recoverable_issues:
# Search all matchs in the return value
# any mismatch leads to recoverable not empty