Dell EMC PS: Optimize parsing of capacity info from backend

The backend api returns large amounts of information and
times out when there are lots of volumes. Accelerated the
process by terminating the parsing after the capacity info
is retrieved.

Closes Bug: #1661154

Change-Id: I1f0adaa8e25cd3ec74084b22bbe1573b92713959
(cherry picked from commit a9a0c2ee2e)
This commit is contained in:
rajinir 2017-10-02 10:51:48 -05:00 committed by Sean McGinnis
parent ed7527145a
commit 047c3f87b5
2 changed files with 14 additions and 5 deletions

View File

@ -135,10 +135,11 @@ class PSSeriesISCSIDriver(san.SanISCSIDriver):
eqlx_chap_login, and eqlx_chap_password.
1.4.1 - Rebranded driver to Dell EMC.
1.4.4 - Fixed over-subscription ratio calculation
1.4.5 - Optimize volume stats information parsing
"""
VERSION = "1.4.4"
VERSION = "1.4.5"
# ThirdPartySytems wiki page
CI_WIKI_NAME = "Dell_Storage_CI"
@ -298,12 +299,11 @@ class PSSeriesISCSIDriver(san.SanISCSIDriver):
data['reserved_percentage'] = 0
data['QoS_support'] = False
data['total_capacity_gb'] = 0
data['free_capacity_gb'] = 0
data['total_capacity_gb'] = None
data['free_capacity_gb'] = None
data['multiattach'] = True
provisioned_capacity = 0
provisioned_capacity = None
for line in self._eql_execute('pool', 'select',
self.configuration.eqlx_pool, 'show'):
if line.startswith('TotalCapacity:'):
@ -315,6 +315,10 @@ class PSSeriesISCSIDriver(san.SanISCSIDriver):
if line.startswith('VolumeReportedSpace:'):
out_tup = line.rstrip().partition(' ')
provisioned_capacity = self._get_space_in_gb(out_tup[-1])
# Terminate parsing once this data is found to improve performance
if (data['total_capacity_gb'] and data['free_capacity_gb'] and
provisioned_capacity):
break
global_capacity = data['total_capacity_gb']
global_free = data['free_capacity_gb']

View File

@ -0,0 +1,5 @@
---
fixes:
- Dell EMC PS Series Driver code reporting volume stats is now optimized
to return the information earlier and accelerate the process. This change
fixes bug 1661154.