Change in vdsm[master]: More safe startSpm().
by ewarszaw＠redhat.com
Eduardo has uploaded a new change for review.
Change subject: More safe startSpm().
......................................................................
More safe startSpm().
Change-Id: I1e6b32bdf1dd8dc36f6633306d4edef89d542e31
---
M vdsm/storage/sp.py
1 file changed, 16 insertions(+), 19 deletions(-)
git pull ssh://gerrit.ovirt.org:29418/vdsm refs/changes/51/451/1
--
To view, visit http://gerrit.ovirt.org/451
To unsubscribe, visit http://gerrit.ovirt.org/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I1e6b32bdf1dd8dc36f6633306d4edef89d542e31
Gerrit-PatchSet: 1
Gerrit-Project: vdsm
Gerrit-Branch: master
Gerrit-Owner: Eduardo <ewarszaw(a)redhat.com>
9 years, 11 months
Change in vdsm[master]: [WIP] Add a releaseHostId option to stop the DomainMonitorTh...
by Federico Simoncelli
Federico Simoncelli has uploaded a new change for review.
Change subject: [WIP] Add a releaseHostId option to stop the DomainMonitorThread
......................................................................
[WIP] Add a releaseHostId option to stop the DomainMonitorThread
Bug-Id: https://bugzilla.redhat.com/show_bug.cgi?id=851151
Change-Id: I83458fb4146de7e402606916615533da305bd867
Signed-off-by: Federico Simoncelli <fsimonce(a)redhat.com>
---
M vdsm/storage/domainMonitor.py
M vdsm/storage/sp.py
2 files changed, 19 insertions(+), 9 deletions(-)
git pull ssh://gerrit.ovirt.org:29418/vdsm refs/changes/81/7581/1
diff --git a/vdsm/storage/domainMonitor.py b/vdsm/storage/domainMonitor.py
index 95e2f7b..c1ec5a9 100644
--- a/vdsm/storage/domainMonitor.py
+++ b/vdsm/storage/domainMonitor.py
@@ -84,14 +84,14 @@
# The domain should be added only after it succesfully started
self._domains[sdUUID] = domainThread
- def stopMonitoring(self, sdUUID):
+ def stopMonitoring(self, sdUUID, releaseHostId=False):
# The domain monitor issues events that might become raceful if
# stopMonitoring doesn't stop until the thread exits.
# Eg: when a domain is detached the domain monitor is stopped and
# the host id is released. If the monitor didn't actually exit it
# might respawn a new acquire host id.
try:
- self._domains[sdUUID].stop()
+ self._domains[sdUUID].stop(releaseHostId=releaseHostId)
except KeyError:
return
@@ -100,13 +100,15 @@
def getStatus(self, sdUUID):
return self._domains[sdUUID].getStatus()
- def close(self):
+ def close(self, releaseHostId=False):
for sdUUID in self._domains.keys():
- self.stopMonitoring(sdUUID)
+ self.stopMonitoring(sdUUID, releaseHostId=releaseHostId)
class DomainMonitorThread(object):
log = logging.getLogger('Storage.DomainMonitorThread')
+
+ RELEASE_HOSTID_DEFAULT = False
def __init__(self, sdUUID, hostId, interval):
self.thread = Thread(target=self._monitorLoop)
@@ -121,16 +123,20 @@
self.nextStatus = DomainMonitorStatus()
self.isIsoDomain = None
self.lastRefresh = time()
+ self.releaseHostId = self.RELEASE_HOSTID_DEFAULT
self.refreshTime = \
config.getint("irs", "repo_stats_cache_refresh_timeout")
def start(self):
self.thread.start()
- def stop(self, wait=True):
+ def stop(self, wait=True, releaseHostId):
+ self.releaseHostId = releaseHostId
+
self.stopEvent.set()
if wait:
self.thread.join()
+
self.domain = None
def getStatus(self):
@@ -151,13 +157,17 @@
# If this is an ISO domain we didn't acquire the host id and releasing
# it is superfluous.
- if not self.isIsoDomain:
+ if not self.isIsoDomain and self.releaseHostId:
try:
self.domain.releaseHostId(self.hostId, unused=True)
except:
self.log.debug("Unable to release the host id %s for domain "
"%s", self.hostId, self.sdUUID, exc_info=True)
+ # Resetting the releaseHostId value to its default just to be sure in
+ # case in the future we want to recycle the DomainMonitor objects.
+ self.releaseHostId = self.RELEASE_HOSTID_DEFAULT
+
def _monitorDomain(self):
self.nextStatus.clear()
diff --git a/vdsm/storage/sp.py b/vdsm/storage/sp.py
index 40de20a..e8c59f3 100644
--- a/vdsm/storage/sp.py
+++ b/vdsm/storage/sp.py
@@ -647,8 +647,8 @@
@unsecured
- def stopMonitoringDomains(self):
- self.domainMonitor.close()
+ def stopMonitoringDomains(self, releaseHostId=False):
+ self.domainMonitor.close(releaseHostId=releaseHostId)
return True
@@ -675,7 +675,7 @@
if os.path.exists(self.poolPath):
fileUtils.cleanupdir(self.poolPath)
- self.stopMonitoringDomains()
+ self.stopMonitoringDomains(releaseHostId=True)
return True
--
To view, visit http://gerrit.ovirt.org/7581
To unsubscribe, visit http://gerrit.ovirt.org/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I83458fb4146de7e402606916615533da305bd867
Gerrit-PatchSet: 1
Gerrit-Project: vdsm
Gerrit-Branch: master
Gerrit-Owner: Federico Simoncelli <fsimonce(a)redhat.com>
9 years, 11 months
Change in vdsm[master]: (Schema) Change ConnectionRef actions to work on a single co...
by smizrahi＠redhat.com
Saggi Mizrahi has uploaded a new change for review.
Change subject: (Schema) Change ConnectionRef actions to work on a single connection
......................................................................
(Schema) Change ConnectionRef actions to work on a single connection
This was the original intention of the API. The reason we started
supporting multiple connections in a single call is because of the
overhead inherent in XML-RPC. The new API can multiplex calls and has
practically no overhead per call.
Also, refID is not an UUID
Change-Id: I5747f2161d039cfaa82c0797e63ff58dbffbe8ac
Signed-off-by: Saggi Mizrahi <smizrahi(a)redhat.com>
---
M vdsm_api/vdsmapi-schema.json
1 file changed, 21 insertions(+), 44 deletions(-)
git pull ssh://gerrit.ovirt.org:29418/vdsm refs/changes/48/7148/1
diff --git a/vdsm_api/vdsmapi-schema.json b/vdsm_api/vdsmapi-schema.json
index e782613..b103b28 100644
--- a/vdsm_api/vdsmapi-schema.json
+++ b/vdsm_api/vdsmapi-schema.json
@@ -2250,16 +2250,16 @@
{'command': {'class': 'Global', 'name': 'setSafeNetworkConfig'}}
-## Category: @ConnectionRefs ##################################################
+## Category: @ConnectionRef ##################################################
##
-# @ConnectionRefs.init:
+# @ConnectionRef.init:
#
-# Initialize a ConnectionRefs API object.
+# Initialize a ConnectionRef API object.
#
# Since: 4.10.0
# XXX: Extension: object constructors
##
-{'init': 'ConnectionRefs'}
+{'init': 'ConnectionRef'}
##
# @IscsiPortal:
@@ -2444,60 +2444,37 @@
'connectionInfo': 'ConnectionRefParameters'}}
##
-# @ConnectionRefArgsMap:
-#
-# A mapping of connection arguments indexed by ConnectionRef UUID.
-#
-# Since: 4.10.0
-##
-{'map': 'ConnectionRefArgsMap',
- 'key': 'UUID', 'value': 'ConnectionRefArgs'}
-
-##
-# @ConnectionRefArgsStatusMap:
-#
-# A mapping of status codes indexed by ConnectionRef UUID.
-#
-# Since: 4.10.0
-##
-{'map': 'ConnectionRefArgsStatusMap',
- 'key': 'UUID', 'value': 'int'}
-
-##
-# @ConnectionRefs.acquire:
+# @ConnectionRef.acquire:
#
# Acquire one or more new storage connection references.
#
-# @conRefArgs: Connection parameters
+# @refID: The identifier to be assigned to the new connection reference.
+# Users are encouraged to mangle they information into the string
+# to prevent collisions and declare ownership.
+# eg.
+# ENGINE_CONNECTION_3213
#
-# Returns:
-# @results: A dictionary of status codes indexed by the same @UUID values in
-# @conRefArgs.
+# This way managers can tell which connections are owned by whome.
+# @conRefArgs: Connection parameters.
#
# Since: 4.10.0
# XXX: Extension: map data type ['key type', 'val type']
##
-{'command': {'class': 'ConnectionRefs', 'name': 'acquire'},
- 'data': {'conRefArgs': 'ConnectionRefArgsMap'},
- 'returns': {'results': 'ConnectionRefArgsStatusMap'}}
+{'command': {'class': 'ConnectionRef', 'name': 'acquire'},
+ 'data': {'refID', 'str', 'conRefArgs': 'ConnectionRefArgs'}}
##
-# @ConnectionRefs.release:
+# @ConnectionRef.release:
#
# Release one or more storage connection references.
#
-# @refIDs: A list of @UUID values
-#
-# Returns:
-# @results: A dictionary of status codes indexed by the same @UUID values that
-# were passed in @0.
+# @refIDs: A list of string values.
#
# Since: 4.10.0
# XXX: Extension: list data type
##
-{'command': {'class': 'ConnectionRefs', 'name': 'release'},
- 'data': {'refIDs': ['UUID']},
- 'returns': {'results': 'ConnectionRefArgsStatusMap'}}
+{'command': {'class': 'ConnectionRef', 'name': 'release'},
+ 'data': {'refID': 'str'}}
##
# @ConnectionRefMap:
@@ -2507,10 +2484,10 @@
# Since: 4.10.0
##
{'map': 'ConnectionRefMap',
- 'key': 'UUID', 'value': 'ConnectionRef'}
+ 'key': 'str', 'value': 'ConnectionRef'}
##
-# @ConnectionRefs.statuses:
+# @ConnectionRef.statuses:
#
# Get information about all registered storage connection references.
#
@@ -2519,7 +2496,7 @@
#
# Since: 4.10.0
##
-{'command': {'class': 'ConnectionRefs', 'name': 'statuses'},
+{'command': {'class': 'ConnectionRef', 'name': 'statuses'},
'returns': {'connectionslist': 'ConnectionRefMap'}}
## Category: @ISCSIConnection ##################################################
--
To view, visit http://gerrit.ovirt.org/7148
To unsubscribe, visit http://gerrit.ovirt.org/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I5747f2161d039cfaa82c0797e63ff58dbffbe8ac
Gerrit-PatchSet: 1
Gerrit-Project: vdsm
Gerrit-Branch: master
Gerrit-Owner: Saggi Mizrahi <smizrahi(a)redhat.com>
9 years, 11 months
Change in vdsm[master]: Logging shouldn't reach the terminal console
by Federico Simoncelli
Federico Simoncelli has uploaded a new change for review.
Change subject: Logging shouldn't reach the terminal console
......................................................................
Logging shouldn't reach the terminal console
In this patch:
* Change the log facility to LOG_DAEMON for SysLogHandler
* Remove the handler_console (it's unused now but we don't want anyone
to start using it)
* Few format cleanups
Signed-off-by: Federico Simoncelli <fsimonce(a)redhat.com>
Change-Id: I749a58362db5daec44ed5b0f7f116e14eadd6043
---
M vdsm/logger.conf.in
1 file changed, 6 insertions(+), 17 deletions(-)
git pull ssh://gerrit.ovirt.org:29418/vdsm refs/changes/80/7980/1
diff --git a/vdsm/logger.conf.in b/vdsm/logger.conf.in
index edd4616..f523306 100644
--- a/vdsm/logger.conf.in
+++ b/vdsm/logger.conf.in
@@ -2,7 +2,7 @@
keys=root,vds,Storage,metadata,SuperVdsm
[handlers]
-keys=console,syslog,logfile,metadata
+keys=syslog,logfile,metadata
[formatters]
keys=long,simple,none,sysform
@@ -40,7 +40,7 @@
level=WARNING
class=handlers.SysLogHandler
formatter=sysform
-args=('/dev/log', handlers.SysLogHandler.LOG_USER)
+args=('/dev/log', handlers.SysLogHandler.LOG_DAEMON)
[handler_logfile]
class=logging.handlers.WatchedFileHandler
@@ -55,25 +55,14 @@
level=WARNING
formatter=long
-[handler_console]
-class: StreamHandler
-args: []
-formatter: none
-
[formatter_simple]
-format: %(name)s:%(levelname)s: %(message)s
+format=%(name)s:%(levelname)s: %(message)s
[formatter_none]
-format: %(message)s
+format=%(message)s
[formatter_long]
-format: %(threadName)s::%(levelname)s::%(asctime)s::%(module)s::%(lineno)d::%(name)s::(%(funcName)s) %(message)s
+format=%(threadName)s::%(levelname)s::%(asctime)s::%(module)s::%(lineno)d::%(name)s::(%(funcName)s) %(message)s
[formatter_sysform]
-format= vdsm %(name)s %(levelname)s %(message)s
-datefmt=
-
-
-
-
-
+format=vdsm %(name)s %(levelname)s %(message)s
--
To view, visit http://gerrit.ovirt.org/7980
To unsubscribe, visit http://gerrit.ovirt.org/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I749a58362db5daec44ed5b0f7f116e14eadd6043
Gerrit-PatchSet: 1
Gerrit-Project: vdsm
Gerrit-Branch: master
Gerrit-Owner: Federico Simoncelli <fsimonce(a)redhat.com>
9 years, 11 months
Change in vdsm[master]: Related to BZ#845020 - Diffferentiate bad specification from...
by ewarszaw＠redhat.com
Eduardo has uploaded a new change for review.
Change subject: Related to BZ#845020 - Diffferentiate bad specification from not found.
......................................................................
Related to BZ#845020 - Diffferentiate bad specification from not found.
Already agreed that _devices should be a dict instead a list.
Change-Id: Ic5cffdae26cde88a948211d8577370965ecd2d36
Signed-off-by: Eduardo <ewarszaw(a)redhat.com>
---
M vdsm/libvirtvm.py
1 file changed, 15 insertions(+), 1 deletion(-)
git pull ssh://gerrit.ovirt.org:29418/vdsm refs/changes/66/7366/1
diff --git a/vdsm/libvirtvm.py b/vdsm/libvirtvm.py
index 3b7cfc5..7ad5884 100644
--- a/vdsm/libvirtvm.py
+++ b/vdsm/libvirtvm.py
@@ -1627,6 +1627,11 @@
if ((device.domainID, device.imageID,
device.volumeID) == tgetDrv):
return device
+ else:
+ self.log.warning("drive dom: %s, img: %s, vol: %s is not in"
+ "vm: %s _devices", drive["domainID"],
+ drive["imageID"], drive["volumeID"], self.id)
+ return None
elif drive.has_key("GUID"):
for device in self._devices[vm.DISK_DEVICES][:]:
@@ -1634,6 +1639,10 @@
continue
if device.GUID == drive["GUID"]:
return device
+ else:
+ self.log.warning("GUID: %s not found in vm: %s _devices",
+ drive["GUID"], self.id)
+ return None
elif drive.has_key("UUID"):
for device in self._devices[vm.DISK_DEVICES][:]:
@@ -1641,8 +1650,13 @@
continue
if device.UUID == drive["UUID"]:
return device
+ else:
+ self.log.warning("UUID: %s not found in vm: %s _devices",
+ drive["UUID"], self.id)
+ return None
- return None
+ else:
+ raise ValueError("drive specification unknown %s" % drive)
def snapshot(self, snapDrives):
"""Live snapshot command"""
--
To view, visit http://gerrit.ovirt.org/7366
To unsubscribe, visit http://gerrit.ovirt.org/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ic5cffdae26cde88a948211d8577370965ecd2d36
Gerrit-PatchSet: 1
Gerrit-Project: vdsm
Gerrit-Branch: master
Gerrit-Owner: Eduardo <ewarszaw(a)redhat.com>
9 years, 11 months
Change in vdsm[master]: remove symlink when connect local storage failed
by lvroyce＠linux.vnet.ibm.com
Royce Lv has uploaded a new change for review.
Change subject: remove symlink when connect local storage failed
......................................................................
remove symlink when connect local storage failed
if connectStorageServer failed for some reason,
symlink remains in /rhev/data-center/mnt,
which makes second failure call connectStorageServer
falsely success, so remove the symlink
Change-Id: I0e44605fb6c6e2512a6aa1acefb3d1d7e09a67aa
Signed-off-by: Royce Lv<lvroyce(a)linux.vnet.ibm.com>
---
M vdsm/storage/storageServer.py
1 file changed, 7 insertions(+), 4 deletions(-)
git pull ssh://gerrit.ovirt.org:29418/vdsm refs/changes/40/6140/1
--
To view, visit http://gerrit.ovirt.org/6140
To unsubscribe, visit http://gerrit.ovirt.org/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I0e44605fb6c6e2512a6aa1acefb3d1d7e09a67aa
Gerrit-PatchSet: 1
Gerrit-Project: vdsm
Gerrit-Branch: master
Gerrit-Owner: Royce Lv <lvroyce(a)linux.vnet.ibm.com>
9 years, 11 months
Change in vdsm[master]: Make IRS methods bypass API.py
by smizrahi＠redhat.com
Saggi Mizrahi has uploaded a new change for review.
Change subject: Make IRS methods bypass API.py
......................................................................
Make IRS methods bypass API.py
Change-Id: Iaf7dc90462e47b9f067959df7325b57cbaa82241
Signed-off-by: Saggi Mizrahi <smizrahi(a)redhat.com>
---
M vdsm/BindingXMLRPC.py
1 file changed, 80 insertions(+), 432 deletions(-)
git pull ssh://gerrit.ovirt.org:29418/vdsm refs/changes/27/7227/1
diff --git a/vdsm/BindingXMLRPC.py b/vdsm/BindingXMLRPC.py
index 0d74af6..2e0dce2 100644
--- a/vdsm/BindingXMLRPC.py
+++ b/vdsm/BindingXMLRPC.py
@@ -33,6 +33,7 @@
import API
from vdsm.exception import VdsmException
import fenceAgent
+from functools import partial
try:
from gluster.api import getGlusterMethods
@@ -388,358 +389,6 @@
api = API.Global()
return api.setMOMPolicy(policy)
- def domainActivate(self, sdUUID, spUUID, options=None):
- domain = API.StorageDomain(sdUUID, spUUID)
- return domain.activate()
-
- def domainAttach(self, sdUUID, spUUID, options=None):
- domain = API.StorageDomain(sdUUID, spUUID)
- return domain.attach(spUUID)
-
- def domainCreate(self, storageType, sdUUID, domainName,
- typeSpecificArg, domClass,
- domVersion=None, options=None):
- domain = API.StorageDomain(sdUUID, spUUID=None)
- return domain.create(storageType, typeSpecificArg, domainName,
- domClass, domVersion)
-
- def domainDeactivate(self, sdUUID, spUUID, msdUUID, masterVersion,
- options=None):
- domain = API.StorageDomain(sdUUID, spUUID)
- return domain.deactivate(msdUUID, masterVersion)
-
- def domainDetach(self, sdUUID, spUUID, msdUUID, masterVersion,
- options=None):
- domain = API.StorageDomain(sdUUID, spUUID)
- return domain.detach(msdUUID, masterVersion, force=False)
-
- def domainDetachForced(self, sdUUID, spUUID, options=None):
- domain = API.StorageDomain(sdUUID, spUUID)
- return domain.detach(None, None, force=True)
-
- def domainExtend(self, sdUUID, spUUID, devlist, options=None):
- domain = API.StorageDomain(sdUUID, spUUID)
- return domain.extend(devlist)
-
- def domainFormat(self, sdUUID,
- autoDetach=False, options=None):
- domain = API.StorageDomain(sdUUID, spUUID=None)
- return domain.format(autoDetach)
-
- def domainGetFileList(self, sdUUID, pattern='*', options=None):
- domain = API.StorageDomain(sdUUID, spUUID=None)
- return domain.getFileList(pattern)
-
- def domainGetImages(self, sdUUID, options=None):
- domain = API.StorageDomain(sdUUID, spUUID=None)
- return domain.getImages()
-
- def domainGetInfo(self, sdUUID, options=None):
- domain = API.StorageDomain(sdUUID, spUUID=None)
- return domain.getInfo()
-
- def domainGetStats(self, sdUUID, options=None):
- domain = API.StorageDomain(sdUUID, spUUID=None)
- return domain.getStats()
-
- def domainGetVolumes(self, sdUUID, spUUID,
- imgUUID=API.Image.BLANK_UUID):
- domain = API.StorageDomain(sdUUID, spUUID)
- return domain.getVolumes(imgUUID)
-
- def domainSetDescription(self, sdUUID, description, options=None):
- domain = API.StorageDomain(sdUUID, spUUID=None)
- return domain.setDescription(description)
-
- def domainUploadVolume(self, sdUUID, spUUID, imgUUID, volUUID,
- srcPath, size, method="rsync", options=None):
- domain = API.StorageDomain(sdUUID, spUUID)
- return domain.uploadVolume(imgUUID, volUUID, srcPath, size, method)
-
- def domainValidate(self, sdUUID, options=None):
- domain = API.StorageDomain(sdUUID, spUUID=None)
- return domain.validate()
-
- def imageDelete(self, sdUUID, spUUID,
- imgUUID, postZero=False, force=False):
- image = API.Image(imgUUID, spUUID, sdUUID)
- return image.delete(postZero, force)
-
- def imageDeleteVolumes(self, sdUUID, spUUID, imgUUID, volumes,
- postZero=False, force=False):
- image = API.Image(imgUUID, spUUID, sdUUID)
- return image.deleteVolumes(volumes, postZero, force)
-
- def imageMergeSnapshots(self, sdUUID, spUUID, vmUUID, imgUUID,
- ancestor, successor, postZero=False):
- image = API.Image(imgUUID, spUUID, sdUUID)
- return image.mergeSnapshots(ancestor, successor, postZero)
-
- def imageMove(self, spUUID, srcDomUUID, dstDomUUID, imgUUID, vmUUID,
- op, postZero=False, force=False):
- image = API.Image(imgUUID, spUUID, srcDomUUID)
- return image.move(dstDomUUID, op, postZero, force)
-
- def poolConnect(self, spUUID, hostID, scsiKey, msdUUID, masterVersion,
- options=None):
- pool = API.StoragePool(spUUID)
- return pool.connect(hostID, scsiKey, msdUUID, masterVersion)
-
- def poolConnectStorageServer(self, domType, spUUID, conList, options=None):
- pool = API.StoragePool(spUUID)
- return pool.connectStorageServer(domType, conList)
-
- def poolCreate(self, poolType, spUUID, poolName, masterDom, domList,
- masterVersion, lockPolicy=None, lockRenewalIntervalSec=None,
- leaseTimeSec=None, ioOpTimeoutSec=None,
- leaseRetries=None, options=None):
- pool = API.StoragePool(spUUID)
- return pool.create(poolName, masterDom, masterVersion, domList,
- lockRenewalIntervalSec, leaseTimeSec, ioOpTimeoutSec,
- leaseRetries)
-
- def poolDestroy(self, spUUID, hostID, scsiKey, options=None):
- pool = API.StoragePool(spUUID)
- return pool.destroy(hostID, scsiKey)
-
- def poolDisconnect(self, spUUID, hostID, scsiKey, remove=False,
- options=None):
- pool = API.StoragePool(spUUID)
- return pool.disconnect(hostID, scsiKey, remove)
-
- def poolDisconnectStorageServer(self, domType, spUUID, conList,
- options=None):
- pool = API.StoragePool(spUUID)
- return pool.disconnectStorageServer(domType, conList)
-
- def poolFenceSPMStorage(self, spUUID, lastOwner, lastLver, options=None):
- pool = API.StoragePool(spUUID)
- return pool.fence()
-
- def poolGetBackedUpVmsInfo(self, spUUID, sdUUID,
- vmList=None, options=None):
- pool = API.StoragePool(spUUID)
- return pool.getBackedUpVmsInfo(sdUUID, vmList)
-
- def poolGetBackedUpVmsList(self, spUUID, sdUUID=None, options=None):
- pool = API.StoragePool(spUUID)
- return pool.getBackedUpVmsList(sdUUID)
-
- def poolGetFloppyList(self, spUUID, options=None):
- pool = API.StoragePool(spUUID)
- return pool.getFloppyList()
-
- def poolGetDomainsContainingImage(self, spUUID, imgUUID, datadomains=True,
- options=None):
- pool = API.StoragePool(spUUID)
- return pool.getDomainsContainingImage(imgUUID, datadomains)
-
- def poolGetIsoList(self, spUUID, extension='iso', options=None):
- pool = API.StoragePool(spUUID)
- return pool.getIsoList(extension)
-
- def poolGetSpmStatus(self, spUUID, options=None):
- pool = API.StoragePool(spUUID)
- return pool.getSpmStatus()
-
- def poolGetInfo(self, spUUID, options=None):
- pool = API.StoragePool(spUUID)
- return pool.getInfo()
-
- def poolMoveMultipleImages(self, spUUID, srcDomUUID, dstDomUUID, imgDict,
- vmUUID, force=False):
- pool = API.StoragePool(spUUID)
- return pool.moveMultipleImages(srcDomUUID, dstDomUUID, imgDict, force)
-
- def poolReconstructMaster(self, spUUID, poolName, masterDom, domDict,
- masterVersion, lockPolicy=None,
- lockRenewalIntervalSec=None, leaseTimeSec=None,
- ioOpTimeoutSec=None, leaseRetries=None,
- hostId=None, options=None):
- pool = API.StoragePool(spUUID)
- return pool.reconstructMaster(hostId, poolName, masterDom,
- masterVersion, domDict, lockRenewalIntervalSec, leaseTimeSec,
- ioOpTimeoutSec, leaseRetries)
-
- def poolRefresh(self, spUUID, msdUUID, masterVersion, options=None):
- pool = API.StoragePool(spUUID)
- return pool.refresh(msdUUID, masterVersion)
-
- def poolSetDescription(self, spUUID, description, options=None):
- pool = API.StoragePool(spUUID)
- return pool.setDescription(description)
-
- def poolSpmStart(self, spUUID, prevID, prevLVER, recoveryMode,
- scsiFencing, maxHostID=None,
- domVersion=None, options=None):
- pool = API.StoragePool(spUUID)
- return pool.spmStart(prevID, prevLVER, scsiFencing,
- maxHostID, domVersion)
-
- def poolSpmStop(self, spUUID, options=None):
- pool = API.StoragePool(spUUID)
- return pool.spmStop()
-
- def poolUpgrade(self, spUUID, targetDomVersion):
- pool = API.StoragePool(spUUID)
- return pool.upgrade(targetDomVersion)
-
- def poolValidateStorageServerConnection(self, domType, spUUID, conList,
- options=None):
- pool = API.StoragePool(spUUID)
- return pool.validateStorageServerConnection(domType, conList)
-
- def poolUpdateVMs(self, spUUID, vmList, sdUUID=None, options=None):
- pool = API.StoragePool(spUUID)
- return pool.updateVMs(vmList, sdUUID)
-
- def poolRemoveVm(self, spUUID, vmUUID, sdUUID=None, options=None):
- pool = API.StoragePool(spUUID)
- return pool.removeVM(vmUUID, sdUUID)
-
- def volumeCopy(self, sdUUID, spUUID, vmUUID, srcImgUUID, srcVolUUID,
- dstImgUUID, dstVolUUID, description='',
- dstSdUUID=API.StorageDomain.BLANK_UUID,
- volType=API.Volume.Roles.SHARED,
- volFormat=API.Volume.Formats.UNKNOWN,
- preallocate=API.Volume.Types.UNKNOWN, postZero=False,
- force=False):
- volume = API.Volume(srcVolUUID, spUUID, sdUUID, srcImgUUID)
- return volume.copy(dstSdUUID, dstImgUUID, dstVolUUID,
- description, volType, volFormat, preallocate, postZero,
- force)
-
- def volumeCreate(self, sdUUID, spUUID, imgUUID, size, volFormat,
- preallocate, diskType, volUUID, desc,
- srcImgUUID=API.Image.BLANK_UUID,
- srcVolUUID=API.Volume.BLANK_UUID):
- volume = API.Volume(volUUID, spUUID, sdUUID, imgUUID)
- return volume.create(size, volFormat, preallocate, diskType,
- desc, srcImgUUID, srcVolUUID)
-
- def volumeExtend(self, sdUUID, spUUID, imgUUID, volUUID, size,
- isShuttingDown=None):
- volume = API.Volume(volUUID, spUUID, sdUUID, imgUUID)
- return volume.extend(size, isShuttingDown)
-
- def volumeGetInfo(self, sdUUID, spUUID, imgUUID, volUUID):
- volume = API.Volume(volUUID, spUUID, sdUUID, imgUUID)
- return volume.getInfo()
-
- def volumeGetPath(self, sdUUID, spUUID, imgUUID, volUUID):
- volume = API.Volume(volUUID, spUUID, sdUUID, imgUUID)
- return volume.getPath()
-
- def volumeGetSize(self, sdUUID, spUUID, imgUUID, volUUID):
- volume = API.Volume(volUUID, spUUID, sdUUID, imgUUID)
- return volume.getSize()
-
- def volumePrepare(self, sdUUID, spUUID, imgUUID, volUUID, rw=True):
- volume = API.Volume(volUUID, spUUID, sdUUID, imgUUID)
- return volume.prepare(rw)
-
- def volumeRefresh(self, sdUUID, spUUID, imgUUID, volUUID):
- volume = API.Volume(volUUID, spUUID, sdUUID, imgUUID)
- return volume.refresh()
-
- def volumeSetDescription(self, sdUUID, spUUID, imgUUID, volUUID,
- description):
- volume = API.Volume(volUUID, spUUID, sdUUID, imgUUID)
- return volume.setDescription(description)
-
- def volumeSetLegality(self, sdUUID, spUUID, imgUUID, volUUID, legality):
- volume = API.Volume(volUUID, spUUID, sdUUID, imgUUID)
- return volume.setLegality(legality)
-
- def volumeTearDown(self, sdUUID, spUUID, imgUUID, volUUID):
- volume = API.Volume(volUUID, spUUID, sdUUID, imgUUID)
- return volume.tearDown()
-
- def taskClear(self, taskId):
- task = API.Task(taskId)
- return task.clear()
-
- def taskGetInfo(self, taskId):
- task = API.Task(taskId)
- return task.getInfo()
-
- def taskGetStatus(self, taskId):
- task = API.Task(taskId)
- return task.getStatus()
-
- def taskRevert(self, taskId):
- task = API.Task(taskId)
- return task.revert()
-
- def taskStop(self, taskId):
- task = API.Task(taskId)
- return task.stop()
-
- # Global storage methods
- def tasksGetAllInfo(self):
- api = API.Global()
- return api.getAllTasksInfo()
-
- def tasksGetAllStatuses(self):
- api = API.Global()
- return api.getAllTasksStatuses()
-
- def iscsiDiscoverSendTargets(self, con, options=None):
- iscsiConn = API.ISCSIConnection(con['connection'],
- con['port'], con['user'], con['password'])
- return iscsiConn.discoverSendTargets()
-
- def vgCreate(self, name, devlist, force=False):
- vg = API.LVMVolumeGroup(self.cif)
- return vg.create(name, devlist, force)
-
- def vgGetInfo(self, vgUUID, options=None):
- vg = API.LVMVolumeGroup(vgUUID)
- return vg.getInfo()
-
- def vgRemove(self, vgUUID, options=None):
- vg = API.LVMVolumeGroup(vgUUID)
- return vg.remove()
-
- def domainsGetList(self, spUUID=None, domainClass=None, storageType=None,
- remotePath=None, options=None):
- api = API.Global()
- return api.getStorageDomains(spUUID, domainClass, storageType,
- remotePath)
-
- def poolsGetConnectedList(self, options=None):
- api = API.Global()
- return api.getConnectedStoragePools()
-
- def storageRepoGetStats(self, options=None):
- api = API.Global()
- return api.getStorageRepoStats()
-
- def vgsGetList(self, storageType=None, options=None):
- api = API.Global()
- return api.getLVMVolumeGroups(storageType)
-
- def devicesGetList(self, storageType=None, options=None):
- api = API.Global()
- return api.getDeviceList(storageType)
-
- def devicesGetVisibility(self, guids, options=None):
- api = API.Global()
- return api.getDevicesVisibility(guids)
-
- def deviceGetInfo(self, guid, options=None):
- api = API.Global()
- return api.getDeviceInfo(guid)
-
- def storageServerConnectionRefsAcquire(self, conRefArgs):
- return API.ConnectionRefs().acquire(conRefArgs)
-
- def storageServerConnectionRefsRelease(self, refIDs):
- return API.ConnectionRefs().release(refIDs)
-
- def storageServerConnectionRefsStatuses(self):
- return API.ConnectionRefs().statuses()
-
def getGlobalMethods(self):
return ((self.vmDestroy, 'destroy'),
(self.vmCreate, 'create'),
@@ -785,86 +434,85 @@
(self.vmHotunplugNic, 'hotunplugNic'))
def getIrsMethods(self):
- return ((self.domainActivate, 'activateStorageDomain'),
- (self.domainAttach, 'attachStorageDomain'),
- (self.domainCreate, 'createStorageDomain'),
- (self.domainDeactivate, 'deactivateStorageDomain'),
- (self.domainDetach, 'detachStorageDomain'),
- (self.domainDetachForced, 'forcedDetachStorageDomain'),
- (self.domainExtend, 'extendStorageDomain'),
- (self.domainFormat, 'formatStorageDomain'),
- (self.domainGetFileList, 'getFileList'),
- (self.domainGetImages, 'getImagesList'),
- (self.domainGetInfo, 'getStorageDomainInfo'),
- (self.domainGetStats, 'getStorageDomainStats'),
- (self.domainGetVolumes, 'getVolumesList'),
- (self.domainSetDescription, 'setStorageDomainDescription'),
- (self.domainUploadVolume, 'uploadVolume'),
- (self.domainValidate, 'validateStorageDomain'),
- (self.imageDelete, 'deleteImage'),
- (self.imageDeleteVolumes, 'deleteVolume'),
- (self.imageMergeSnapshots, 'mergeSnapshots'),
- (self.imageMove, 'moveImage'),
- (self.poolConnect, 'connectStoragePool'),
- (self.poolConnectStorageServer, 'connectStorageServer'),
- (self.poolCreate, 'createStoragePool'),
- (self.poolDestroy, 'destroyStoragePool'),
- (self.poolDisconnect, 'disconnectStoragePool'),
- (self.poolDisconnectStorageServer, 'disconnectStorageServer'),
- (self.poolFenceSPMStorage, 'fenceSpmStorage'),
- (self.poolGetBackedUpVmsInfo, 'getVmsInfo'),
- (self.poolGetBackedUpVmsList, 'getVmsList'),
- (self.poolGetFloppyList, 'getFloppyList'),
- (self.poolGetDomainsContainingImage, 'getImageDomainsList'),
- (self.poolGetIsoList, 'getIsoList'),
- (self.poolGetSpmStatus, 'getSpmStatus'),
- (self.poolGetInfo, 'getStoragePoolInfo'),
- (self.poolMoveMultipleImages, 'moveMultipleImages'),
- (self.poolReconstructMaster, 'reconstructMaster'),
- (self.poolRefresh, 'refreshStoragePool'),
- (self.poolSetDescription, 'setStoragePoolDescription'),
- (self.poolSpmStart, 'spmStart'),
- (self.poolSpmStop, 'spmStop'),
- (self.poolUpgrade, 'upgradeStoragePool'),
- (self.poolValidateStorageServerConnection,
- 'validateStorageServerConnection'),
- (self.poolUpdateVMs, 'updateVM'),
- (self.poolRemoveVm, 'removeVM'),
- (self.taskClear, 'clearTask'),
- (self.taskGetInfo, 'getTaskInfo'),
- (self.taskGetStatus, 'getTaskStatus'),
- (self.taskRevert, 'revertTask'),
- (self.taskStop, 'stopTask'),
- (self.volumeCopy, 'copyImage'),
- (self.volumeCreate, 'createVolume'),
- (self.volumeExtend, 'extendVolume'),
- (self.volumeGetInfo, 'getVolumeInfo'),
- (self.volumeGetPath, 'getVolumePath'),
- (self.volumeGetSize, 'getVolumeSize'),
- (self.volumePrepare, 'prepareVolume'),
- (self.volumeRefresh, 'refreshVolume'),
- (self.volumeSetDescription, 'setVolumeDescription'),
- (self.volumeSetLegality, 'setVolumeLegality'),
- (self.volumeTearDown, 'teardownVolume'),
- (self.tasksGetAllInfo, 'getAllTasksInfo'),
- (self.tasksGetAllStatuses, 'getAllTasksStatuses'),
- (self.iscsiDiscoverSendTargets, 'discoverSendTargets'),
- (self.vgCreate, 'createVG'),
- (self.vgGetInfo, 'getVGInfo'),
- (self.vgRemove, 'removeVG'),
- (self.domainsGetList, 'getStorageDomainsList'),
- (self.poolsGetConnectedList, 'getConnectedStoragePoolsList'),
- (self.storageRepoGetStats, 'repoStats'),
- (self.vgsGetList, 'getVGList'),
- (self.devicesGetList, 'getDeviceList'),
- (self.devicesGetVisibility, 'getDevicesVisibility'),
- (self.deviceGetInfo, 'getDeviceInfo'),
- (self.storageServerConnectionRefsAcquire,
- 'storageServer_ConnectionRefs_acquire'),
- (self.storageServerConnectionRefsRelease,
- 'storageServer_ConnectionRefs_release'),
- (self.storageServerConnectionRefsStatuses,
- 'storageServer_ConnectionRefs_statuses'),)
+ passThroughMethods = (
+ 'activateStorageDomain',
+ 'attachStorageDomain',
+ 'createStorageDomain',
+ 'deactivateStorageDomain',
+ 'detachStorageDomain',
+ 'forcedDetachStorageDomain',
+ 'extendStorageDomain',
+ 'formatStorageDomain',
+ 'getFileList',
+ 'getImagesList',
+ 'getStorageDomainInfo',
+ 'getStorageDomainStats',
+ 'getVolumesList',
+ 'setStorageDomainDescription',
+ 'uploadVolume',
+ 'validateStorageDomain',
+ 'deleteImage',
+ 'deleteVolume',
+ 'mergeSnapshots',
+ 'moveImage',
+ 'connectStoragePool',
+ 'connectStorageServer',
+ 'createStoragePool',
+ 'destroyStoragePool',
+ 'disconnectStoragePool',
+ 'disconnectStorageServer',
+ 'fenceSpmStorage',
+ 'getVmsInfo',
+ 'getVmsList',
+ 'getFloppyList',
+ 'getImageDomainsList',
+ 'getIsoList',
+ 'getSpmStatus',
+ 'getStoragePoolInfo',
+ 'moveMultipleImages',
+ 'reconstructMaster',
+ 'refreshStoragePool',
+ 'setStoragePoolDescription',
+ 'spmStart',
+ 'spmStop',
+ 'upgradeStoragePool',
+ 'validateStorageServerConnection',
+ 'updateVM',
+ 'removeVM',
+ 'clearTask',
+ 'getTaskInfo',
+ 'getTaskStatus',
+ 'revertTask',
+ 'stopTask',
+ 'copyImage',
+ 'createVolume',
+ 'extendVolume',
+ 'getVolumeInfo',
+ 'getVolumePath',
+ 'getVolumeSize',
+ 'prepareVolume',
+ 'refreshVolume',
+ 'setVolumeDescription',
+ 'setVolumeLegality',
+ 'teardownVolume',
+ 'getAllTasksInfo',
+ 'getAllTasksStatuses',
+ 'discoverSendTargets',
+ 'createVG',
+ 'getVGInfo',
+ 'removeVG',
+ 'getStorageDomainsList',
+ 'getConnectedStoragePoolsList',
+ 'repoStats',
+ 'getVGList',
+ 'getDeviceList',
+ 'getDevicesVisibility',
+ 'getDeviceInfo',
+ 'storageServer_ConnectionRefs_acquire',
+ 'storageServer_ConnectionRefs_release',
+ 'storageServer_ConnectionRefs_statuses',)
+ return zip(map(partial(getattr, self.cif.irs), passThroughMethods),
+ passThroughMethods)
def wrapApiMethod(f):
--
To view, visit http://gerrit.ovirt.org/7227
To unsubscribe, visit http://gerrit.ovirt.org/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Iaf7dc90462e47b9f067959df7325b57cbaa82241
Gerrit-PatchSet: 1
Gerrit-Project: vdsm
Gerrit-Branch: master
Gerrit-Owner: Saggi Mizrahi <smizrahi(a)redhat.com>
9 years, 11 months
Change in vdsm[master]: [WIP] Add the base commands to vdsm-tool
by Federico Simoncelli
Federico Simoncelli has uploaded a new change for review.
Change subject: [WIP] Add the base commands to vdsm-tool
......................................................................
[WIP] Add the base commands to vdsm-tool
Change-Id: Id3f49dc3cbb4dfba86a85ab9348d19684445f40e
---
M vdsm-tool/Makefile.am
A vdsm-tool/base.py
M vdsm.spec.in
3 files changed, 52 insertions(+), 1 deletion(-)
git pull ssh://gerrit.ovirt.org:29418/vdsm refs/changes/88/388/1
--
To view, visit http://gerrit.ovirt.org/388
To unsubscribe, visit http://gerrit.ovirt.org/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Id3f49dc3cbb4dfba86a85ab9348d19684445f40e
Gerrit-PatchSet: 1
Gerrit-Project: vdsm
Gerrit-Branch: master
Gerrit-Owner: Federico Simoncelli <fsimonce(a)redhat.com>
9 years, 11 months
Change in vdsm[master]: [WIP] Add the daemon commands to vdsm-tool
by Federico Simoncelli
Federico Simoncelli has uploaded a new change for review.
Change subject: [WIP] Add the daemon commands to vdsm-tool
......................................................................
[WIP] Add the daemon commands to vdsm-tool
Change-Id: Ieafb9886f3ffb2433478203186dd94005b2a51e8
---
M vdsm-tool/Makefile.am
A vdsm-tool/daemon.py
M vdsm.spec.in
3 files changed, 52 insertions(+), 1 deletion(-)
git pull ssh://gerrit.ovirt.org:29418/vdsm refs/changes/89/389/1
--
To view, visit http://gerrit.ovirt.org/389
To unsubscribe, visit http://gerrit.ovirt.org/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ieafb9886f3ffb2433478203186dd94005b2a51e8
Gerrit-PatchSet: 1
Gerrit-Project: vdsm
Gerrit-Branch: master
Gerrit-Owner: Federico Simoncelli <fsimonce(a)redhat.com>
9 years, 11 months
Change in vdsm[master]: [WIP] Enable deleteVolume for the merged internal volumes
by Federico Simoncelli
Federico Simoncelli has uploaded a new change for review.
Change subject: [WIP] Enable deleteVolume for the merged internal volumes
......................................................................
[WIP] Enable deleteVolume for the merged internal volumes
Change-Id: I99044c9de79ee3c74ed1c010f6e573bcd3695da2
---
M vdsm/storage/volume.py
1 file changed, 20 insertions(+), 6 deletions(-)
git pull ssh://gerrit.ovirt.org:29418/vdsm refs/changes/72/2672/1
--
To view, visit http://gerrit.ovirt.org/2672
To unsubscribe, visit http://gerrit.ovirt.org/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I99044c9de79ee3c74ed1c010f6e573bcd3695da2
Gerrit-PatchSet: 1
Gerrit-Project: vdsm
Gerrit-Branch: master
Gerrit-Owner: Federico Simoncelli <fsimonce(a)redhat.com>
9 years, 11 months