Skip to content

add the terminate_connection in iSCSIDriver #4

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

Open
wangzhizheng wants to merge 2 commits into
base: liberty
Choose a base branch
from
Open

add the terminate_connection in iSCSIDriver #4

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
74ad499
add the terminate_connection in iSCSIDriver
wangzhizheng Apr 20, 2017
858437e
just need to return the id and status
wangzhizheng Apr 20, 2017
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
19 changes: 16 additions & 3 deletions xtremio.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -746,12 +746,12 @@ def create_cgsnapshot(self, context, cgsnapshot, snapshots):
snapshots = objects.SnapshotList().get_all_for_cgsnapshot(
context, cgsnapshot['id'])

snap_model_update = []
for snapshot in snapshots:
snapshot.status = 'available'

snap_model_update.append({'id': snapshot.id, 'status': 'available'})
model_update = {'status': 'available'}

return model_update, snapshots
return model_update, snap_model_update

def delete_cgsnapshot(self, context, cgsnapshot, snapshots):
"""Deletes a cgsnapshot."""
Expand Down Expand Up @@ -925,6 +925,19 @@ def _get_iscsi_properties(self, lunmap):
'target_luns': [lunmap['lun']] * len(portals)}
return properties

def terminate_connection(self, volume, connector, **kwargs):
(super(XtremIOISCSIDriver, self)
.terminate_connection(volume, connector, **kwargs))
num_vols = (self.client
.num_of_mapped_volumes(self._get_ig_name(connector)))
if num_vols > 0:
return
else:
Copy link
Copy Markdown
Contributor

@shayh shayh Apr 25, 2017

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

would be simpler
if num_vols == 0:
...

Copy link
Copy Markdown
Author

@wangzhizheng wangzhizheng Apr 26, 2017

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I agree, but if we want to delete the initiator group, there is no other way but send the request to XMS.
It is not an error issue but how XtremIO driver should work.
By the way other storage vendor working like this, this is why I think that we should also work as so. Users maybe use multiple backend storage and keep all the storage have the same work will be friendly to user.

igName = self._get_ig_name(connector)
# delete the initiator group
self.client.req('initiator-groups', 'DELETE', name=igName, ver='v2')
LOG.debug('Deleted initiator group: %s', igName)

def _get_initiator_names(self, connector):
return [connector['initiator']]

Expand Down