Change in vdsm[master]: detach: Support force detach on Storage Domains with old pools.
nsoffer at redhat.com
nsoffer at redhat.com
Thu Jun 26 13:02:33 UTC 2014
Nir Soffer has posted comments on this change.
Change subject: detach: Support force detach on Storage Domains with old pools.
......................................................................
Patch Set 10:
(2 comments)
http://gerrit.ovirt.org/#/c/29042/10/vdsm/storage/hsm.py
File vdsm/storage/hsm.py:
Line 773: if sdUUID == pool.masterDomain.sdUUID:
Line 774: raise se.CannotDetachMasterStorageDomain(sdUUID)
Line 775: assert len(self.pools) <= 1
Line 776: pool = self.pools.values()[0]
Line 777: if spUUID == sd.BLANK_UUID:
This must be before line 772
Line 778: self._deatchStorageDomainFromAllPools(sdUUID)
Line 779: else:
Line 780: pool.forcedDetachSD(sdUUID)
Line 781:
Line 776: pool = self.pools.values()[0]
Line 777: if spUUID == sd.BLANK_UUID:
Line 778: self._deatchStorageDomainFromAllPools(sdUUID)
Line 779: else:
Line 780: pool.forcedDetachSD(sdUUID)
It shoould be like this:
vars.task.setDefaultException(
se.StorageDomainActionError(
"sdUUID=%s, spUUID=%s" % (sdUUID, spUUID)))
vars.task.getExclusiveLock(STORAGE, spUUID)
if spUUID == sd.BLANK_UUID:
self._deatchStorageDomainFromAllPools(sdUUID)
else:
pool = self.getPool(spUUID)
if sdUUID == pool.masterDomain.sdUUID:
raise se.CannotDetachMasterStorageDomain(sdUUID)
pool.forcedDetachSD(sdUUID)
Line 781:
Line 782: @public
Line 783: def detachStorageDomain(self, sdUUID, spUUID, msdUUID=None,
Line 784: masterVersion=None, options=None):
--
To view, visit http://gerrit.ovirt.org/29042
To unsubscribe, visit http://gerrit.ovirt.org/settings
Gerrit-MessageType: comment
Gerrit-Change-Id: I4a6fb01775f7c834a3466e45b9b7ed9b4bd5c3be
Gerrit-PatchSet: 10
Gerrit-Project: vdsm
Gerrit-Branch: master
Gerrit-Owner: Maor Lipchuk <mlipchuk at redhat.com>
Gerrit-Reviewer: Allon Mureinik <amureini at redhat.com>
Gerrit-Reviewer: Dan Kenigsberg <danken at redhat.com>
Gerrit-Reviewer: Federico Simoncelli <fsimonce at redhat.com>
Gerrit-Reviewer: Maor Lipchuk <mlipchuk at redhat.com>
Gerrit-Reviewer: Nir Soffer <nsoffer at redhat.com>
Gerrit-Reviewer: automation at ovirt.org
Gerrit-Reviewer: oVirt Jenkins CI Server
Gerrit-HasComments: Yes
More information about the vdsm-patches
mailing list