openstack
/
cinder
Code Issues Proposed changes

QNAP: driver fails to create volume and snapshot in some case 

When NAS is busy or network delay, the volume or snapshot would
fail to created. We fixed the logic of waiting NAS to creating
LUN or snapshot.

Change-Id: Ieb524d9b192e2a222f7d25a0df80cf52f1423e81
Closes-Bug: #1765610
This commit is contained in:
Chris Yang 2018-04-20 15:06:20 +08:00
parent 8efee51cae
commit 880ff557ca
2 changed files with 18 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
cinder/volume/drivers/qnap.py
View File

@ -334,12 +334,13 @@ class QnapISCSIDriver(san.SanISCSIDriver):
while True:
created_lun = self.api_executor.get_lun_info(
LUNIndex=create_lun_index)
if created_lun.find('LUNNAA') is not None:
if (created_lun is not None and
created_lun.find('LUNNAA').text is not None):
lun_naa = created_lun.find('LUNNAA').text
try_times = try_times + 3
eventlet.sleep(self.TIME_INTERVAL)
if(try_times > max_wait_sec or lun_naa is not None):
if(try_times > max_wait_sec or lun_naa != ""):
break
LOG.debug('LUNNAA: %s', lun_naa)
@ -510,14 +511,15 @@ class QnapISCSIDriver(san.SanISCSIDriver):
while True:
created_lun = self.api_executor.get_lun_info(
LUNName=cloned_lun_name)
if created_lun.find('LUNNAA') is not None:
if (created_lun is not None and
created_lun.find('LUNNAA') is not None):
lun_naa = created_lun.find('LUNNAA').text
lun_index = created_lun.find('LUNIndex').text
LOG.debug('LUNIndex: %s', lun_index)
try_times = try_times + 3
eventlet.sleep(self.TIME_INTERVAL)
if(try_times > max_wait_sec or lun_naa is not None):
if(try_times > max_wait_sec or lun_naa != ""):
break
LOG.debug('LUNNAA: %s', lun_naa)
@ -564,12 +566,13 @@ class QnapISCSIDriver(san.SanISCSIDriver):
while True:
created_snapshot = self.api_executor.get_snapshot_info(
lun_index=lun_index, snapshot_name=create_snapshot_name)
if created_snapshot is not None:
if (created_snapshot is not None and
created_snapshot.find('snapshot_id').text is not None):
snapshot_id = created_snapshot.find('snapshot_id').text
try_times = try_times + 3
eventlet.sleep(self.TIME_INTERVAL)
if(try_times > max_wait_sec or created_snapshot is not None):
if(try_times > max_wait_sec or snapshot_id != ""):
break
LOG.debug('created_snapshot: %s', created_snapshot)
@ -621,14 +624,16 @@ class QnapISCSIDriver(san.SanISCSIDriver):
while True:
created_lun = self.api_executor.get_lun_info(
LUNName=create_lun_name)
if created_lun.find('LUNNAA') is not None:
if (created_lun is not None and
created_lun.find('LUNNAA') is not None):
lun_naa = created_lun.find('LUNNAA').text
lun_index = created_lun.find('LUNIndex').text
LOG.debug('LUNNAA: %s', lun_naa)
LOG.debug('LUNIndex: %s', lun_index)
try_times = try_times + 3
eventlet.sleep(self.TIME_INTERVAL)
if(try_times > max_wait_sec or lun_naa is not None):
if(try_times > max_wait_sec or lun_naa != ""):
break
if (volume['size'] > snapshot['volume_size']):

5
releasenotes/notes/bug-1765610-qnap-fix-volume-snapshot-create-fail-2bb785eafdb87fb6.yaml Normal file
View File

@ -0,0 +1,5 @@
---
fixes:
- |
Fixed QNAP driver failures to create volume and snapshot in some
cases.