Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Remove obsolete iSCSI upgrade code #623

Merged
merged 1 commit into from
Jul 4, 2023
Merged

Remove obsolete iSCSI upgrade code #623

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 2 additions & 3 deletions drivers/BaseISCSI.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -630,10 +630,9 @@ def _attach_LUN_bySCSIid(self, SCSIid):
if not util.pathexists(path):
self.refresh()
if not util.wait_for_path(path, MAX_TIMEOUT):
util.SMlog("Unable to detect LUN attached to host [%s]" \
util.SMlog("Unable to detect LUN attached to host [%s]"
% path)
return False
return True
raise xs_errors.XenError('ISCSIDevice')

# This function queries the session for the attached LUNs
def _loadvdis(self):
Expand Down
50 changes: 4 additions & 46 deletions drivers/LVHDoISCSISR.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -435,45 +435,7 @@ def create(self, sr_uuid, size):

self.iscsi.attach(sr_uuid)
try:
if not self.iscsi._attach_LUN_bySCSIid(self.SCSIid):
# UPGRADE FROM GEORGE: take care of ill-formed SCSIid
upgraded = False
matchSCSIid = False
for file in filter(self.iscsi.match_lun, util.listdir(self.iscsi.path)):
path = os.path.join(self.iscsi.path, file)
if not util.wait_for_path(path, BaseISCSI.MAX_TIMEOUT):
util.SMlog("Unable to detect LUN attached to host [%s]" % path)
continue
try:
SCSIid = scsiutil.getSCSIid(path)
except:
continue
try:
matchSCSIid = scsiutil.compareSCSIid_2_6_18(self.SCSIid, path)
except:
continue
if (matchSCSIid):
util.SMlog("Performing upgrade from George")
try:
pbd = util.find_my_pbd(self.session, self.host_ref, self.sr_ref)
device_config = self.session.xenapi.PBD.get_device_config(pbd)
device_config['SCSIid'] = SCSIid
self.session.xenapi.PBD.set_device_config(pbd, device_config)

self.dconf['SCSIid'] = SCSIid
self.SCSIid = self.dconf['SCSIid']
except:
continue
if not self.iscsi._attach_LUN_bySCSIid(self.SCSIid):
raise xs_errors.XenError('InvalidDev')
else:
upgraded = True
break
else:
util.SMlog("Not a matching LUN, skip ... scsi_id is: %s" % SCSIid)
continue
if not upgraded:
raise xs_errors.XenError('InvalidDev')
self.iscsi._attach_LUN_bySCSIid(self.SCSIid)
self._pathrefresh(LVHDoISCSISR)
LVHDSR.LVHDSR.create(self, sr_uuid, size)
except Exception as inst:
Expand Down Expand Up @@ -504,8 +466,7 @@ def attach(self, sr_uuid):
else:
connected = True

if not i._attach_LUN_bySCSIid(self.SCSIid):
raise xs_errors.XenError('InvalidDev')
i._attach_LUN_bySCSIid(self.SCSIid)

# Check if at least one iscsi succeeded
if not connected:
Expand Down Expand Up @@ -556,9 +517,7 @@ def probe(self):
raise xs_errors.XenError('SRInUse')

self.iscsi.attach(self.uuid)
if not self.iscsi._attach_LUN_bySCSIid(self.SCSIid):
util.SMlog("Unable to detect LUN")
raise xs_errors.XenError('InvalidDev')
self.iscsi._attach_LUN_bySCSIid(self.SCSIid)
self._pathrefresh(LVHDoISCSISR)
out = LVHDSR.LVHDSR.probe(self)
self.iscsi.detach(self.uuid)
Expand Down Expand Up @@ -594,8 +553,7 @@ def attach_from_config(self, sr_uuid, vdi_uuid):
util.SMlog("LVHDoISCSIVDI.attach_from_config")
try:
self.sr.iscsi.attach(sr_uuid)
if not self.sr.iscsi._attach_LUN_bySCSIid(self.sr.SCSIid):
raise xs_errors.XenError('InvalidDev')
self.sr.iscsi._attach_LUN_bySCSIid(self.sr.SCSIid)
return LVHDSR.LVHDVDI.attach(self, sr_uuid, vdi_uuid)
except:
util.logException("LVHDoISCSIVDI.attach_from_config")
Expand Down