From fe03c20ea35486ef0b4bb5eea6be7ff2c8564b7a Mon Sep 17 00:00:00 2001 From: ling-yun Date: Fri, 20 Dec 2013 10:55:18 +0800 Subject: [PATCH] Only reverify backing lun when create backing lun In TgtAdm, we alway do twice _verify_backing_lun whether backing lun exists or not. If backing lun exists, it doesn't need to call _verify_backing_lun function again. It only needs reverify whether backing lun exists or not when recreate backing lun. Change-Id: Ic11d778362540df307056a1adcba932e571b7d20 Closes-Bug: #1262958 --- cinder/brick/iscsi/iscsi.py | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/cinder/brick/iscsi/iscsi.py b/cinder/brick/iscsi/iscsi.py index d942e9886..3ea47548f 100644 --- a/cinder/brick/iscsi/iscsi.py +++ b/cinder/brick/iscsi/iscsi.py @@ -238,10 +238,10 @@ class TgtAdm(TargetAdmin): os.unlink(volume_path) raise exception.ISCSITargetCreateFailed(volume_id=vol_id) - # Finally check once more and if no go, fail and punt - if not self._verify_backing_lun(iqn, tid): - os.unlink(volume_path) - raise exception.ISCSITargetCreateFailed(volume_id=vol_id) + # Finally check once more and if no go, fail and punt + if not self._verify_backing_lun(iqn, tid): + os.unlink(volume_path) + raise exception.ISCSITargetCreateFailed(volume_id=vol_id) if old_persist_file is not None and os.path.exists(old_persist_file): os.unlink(old_persist_file) -- 2.45.2