Change in vdsm[master]: vdsm: Utilize CallbackChain in vm.shutdown
by mbetak＠redhat.com
Martin Betak has uploaded a new change for review.
Change subject: vdsm: Utilize CallbackChain in vm.shutdown
......................................................................
vdsm: Utilize CallbackChain in vm.shutdown
Refactor the existing shutdown/reboot code to utilize the
utils.CallbackChain helper.
Change-Id: I8cc4f4140913df9827cca296e880b37f47a21b76
Signed-off-by: Martin Betak <mbetak(a)redhat.com>
---
M vdsm/vm.py
1 file changed, 81 insertions(+), 49 deletions(-)
git pull ssh://gerrit.ovirt.org:29418/vdsm refs/changes/57/23457/1
diff --git a/vdsm/vm.py b/vdsm/vm.py
index 7c2d496..e03fec7 100644
--- a/vdsm/vm.py
+++ b/vdsm/vm.py
@@ -1842,6 +1842,79 @@
pass
+class VmPowerDown(object):
+ def __init__(self, vm, delay, message, reboot, timeout):
+ self.vm = vm
+ self.chain = utils.CallbackChain()
+ self.delay = max(0, int(delay))
+ self.timeout = max(0, int(timeout))
+
+ if reboot:
+ self.desc = {'guestEvent': 'RebootInProgress',
+ 'returnMsg': 'Machine rebooting'}
+ callbacks = {'guestAgent': self.guestAgentReboot,
+ 'acpi': self.acpiReboot}
+ else:
+ self.desc = {'guestEvent': 'Powering down',
+ 'returnMsg': 'Machine shutting down'}
+ callbacks = {'guestAgent': self.guestAgentShutdown,
+ 'acpi': self.acpiShutdown}
+
+ # first try agent
+ if vm.guestAgent and vm.guestAgent.isResponsive():
+ self.chain.addCallback(callbacks['guestAgent'], delay, message)
+
+ # then acpi if enabled
+ if utils.tobool(vm.conf.get('acpiEnable', 'true')):
+ self.chain.addCallback(callbacks['acpi'])
+
+ def start(self):
+ # are there any available methods for shutdown/reboot?
+ if self.chain.callbacks:
+ # flag for successful power-down event detection
+ # this flag is common for both shutdown and reboot workflows
+ # because we want to exit the CallbackChain in case either
+ # of them happens
+ self.vm._powerDownEvent.clear()
+
+ self.vm._guestEventTime = time.time()
+ self.vm._guestEvent = self.desc['guestEvent']
+
+ self.chain.start()
+ return {'status': {'code': doneCode['code'],
+ 'message': self.desc['returnMsg']}}
+ else:
+ # No tools, no ACPI
+ return {
+ 'status': {
+ 'code': errCode['exist']['status']['code'],
+ 'message': 'VM without ACPI or active SolidICE tools. '
+ 'Try Forced Shutdown.'}}
+
+ def _waitForPowerDownEvent(self):
+ return self.vm._powerDownEvent.wait(self.timeout)
+
+ # Callbacks for Callback Chain
+
+ def guestAgentShutdown(self, delay, message):
+ self.vm.guestAgent.desktopShutdown(delay, message, False)
+ time.sleep(self.delay) # delay for user to close his application
+ return self._waitForPowerDownEvent()
+
+ def guestAgentReboot(self, delay, message):
+ self.vm.guestAgent.desktopShutdown(delay, message, True)
+ time.sleep(self.delay) # delay for user to close his application
+ return self._waitForPowerDownEvent()
+
+ def acpiShutdown(self):
+ self.vm._dom.shutdownFlags(libvirt.VIR_DOMAIN_SHUTDOWN_ACPI_POWER_BTN)
+ return self._waitForPowerDownEvent()
+
+ def acpiReboot(self):
+ self.vm._dom.reboot(libvirt.VIR_DOMAIN_REBOOT_ACPI_POWER_BTN)
+ return self._waitForPowerDownEvent()
+
+
class Vm(object):
"""
Used for abstracting communication between various parts of the
@@ -1945,6 +2018,8 @@
if (self.arch not in ['ppc64', 'x86_64']):
raise RuntimeError('Unsupported architecture: %s' % self.arch)
+
+ self._powerDownEvent = threading.Event()
def _get_lastStatus(self):
PAUSED_STATES = ('Powering down', 'RebootInProgress', 'Up')
@@ -2316,6 +2391,7 @@
self.setDownStatus(NORMAL, 'User shut down')
else:
self.setDownStatus(ERROR, "Lost connection with qemu process")
+ self._powerDownEvent.set()
def _loadCorrectedTimeout(self, base, doubler=20, load=None):
"""
@@ -2374,6 +2450,7 @@
self._startTime = time.time()
self._guestEventTime = self._startTime
self._guestEvent = 'RebootInProgress'
+ self._powerDownEvent.set()
self.saveState()
self.guestAgent.onReboot()
if self.conf.get('volatileFloppy'):
@@ -2614,55 +2691,10 @@
if not guestCpuLocked:
self._guestCpuLock.release()
- def shutdown(self, timeout, message, reboot):
- try:
- now = time.time()
- if self.lastStatus == 'Down':
- return errCode['noVM']
- if self.guestAgent and self.guestAgent.isResponsive():
- self._guestEventTime = now
- if reboot:
- self._guestEvent = 'RebootInProgress'
- self.log.debug('guestAgent reboot called')
- else:
- self._guestEvent = 'Powering down'
- self.log.debug('guestAgent shutdown called')
- agent_timeout = (int(timeout) +
- config.getint('vars',
- 'sys_shutdown_timeout'))
- timer = threading.Timer(agent_timeout, self._timedShutdown)
- timer.start()
- self.guestAgent.desktopShutdown(timeout, message, reboot)
- elif utils.tobool(self.conf.get('acpiEnable', 'true')) and \
- not reboot:
- self._guestEventTime = now
- self._guestEvent = 'Powering down'
- self._acpiShutdown()
- # No tools, no ACPI
- else:
- return {
- 'status': {
- 'code': errCode['exist']['status']['code'],
- 'message': 'VM without ACPI or active SolidICE tools. '
- 'Try Forced Shutdown.'}}
- except Exception:
- self.log.error("Shutdown failed", exc_info=True)
- return {'status': {'code': errCode['exist']['status']['code'],
- 'message': 'Failed to shutdown VM. Try Forced Shutdown.'}}
- message = 'Machine rebooting' if reboot else 'Machine shut down'
- return {'status': {'code': doneCode['code'], 'message': message}}
-
- def _timedShutdown(self):
- self.log.debug('_timedShutdown Called')
- try:
- if self.lastStatus == 'Down':
- return
- if not utils.tobool(self.conf.get('acpiEnable', 'true')):
- self.destroy()
- else:
- self._acpiShutdown()
- except Exception:
- self.log.error("_timedShutdown failed", exc_info=True)
+ def shutdown(self, delay, message, reboot):
+ timeout = config.get('vars', 'sys_shutdown_timeout')
+ powerDown = VmPowerDown(self, delay, message, reboot, timeout)
+ return powerDown.start()
def _cleanupDrives(self, *drives):
"""
--
To view, visit http://gerrit.ovirt.org/23457
To unsubscribe, visit http://gerrit.ovirt.org/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I8cc4f4140913df9827cca296e880b37f47a21b76
Gerrit-PatchSet: 1
Gerrit-Project: vdsm
Gerrit-Branch: master
Gerrit-Owner: Martin Betak <mbetak(a)redhat.com>
10 years, 3 months
Change in vdsm[master]: setupNetworks: Fix incorrect mtu overriding when adding mult...
by asegurap＠redhat.com
Antoni Segura Puimedon has uploaded a new change for review.
Change subject: setupNetworks: Fix incorrect mtu overriding when adding multiple networks
......................................................................
setupNetworks: Fix incorrect mtu overriding when adding multiple networks
When configuring several networks over a bond, if the iteration over
the networks to be added made networks with lower MTUs to be added
after those with higher ones, the last mtu, regardless of value would
be set.
This was because the _netinfo object is passed from addNetworks to
addNetworks and the objectivize of the succeeding addNetworks would
not see the higher MTUs set by the preceding addNetworks.
Change-Id: Ia375c2e0e4a1896ab99d734e3203a5ef49570f36
Bug-Url: https://bugzilla.redhat.com/show_bug.cgi?id=1072411
Signed-off-by: Antoni S. Puimedon <asegurap(a)redhat.com>
---
M vdsm/configNetwork.py
1 file changed, 1 insertion(+), 0 deletions(-)
git pull ssh://gerrit.ovirt.org:29418/vdsm refs/changes/43/25343/1
diff --git a/vdsm/configNetwork.py b/vdsm/configNetwork.py
index ea875f9..2b6162b 100755
--- a/vdsm/configNetwork.py
+++ b/vdsm/configNetwork.py
@@ -644,6 +644,7 @@
logger.debug("Adding network %r" % network)
addNetwork(network, configurator=configurator,
implicitBonding=True, _netinfo=_netinfo, **d)
+ _netinfo.updateDevices() # Things like a bond mtu can change
if utils.tobool(options.get('connectivityCheck', True)):
logger.debug('Checking connectivity...')
--
To view, visit http://gerrit.ovirt.org/25343
To unsubscribe, visit http://gerrit.ovirt.org/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ia375c2e0e4a1896ab99d734e3203a5ef49570f36
Gerrit-PatchSet: 1
Gerrit-Project: vdsm
Gerrit-Branch: master
Gerrit-Owner: Antoni Segura Puimedon <asegurap(a)redhat.com>
10 years, 3 months
Change in vdsm[master]: test: ssl reactor not tested in jsonrpc tests
by Dan Kenigsberg
Dan Kenigsberg has submitted this change and it was merged.
Change subject: test: ssl reactor not tested in jsonrpc tests
......................................................................
test: ssl reactor not tested in jsonrpc tests
The ssl flag was not passed to constructReactor so plain tcp reactors
were only used.
Change-Id: Ibb6dfa4d6324baa0b7091ad6713854d146ec999d
Signed-off-by: pkliczewski <piotr.kliczewski(a)gmail.com>
Reviewed-on: http://gerrit.ovirt.org/24624
Reviewed-by: Nir Soffer <nsoffer(a)redhat.com>
Reviewed-by: Yaniv Bronhaim <ybronhei(a)redhat.com>
Reviewed-by: Dan Kenigsberg <danken(a)redhat.com>
---
M tests/jsonRpcTests.py
1 file changed, 1 insertion(+), 1 deletion(-)
Approvals:
Piotr Kliczewski: Verified
Nir Soffer: Looks good to me, but someone else must approve
Yaniv Bronhaim: Looks good to me, but someone else must approve
Dan Kenigsberg: Looks good to me, approved
--
To view, visit http://gerrit.ovirt.org/24624
To unsubscribe, visit http://gerrit.ovirt.org/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Ibb6dfa4d6324baa0b7091ad6713854d146ec999d
Gerrit-PatchSet: 4
Gerrit-Project: vdsm
Gerrit-Branch: master
Gerrit-Owner: Piotr Kliczewski <piotr.kliczewski(a)gmail.com>
Gerrit-Reviewer: Dan Kenigsberg <danken(a)redhat.com>
Gerrit-Reviewer: Nir Soffer <nsoffer(a)redhat.com>
Gerrit-Reviewer: Piotr Kliczewski <piotr.kliczewski(a)gmail.com>
Gerrit-Reviewer: Saggi Mizrahi <smizrahi(a)redhat.com>
Gerrit-Reviewer: Yaniv Bronhaim <ybronhei(a)redhat.com>
Gerrit-Reviewer: oVirt Jenkins CI Server
10 years, 3 months
Change in vdsm[master]: test: ssl reactor not tested in jsonrpc tests
by Dan Kenigsberg
Dan Kenigsberg has posted comments on this change.
Change subject: test: ssl reactor not tested in jsonrpc tests
......................................................................
Patch Set 3: Code-Review+2
--
To view, visit http://gerrit.ovirt.org/24624
To unsubscribe, visit http://gerrit.ovirt.org/settings
Gerrit-MessageType: comment
Gerrit-Change-Id: Ibb6dfa4d6324baa0b7091ad6713854d146ec999d
Gerrit-PatchSet: 3
Gerrit-Project: vdsm
Gerrit-Branch: master
Gerrit-Owner: Piotr Kliczewski <piotr.kliczewski(a)gmail.com>
Gerrit-Reviewer: Dan Kenigsberg <danken(a)redhat.com>
Gerrit-Reviewer: Nir Soffer <nsoffer(a)redhat.com>
Gerrit-Reviewer: Piotr Kliczewski <piotr.kliczewski(a)gmail.com>
Gerrit-Reviewer: Saggi Mizrahi <smizrahi(a)redhat.com>
Gerrit-Reviewer: Yaniv Bronhaim <ybronhei(a)redhat.com>
Gerrit-Reviewer: oVirt Jenkins CI Server
Gerrit-HasComments: No
10 years, 3 months
Change in vdsm[master]: jsonrpc: StoragePool connect missing default value
by Dan Kenigsberg
Dan Kenigsberg has submitted this change and it was merged.
Change subject: jsonrpc: StoragePool connect missing default value
......................................................................
jsonrpc: StoragePool connect missing default value
DomainsMap argument is defined in schema as optional but it is missing
default value.
Change-Id: Ibb5923e60314993834cf005af4ad89c21dd0dd76
Signed-off-by: pkliczewski <piotr.kliczewski(a)gmail.com>
Reviewed-on: http://gerrit.ovirt.org/24641
Reviewed-by: Nir Soffer <nsoffer(a)redhat.com>
Reviewed-by: Federico Simoncelli <fsimonce(a)redhat.com>
---
M vdsm/API.py
1 file changed, 1 insertion(+), 1 deletion(-)
Approvals:
Piotr Kliczewski: Verified
Nir Soffer: Looks good to me, but someone else must approve
Federico Simoncelli: Looks good to me, approved
--
To view, visit http://gerrit.ovirt.org/24641
To unsubscribe, visit http://gerrit.ovirt.org/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Ibb5923e60314993834cf005af4ad89c21dd0dd76
Gerrit-PatchSet: 2
Gerrit-Project: vdsm
Gerrit-Branch: master
Gerrit-Owner: Piotr Kliczewski <piotr.kliczewski(a)gmail.com>
Gerrit-Reviewer: Dan Kenigsberg <danken(a)redhat.com>
Gerrit-Reviewer: Federico Simoncelli <fsimonce(a)redhat.com>
Gerrit-Reviewer: Nir Soffer <nsoffer(a)redhat.com>
Gerrit-Reviewer: Piotr Kliczewski <piotr.kliczewski(a)gmail.com>
Gerrit-Reviewer: Saggi Mizrahi <smizrahi(a)redhat.com>
10 years, 3 months
Change in vdsm[master]: vm: Set numatune and guest numa topology
by Jenkins CI RO
oVirt Jenkins CI Server has posted comments on this change.
Change subject: vm: Set numatune and guest numa topology
......................................................................
Patch Set 3:
No Builds Executed
http://jenkins.ovirt.org/job/vdsm_unit_tests_gerrit_el/6756/ : To avoid overloading the infrastructure, a whitelist for running gerrit triggered jobs has been set in place, if you feel like you should be in it, please contact infra at ovirt dot org.
http://jenkins.ovirt.org/job/vdsm_master_pep8_gerrit/7546/ : To avoid overloading the infrastructure, a whitelist for running gerrit triggered jobs has been set in place, if you feel like you should be in it, please contact infra at ovirt dot org.
http://jenkins.ovirt.org/job/vdsm_unit_tests_gerrit/7656/ : To avoid overloading the infrastructure, a whitelist for running gerrit triggered jobs has been set in place, if you feel like you should be in it, please contact infra at ovirt dot org.
--
To view, visit http://gerrit.ovirt.org/25254
To unsubscribe, visit http://gerrit.ovirt.org/settings
Gerrit-MessageType: comment
Gerrit-Change-Id: I88ec56047809b03449a788ead0b97f9ed876712d
Gerrit-PatchSet: 3
Gerrit-Project: vdsm
Gerrit-Branch: master
Gerrit-Owner: Xiaolei Shi <xiao-lei.shi(a)hp.com>
Gerrit-Reviewer: Adam Litke <alitke(a)redhat.com>
Gerrit-Reviewer: Dan Kenigsberg <danken(a)redhat.com>
Gerrit-Reviewer: Francesco Romani <fromani(a)redhat.com>
Gerrit-Reviewer: Gilad Chaplik <gchaplik(a)redhat.com>
Gerrit-Reviewer: Martin Sivák <msivak(a)redhat.com>
Gerrit-Reviewer: Saggi Mizrahi <smizrahi(a)redhat.com>
Gerrit-Reviewer: Vinzenz Feenstra <vfeenstr(a)redhat.com>
Gerrit-Reviewer: Xiaolei Shi <xiao-lei.shi(a)hp.com>
Gerrit-Reviewer: automation(a)ovirt.org
Gerrit-Reviewer: oVirt Jenkins CI Server
Gerrit-HasComments: No
10 years, 3 months
Change in vdsm[master]: vnic QoS: Fix specParams to XML definition conversion
by asegurap＠redhat.com
Antoni Segura Puimedon has uploaded a new change for review.
Change subject: vnic QoS: Fix specParams to XML definition conversion
......................................................................
vnic QoS: Fix specParams to XML definition conversion
VDSM API specifies specParams input and output data to have values
specified as integers. In order to generate valid XML, those values
should have been converted to strings (and the test should have been
passing integers as per VDSM schema).
This patch fixes the conversion code and the tests for it (fix one,
add a new one for the update flow).
Change-Id: I25041b8f853c870388ecd9c9f9176bd384242234
Bug-Url: https://bugzilla.redhat.com/1067064
Signed-off-by: Antoni S. Puimedon <asegurap(a)redhat.com>
---
M tests/vmTests.py
M vdsm/vm.py
2 files changed, 47 insertions(+), 22 deletions(-)
git pull ssh://gerrit.ovirt.org:29418/vdsm refs/changes/88/25788/1
diff --git a/tests/vmTests.py b/tests/vmTests.py
index e9efb55..da30ace 100644
--- a/tests/vmTests.py
+++ b/tests/vmTests.py
@@ -416,15 +416,44 @@
'network': 'ovirtmgmt', 'address': self.PCI_ADDR_DICT,
'device': 'bridge', 'type': 'interface',
'bootOrder': '1', 'filter': 'no-mac-spoofing',
- 'specParams': {'inbound': {'average': '1000', 'peak': '5000',
- 'burst': '1024'},
- 'outbound': {'average': '128', 'burst': '256'}},
+ 'specParams': {'inbound': {'average': 1000, 'peak': 5000,
+ 'burst': 1024},
+ 'outbound': {'average': 128, 'burst': 256}},
'custom': {'queues': '7'}}
self.conf['custom'] = {'vhost': 'ovirtmgmt:true', 'sndbuf': '0'}
iface = vm.NetworkInterfaceDevice(self.conf, self.log, **dev)
self.assertXML(iface.getXML(), interfaceXML)
+ def testInterfaceXMLBandwidthUpdate(self):
+ originalBwidthXML = """
+ <bandwidth>
+ <inbound average="1000" burst="1024" peak="5000"/>
+ <outbound average="128" burst="256"/>
+ </bandwidth>"""
+ NEW_OUT = {'outbound': {'average': 1042, 'burst': 128, 'peak': 500}}
+ updatedBwidthXML = """
+ <bandwidth>
+ <inbound average="1000" burst="1024" peak="5000"/>
+ <outbound average="%(average)s" burst="%(burst)s"
+ peak="%(peak)s"/>
+ </bandwidth>""" % NEW_OUT['outbound']
+
+ dev = {'nicModel': 'virtio', 'macAddr': '52:54:00:59:F5:3F',
+ 'network': 'ovirtmgmt', 'address': self.PCI_ADDR_DICT,
+ 'device': 'bridge', 'type': 'interface',
+ 'bootOrder': '1', 'filter': 'no-mac-spoofing',
+ 'specParams': {'inbound': {'average': 1000, 'peak': 5000,
+ 'burst': 1024},
+ 'outbound': {'average': 128, 'burst': 256}},
+ 'custom': {'queues': '7'}}
+ self.conf['custom'] = {'vhost': 'ovirtmgmt:true', 'sndbuf': '0'}
+ iface = vm.NetworkInterfaceDevice(self.conf, self.log, **dev)
+ originalBandwidth = iface.getXML().getElementsByTagName('bandwidth')[0]
+ self.assertXML(originalBandwidth, originalBwidthXML)
+ self.assertXML(iface.paramsToBandwidthXML(NEW_OUT, originalBandwidth),
+ updatedBwidthXML)
+
def testControllerXML(self):
devConfs = [
{'device': 'ide', 'index': '0', 'address': self.PCI_ADDR_DICT},
diff --git a/vdsm/vm.py b/vdsm/vm.py
index c53f1d4..9cb0e82 100644
--- a/vdsm/vm.py
+++ b/vdsm/vm.py
@@ -1430,27 +1430,23 @@
if hasattr(self, 'specParams'):
if 'inbound' in self.specParams or 'outbound' in self.specParams:
- iface.appendChild(self.getXMLBandwidth(self.specParams))
+ iface.appendChild(self.paramsToBandwidthXML(self.specParams))
return iface
- def getXMLBandwidth(self, specParams, oldBandwidth=None):
+ def paramsToBandwidthXML(self, specParams, oldBandwidth=None):
+ """Returns a valid libvirt xml dom element object."""
bandwidth = self.createXmlElem('bandwidth', None)
- # Inbound and Outbound traffic can be independently shaped.
- for attr in ('inbound', 'outbound'):
- newSetting = specParams.get(attr)
- # if newSetting is specified, replace current settings
- if newSetting:
- bandwidth.appendChildWithArgs(attr, **newSetting)
- # if newSetting is not specified, keep current settings
- elif newSetting is None:
- if oldBandwidth is not None:
- attrXMLs = oldBandwidth.getElementsByTagName
- attrXML = attrXMLs[0] if len(attrXMLs) else None
- else:
- attrXML = None
- if attrXML is not None:
- bandwidth.appendChild(attrXML)
- # if newSetting is {} do nothing = remove current settings
+ old = {} if oldBandwidth is None else dict(
+ (elem.nodeName, elem) for elem in oldBandwidth.childNodes)
+ for key in ('inbound', 'outbound'):
+ elem = specParams.get(key)
+ if elem is None: # Use the old setting if present
+ if key in old:
+ bandwidth.appendChild(old[key])
+ elif elem:
+ # Convert the values to string for adding them to the XML def
+ attrs = dict((key, str(value)) for key, value in elem.items())
+ bandwidth.appendChildWithArgs(key, **attrs)
return bandwidth
@@ -3409,7 +3405,7 @@
('inbound' in specParams or 'outbound' in specParams)):
oldBandwidths = vnicXML.getElementsByTagName('bandwidth')
oldBandwidth = oldBandwidths[0] if len(oldBandwidths) else None
- newBandwidth = dev.getXMLBandwidth(specParams, oldBandwidth)
+ newBandwidth = dev.paramsToBandwidthXML(specParams, oldBandwidth)
if oldBandwidth is None:
vnicXML.appendChild(newBandwidth)
else:
--
To view, visit http://gerrit.ovirt.org/25788
To unsubscribe, visit http://gerrit.ovirt.org/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I25041b8f853c870388ecd9c9f9176bd384242234
Gerrit-PatchSet: 1
Gerrit-Project: vdsm
Gerrit-Branch: master
Gerrit-Owner: Antoni Segura Puimedon <asegurap(a)redhat.com>
10 years, 3 months
Change in vdsm[ovirt-3.4]: Allow getFileStats for non NFS ISO domains
by tnisan＠redhat.com
Tal Nisan has uploaded a new change for review.
Change subject: Allow getFileStats for non NFS ISO domains
......................................................................
Allow getFileStats for non NFS ISO domains
getFileStats only allowed file stats to be gathered from NFS ISO domains.
We currently support ISO domains on any file storage domain so the check
was corrected.
Change-Id: I7107d20b1b8b341086800bb35def895a70c4b4f0
Signed-off-by: Tal Nisan <tnisan(a)redhat.com>
Bug-Url: https://bugzilla.redhat.com/1075172
---
M vdsm/storage/hsm.py
1 file changed, 1 insertion(+), 1 deletion(-)
git pull ssh://gerrit.ovirt.org:29418/vdsm refs/changes/28/25928/1
diff --git a/vdsm/storage/hsm.py b/vdsm/storage/hsm.py
index 1416a78..03703bc 100644
--- a/vdsm/storage/hsm.py
+++ b/vdsm/storage/hsm.py
@@ -2246,7 +2246,7 @@
vars.task.getSharedLock(STORAGE, sdUUID)
dom = sdCache.produce(sdUUID=sdUUID)
- if not dom.isISO or dom.getStorageType() != sd.NFS_DOMAIN:
+ if not dom.isISO or dom.getStorageType() not in sd.FILE_DOMAIN_TYPES:
raise se.GetFileStatsError(sdUUID)
fileStats = dom.getFileList(pattern=pattern,
--
To view, visit http://gerrit.ovirt.org/25928
To unsubscribe, visit http://gerrit.ovirt.org/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I7107d20b1b8b341086800bb35def895a70c4b4f0
Gerrit-PatchSet: 1
Gerrit-Project: vdsm
Gerrit-Branch: ovirt-3.4
Gerrit-Owner: Tal Nisan <tnisan(a)redhat.com>
10 years, 3 months
Change in vdsm[master]: jsonrpc: StoragePool connect missing default value
by Federico Simoncelli
Federico Simoncelli has posted comments on this change.
Change subject: jsonrpc: StoragePool connect missing default value
......................................................................
Patch Set 1: Code-Review+2
--
To view, visit http://gerrit.ovirt.org/24641
To unsubscribe, visit http://gerrit.ovirt.org/settings
Gerrit-MessageType: comment
Gerrit-Change-Id: Ibb5923e60314993834cf005af4ad89c21dd0dd76
Gerrit-PatchSet: 1
Gerrit-Project: vdsm
Gerrit-Branch: master
Gerrit-Owner: Piotr Kliczewski <piotr.kliczewski(a)gmail.com>
Gerrit-Reviewer: Federico Simoncelli <fsimonce(a)redhat.com>
Gerrit-Reviewer: Nir Soffer <nsoffer(a)redhat.com>
Gerrit-Reviewer: Piotr Kliczewski <piotr.kliczewski(a)gmail.com>
Gerrit-Reviewer: Saggi Mizrahi <smizrahi(a)redhat.com>
Gerrit-HasComments: No
10 years, 3 months
Change in vdsm[master]: network: Introduce the network package
by Nir Soffer
Nir Soffer has posted comments on this change.
Change subject: network: Introduce the network package
......................................................................
Patch Set 2:
(1 comment)
I like the new module names, it could be nice if the test names were also reordered under tests/network/module_test.py, instead of tests/netxxxTests.py
This is too big to review - should remove unrelated changes like reorder of imports.
Partial review.
http://gerrit.ovirt.org/#/c/25908/2/vdsm/network/api.py
File vdsm/network/api.py:
Line 22: import logging
Line 23: import os
Line 24: import sys
Line 25: import time
Line 26: import traceback
This change is good, but not related to this patch.
Line 27:
Line 28: from vdsm.config import config
Line 29: from vdsm import constants
Line 30: from vdsm import netinfo
--
To view, visit http://gerrit.ovirt.org/25908
To unsubscribe, visit http://gerrit.ovirt.org/settings
Gerrit-MessageType: comment
Gerrit-Change-Id: I532c179d4002ed1e8e5445d02297c8d5a6248647
Gerrit-PatchSet: 2
Gerrit-Project: vdsm
Gerrit-Branch: master
Gerrit-Owner: Antoni Segura Puimedon <asegurap(a)redhat.com>
Gerrit-Reviewer: Antoni Segura Puimedon <asegurap(a)redhat.com>
Gerrit-Reviewer: Assaf Muller <amuller(a)redhat.com>
Gerrit-Reviewer: Dan Kenigsberg <danken(a)redhat.com>
Gerrit-Reviewer: Nir Soffer <nsoffer(a)redhat.com>
Gerrit-Reviewer: automation(a)ovirt.org
Gerrit-Reviewer: oVirt Jenkins CI Server
Gerrit-HasComments: Yes
10 years, 3 months
