Change in vdsm[master]: vdsm.spec: Adding with_systemd macro
by Douglas Schilling Landgraf
Douglas Schilling Landgraf has uploaded a new change for review.
Change subject: vdsm.spec: Adding with_systemd macro
......................................................................
vdsm.spec: Adding with_systemd macro
This patch adds the macro with_systemd which can be used
to validate if the system uses Systemd.
Change-Id: Ibcd8567868e16453ed6633f143a6b1fff8e9c454
Signed-off-by: Douglas Schilling Landgraf <dougsland(a)redhat.com>
---
M vdsm.spec.in
1 file changed, 8 insertions(+), 0 deletions(-)
git pull ssh://gerrit.ovirt.org:29418/vdsm refs/changes/86/12086/1
diff --git a/vdsm.spec.in b/vdsm.spec.in
index 5544e9d..447d24e 100644
--- a/vdsm.spec.in
+++ b/vdsm.spec.in
@@ -17,6 +17,11 @@
%global _polkitdir %{_localstatedir}/lib/polkit-1/localauthority/10-vendor.d
%endif
+# Systemd macro
+%if 0%{?fedora} >= 15
+%global with_systemd
+%endif
+
# Default to skipping autoreconf. Distros can change just this one line
# (or provide a command-line override) if they backport any patches that
# touch configure.ac or Makefile.am.
@@ -63,6 +68,9 @@
%if !0%{?rhel}
BuildRequires: pyflakes
BuildRequires: python-pep8
+%endif
+
+%if 0%{?with_systemd}
BuildRequires: systemd-units
%endif
--
To view, visit http://gerrit.ovirt.org/12086
To unsubscribe, visit http://gerrit.ovirt.org/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ibcd8567868e16453ed6633f143a6b1fff8e9c454
Gerrit-PatchSet: 1
Gerrit-Project: vdsm
Gerrit-Branch: master
Gerrit-Owner: Douglas Schilling Landgraf <dougsland(a)redhat.com>
11 years, 2 months
Change in vdsm[master]: hooks: Add disk hot plug/unplug hooks
by vvolansk＠redhat.com
Vered Volansky has uploaded a new change for review.
Change subject: hooks: Add disk hot plug/unplug hooks
......................................................................
hooks: Add disk hot plug/unplug hooks
Change-Id: I10b689964fad3a1118974f7ba7b91e795cbffd1f
Signed-off-by: Vered Volansky <vvolansk(a)redhat.com>
---
M vdsm/hooks.py
M vdsm/libvirtvm.py
2 files changed, 20 insertions(+), 0 deletions(-)
git pull ssh://gerrit.ovirt.org:29418/vdsm refs/changes/79/12479/1
diff --git a/vdsm/hooks.py b/vdsm/hooks.py
index b3c53d3..95516a8 100644
--- a/vdsm/hooks.py
+++ b/vdsm/hooks.py
@@ -201,6 +201,22 @@
raiseError=False)
+def before_disk_hotplug(domxml, vmconf={}):
+ return _runHooksDir(domxml, 'before_disk_hotplug', vmconf=vmconf)
+
+
+def after_disk_hotplug(domxml, vmconf={}):
+ return _runHooksDir(domxml, 'after_disk_hotplug', vmconf=vmconf)
+
+
+def before_disk_hotunplug(domxml, vmconf={}):
+ return _runHooksDir(domxml, 'before_disk_hotunplug', vmconf=vmconf)
+
+
+def after_disk_hotunplug(domxml, vmconf={}):
+ return _runHooksDir(domxml, 'after_disk_hotunplug', vmconf=vmconf)
+
+
def before_vdsm_start():
return _runHooksDir(None, 'before_vdsm_start', raiseError=False)
diff --git a/vdsm/libvirtvm.py b/vdsm/libvirtvm.py
index e2ada06..d96d3cc 100644
--- a/vdsm/libvirtvm.py
+++ b/vdsm/libvirtvm.py
@@ -1740,7 +1740,9 @@
self.log.debug("Hotplug disk xml: %s" % (driveXml))
try:
+ hooks.before_disk_hotplug(driveXml, self.conf)
self._dom.attachDevice(driveXml)
+ hooks.after_disk_hotplug(driveXml, self.conf)
except libvirt.libvirtError as e:
self.log.error("Hotplug failed", exc_info=True)
self.cif.teardownVolumePath(diskParams)
@@ -1800,7 +1802,9 @@
self.saveState()
try:
+ hooks.before_disk_hotunplug(driveXml, self.conf)
self._dom.detachDevice(driveXml)
+ hooks.after_disk_hotunplug(driveXml, self.conf)
except libvirt.libvirtError as e:
self.log.error("Hotunplug failed", exc_info=True)
if e.get_error_code() == libvirt.VIR_ERR_NO_DOMAIN:
--
To view, visit http://gerrit.ovirt.org/12479
To unsubscribe, visit http://gerrit.ovirt.org/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I10b689964fad3a1118974f7ba7b91e795cbffd1f
Gerrit-PatchSet: 1
Gerrit-Project: vdsm
Gerrit-Branch: master
Gerrit-Owner: Vered Volansky <vvolansk(a)redhat.com>
11 years, 2 months
Change in vdsm[master]: fix a PEP 8 issue in vdsm/configNetwork.py
by zhshzhou＠linux.vnet.ibm.com
Zhou Zheng Sheng has uploaded a new change for review.
Change subject: fix a PEP 8 issue in vdsm/configNetwork.py
......................................................................
fix a PEP 8 issue in vdsm/configNetwork.py
Change-Id: Idc05505b84197fdebc919e4647ef757b295f52a2
Signed-off-by: Zhou Zheng Sheng <zhshzhou(a)linux.vnet.ibm.com>
---
M vdsm/configNetwork.py
1 file changed, 1 insertion(+), 1 deletion(-)
git pull ssh://gerrit.ovirt.org:29418/vdsm refs/changes/44/12744/1
diff --git a/vdsm/configNetwork.py b/vdsm/configNetwork.py
index 33df0c1..a1d3d37 100755
--- a/vdsm/configNetwork.py
+++ b/vdsm/configNetwork.py
@@ -1063,7 +1063,7 @@
ifup(nic)
-def _delBrokenNetwork(network, netAttr, configWriter):
+def _delBrokenNetwork(network, netAttr, configWriter):
'''Adapts the network information of broken networks so that they can be
deleted via delNetwork.'''
_netinfo = netinfo.NetInfo()
--
To view, visit http://gerrit.ovirt.org/12744
To unsubscribe, visit http://gerrit.ovirt.org/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Idc05505b84197fdebc919e4647ef757b295f52a2
Gerrit-PatchSet: 1
Gerrit-Project: vdsm
Gerrit-Branch: master
Gerrit-Owner: Zhou Zheng Sheng <zhshzhou(a)linux.vnet.ibm.com>
11 years, 2 months
Change in vdsm[master]: engine.py: return False on cert error screen
by Douglas Schilling Landgraf
Douglas Schilling Landgraf has uploaded a new change for review.
Change subject: engine.py: return False on cert error screen
......................................................................
engine.py: return False on cert error screen
If we cannot download the engine certificate we should
only show the error screen and return.
Change-Id: I3e3f03365e77244c5521a11d92041371088b4362
Bug-Url: https://bugzilla.redhat.com/show_bug.cgi?id=895912
Signed-off-by: Douglas Schilling Landgraf <dougsland(a)redhat.com>
---
M vdsm_reg/engine.py.in
1 file changed, 1 insertion(+), 0 deletions(-)
git pull ssh://gerrit.ovirt.org:29418/vdsm refs/changes/44/12244/1
diff --git a/vdsm_reg/engine.py.in b/vdsm_reg/engine.py.in
index b506dd5..c4d46ae 100644
--- a/vdsm_reg/engine.py.in
+++ b/vdsm_reg/engine.py.in
@@ -335,6 +335,7 @@
"Failed downloading @ENGINENAME@ certificate",
buttons=['Ok'])
self.ncs.reset_screen_colors()
+ return False
# Stopping vdsm-reg may fail but its ok - its in the case when the
# menus are run after installation
deployUtil._logExec([constants.EXT_SERVICE, 'vdsm-reg', 'stop'])
--
To view, visit http://gerrit.ovirt.org/12244
To unsubscribe, visit http://gerrit.ovirt.org/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I3e3f03365e77244c5521a11d92041371088b4362
Gerrit-PatchSet: 1
Gerrit-Project: vdsm
Gerrit-Branch: master
Gerrit-Owner: Douglas Schilling Landgraf <dougsland(a)redhat.com>
11 years, 2 months
Change in vdsm[master]: engine.py: replace sed to setVdsConf
by Douglas Schilling Landgraf
Douglas Schilling Landgraf has uploaded a new change for review.
Change subject: engine.py: replace sed to setVdsConf
......................................................................
engine.py: replace sed to setVdsConf
Use the standard way to write into vdsm-reg.conf.
Change-Id: I16a0889843feba29abbfb02f3d81293df7f2f3fc
Bug-Url: https://bugzilla.redhat.com/show_bug.cgi?id=890572
Signed-off-by: Douglas Schilling Landgraf <dougsland(a)redhat.com>
---
M vdsm_reg/engine.py.in
1 file changed, 3 insertions(+), 6 deletions(-)
git pull ssh://gerrit.ovirt.org:29418/vdsm refs/changes/99/12299/1
diff --git a/vdsm_reg/engine.py.in b/vdsm_reg/engine.py.in
index b506dd5..dec1a99 100644
--- a/vdsm_reg/engine.py.in
+++ b/vdsm_reg/engine.py.in
@@ -119,14 +119,11 @@
else:
log("Agent configuration files already exist.")
- sed_cmd = "sed -i --copy \"s/\(^vdc_host_name=\)\(..*$\)/vdc_host_name=" +\
- engineHost + "/\" " + VDSM_REG_CONFIG
- if system(sed_cmd):
+ if deployUtil.setVdsConf("vdc_host_name=%s" % engineHost, VDSM_REG_CONFIG):
log("The @ENGINENAME@'s address is set: %s\n" % engineHost)
if enginePort != "":
- sed_cmd = "sed -i --copy \"s/\(^vdc_host_port=\)\(..*$\)/" \
- "vdc_host_port=" + str(enginePort) + "/\" " + VDSM_REG_CONFIG
- if system(sed_cmd):
+ if deployUtil.setVdsConf("vdc_host_port=%s" %
+ str(enginePort), VDSM_REG_CONFIG):
log("The @ENGINENAME@'s port set: %s\n" % enginePort)
fWriteConfig = 1
--
To view, visit http://gerrit.ovirt.org/12299
To unsubscribe, visit http://gerrit.ovirt.org/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I16a0889843feba29abbfb02f3d81293df7f2f3fc
Gerrit-PatchSet: 1
Gerrit-Project: vdsm
Gerrit-Branch: master
Gerrit-Owner: Douglas Schilling Landgraf <dougsland(a)redhat.com>
11 years, 2 months
Change in vdsm[master]: [wip] Implement extendVolume in fileSD/Volume.
by Federico Simoncelli
Federico Simoncelli has posted comments on this change.
Change subject: [wip] Implement extendVolume in fileSD/Volume.
......................................................................
Patch Set 2: (1 inline comment)
> Federico: I think that the work to expose this command is already complete
I didn't look much into it but it seems that you are right. Although there's a small issue that you should take care of in the fileVolume.py module.
....................................................
File vdsm/storage/fileVolume.py
Line 630: misc.ddWatchCopy("/dev/zero", volPath,
Line 631: vars.task.aborting, size-currentSize, currentSize)
Line 632: else:
Line 633: # for sparse files we can just truncate to the correct size
Line 634: with open(volPath, "a") as f:
I have the feeling that we have two different issues here. One is that having the fd open in the vdsm process might exposed the daemon to a D-state anyway (even though we're not doing IO so it might not be relevant). The second thing is that the truncate operation is executed in a different process (which might be already there) and which probably doesn't have the file descriptor. The oop object is already exposing createSparseFile which does a truncate but the name doesn't look right (here) so we might want to rename it.
Line 635: oop.getProcessPool(dom.sdUUID).os.ftruncate(f.fileno(),
--
To view, visit http://gerrit.ovirt.org/12713
To unsubscribe, visit http://gerrit.ovirt.org/settings
Gerrit-MessageType: comment
Gerrit-Change-Id: I15d73fd9e7727d9112db05ab892771b37d81152e
Gerrit-PatchSet: 2
Gerrit-Project: vdsm
Gerrit-Branch: master
Gerrit-Owner: Richard Marston <mail(a)richardmarston.net>
Gerrit-Reviewer: Federico Simoncelli <fsimonce(a)redhat.com>
Gerrit-Reviewer: Richard Marston <mail(a)richardmarston.net>
Gerrit-Reviewer: oVirt Jenkins CI Server
11 years, 2 months
