Skip to content

Commit 841e50f

Browse files
committed
CA-210336: Added exception handling to prevent stack trace dump
Added exception handling for when devices path is not valid. Signed-off-by: Letsibogo Ramadi <letsibogo.ramadi@citrix.com>
1 parent 4a4c5b4 commit 841e50f

File tree

1 file changed

+11
-1
lines changed

1 file changed

+11
-1
lines changed

drivers/BaseISCSI.py

Lines changed: 11 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -350,7 +350,17 @@ def attach(self, sr_uuid):
350350
if self.dconf.has_key('SCSIid'):
351351
if self.mpath == 'true':
352352
self.mpathmodule.refresh(self.dconf['SCSIid'], 0)
353-
devs = os.listdir("/dev/disk/by-scsid/%s" % self.dconf['SCSIid'])
353+
try:
354+
devs = os.listdir(
355+
os.path.join('/dev/disk/by-scsid', self.dconf['SCSIid'])
356+
)
357+
except OSError as e:
358+
util.SMlog(str(e))
359+
raise xs_errors.XenError(
360+
'ConfigDeviceInvalid',
361+
opterr='check devices path'
362+
)
363+
354364
for dev in devs:
355365
realdev = os.path.realpath("/dev/disk/by-scsid/%s/%s" % (self.dconf['SCSIid'], dev))
356366
util.set_scheduler(realdev.split("/")[-1], "noop")

0 commit comments

Comments
 (0)