Change in vdsm[master]: proposed cleanup for Amador's patch
by lhornyak＠redhat.com
Laszlo Hornyak has uploaded a new change for review.
Change subject: proposed cleanup for Amador's patch
......................................................................
proposed cleanup for Amador's patch
This is a cleanup proposal for Amador's patch:
http://gerrit.ovirt.org/#/c/5481/15
The original patch refers to topology element of the <host> node in the
capabilities output, which my be confusing, because there are two of
them:
- the first is in the <cpu> node, this is the one that is expected
- the second is right under the <host> node
Therefore the logic builds on their order, but this may be confusing.
Also, added a logging in case the computation fails.
Change-Id: I677f13e9a511bb1652dbbb84fe672714215e5aa8
Signed-off-by: Laszlo Hornyak <lhornyak(a)redhat.com>
---
M vdsm/caps.py
1 file changed, 7 insertions(+), 6 deletions(-)
git pull ssh://gerrit.ovirt.org:29418/vdsm refs/changes/02/8302/1
diff --git a/vdsm/caps.py b/vdsm/caps.py
index c5cb7cb..a26b22e 100644
--- a/vdsm/caps.py
+++ b/vdsm/caps.py
@@ -108,17 +108,18 @@
try:
c = libvirtconnection.get()
caps = minidom.parseString(c.getCapabilities())
- host = caps.getElementsByTagName('host')
- host = host[0]
+ host = caps.getElementsByTagName('host')[0]
+ cpu = host.getElementsByTagName('cpu')[0]
topology = {'numa': int(host.getElementsByTagName('cells')[0].
getAttribute('num')),
- 'socket': int(host.getElementsByTagName('topology')[0].
+ 'socket': int(cpu.getElementsByTagName('topology')[0].
getAttribute('sockets')),
- 'core': int(host.getElementsByTagName('topology')[0].
+ 'core': int(cpu.getElementsByTagName('topology')[0].
getAttribute('cores')),
- 'thread': int(host.getElementsByTagName('topology')[0].
+ 'thread': int(cpu.getElementsByTagName('topology')[0].
getAttribute('threads'))}
- except:
+ except BaseException, e:
+ logging.error('error calculating the topology data: %s',e)
# During tests/make rpm, libvirt may not be available/configured.
# Hack arround it.
topology = {'numa': 1,
--
To view, visit http://gerrit.ovirt.org/8302
To unsubscribe, visit http://gerrit.ovirt.org/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I677f13e9a511bb1652dbbb84fe672714215e5aa8
Gerrit-PatchSet: 1
Gerrit-Project: vdsm
Gerrit-Branch: master
Gerrit-Owner: Laszlo Hornyak <lhornyak(a)redhat.com>
11 years, 7 months
Change in vdsm[master]: Read 'source' of NIC interface only if exists
by Igor Lvovsky
Igor Lvovsky has uploaded a new change for review.
Change subject: Read 'source' of NIC interface only if exists
......................................................................
Read 'source' of NIC interface only if exists
Change-Id: Idec5aef35298d93fd35d4f4a1933809c32ecce16
Signed-off-by: Igor Lvovsky <ilvovsky(a)redhat.com>
---
M vdsm/libvirtvm.py
1 file changed, 12 insertions(+), 8 deletions(-)
git pull ssh://gerrit.ovirt.org:29418/vdsm refs/changes/49/8249/1
diff --git a/vdsm/libvirtvm.py b/vdsm/libvirtvm.py
index 557c1ed..75a78fb 100644
--- a/vdsm/libvirtvm.py
+++ b/vdsm/libvirtvm.py
@@ -2487,7 +2487,9 @@
mac = x.getElementsByTagName('mac')[0].getAttribute('address')
alias = x.getElementsByTagName('alias')[0].getAttribute('name')
model = x.getElementsByTagName('model')[0].getAttribute('type')
- bridge = x.getElementsByTagName('source')[0].getAttribute('bridge')
+ source = x.getElementsByTagName('source')
+ if source:
+ bridge = source[0].getAttribute('bridge')
# Get nic address
address = self._getUnderlyingDeviceAddress(x)
for nic in self._devices[vm.NIC_DEVICES]:
@@ -2505,13 +2507,15 @@
knownDev = True
# Add unknown nic device to vm's conf
if not knownDev:
- self.conf['devices'].append({'type': vm.NIC_DEVICES,
- 'device': devType,
- 'macAddr': mac,
- 'nicModel': model,
- 'network': bridge,
- 'address': address,
- 'alias': alias})
+ nicDev = {'type': vm.NIC_DEVICES,
+ 'device': devType,
+ 'macAddr': mac,
+ 'nicModel': model,
+ 'address': address,
+ 'alias': alias}
+ if source:
+ nicDev['network'] = bridge
+ self.conf['devices'].append(nicDev)
def _setWriteWatermarks(self):
"""
--
To view, visit http://gerrit.ovirt.org/8249
To unsubscribe, visit http://gerrit.ovirt.org/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Idec5aef35298d93fd35d4f4a1933809c32ecce16
Gerrit-PatchSet: 1
Gerrit-Project: vdsm
Gerrit-Branch: master
Gerrit-Owner: Igor Lvovsky <ilvovsky(a)redhat.com>
11 years, 7 months
Change in vdsm[master]: BZ#781975 VM creation concurrency limit
by peet＠redhat.com
Peter V. Saveliev has uploaded a new change for review.
Change subject: BZ#781975 VM creation concurrency limit
......................................................................
BZ#781975 VM creation concurrency limit
Since libvirt now does not support concurrent VM creation,
simultaneous requests lead to the situation when a user
should wait all VMs to be created before he sees any progress
in the UI. Tho just for now it is more reasonable to limit
parallel creation (4 threads does the stuff slightly faster
than 1, and a user will see the progress in UI). As libvirt
will support more fine-grained lock in its driver, we can
return to caps.CpuInfo().cores() usage.
Change-Id: I527c1f5201646f7f912d976b59355f70b8ca20eb
Signed-off-by: Peter V. Saveliev <peet(a)redhat.com>
Bug-Url: https://bugzilla.redhat.com/show_bug.cgi?id=781975
---
M vdsm/vm.py
1 file changed, 2 insertions(+), 1 deletion(-)
git pull ssh://gerrit.ovirt.org:29418/vdsm refs/changes/95/8295/1
diff --git a/vdsm/vm.py b/vdsm/vm.py
index 742e9fd..c5507e9 100644
--- a/vdsm/vm.py
+++ b/vdsm/vm.py
@@ -260,7 +260,8 @@
its behaviour.
"""
log = logging.getLogger("vm.Vm")
- _ongoingCreations = threading.BoundedSemaphore(caps.CpuInfo().cores())
+ # limit threads number until the libvirt lock will be fixed
+ _ongoingCreations = threading.BoundedSemaphore(4)
MigrationSourceThreadClass = MigrationSourceThread
def __init__(self, cif, params):
--
To view, visit http://gerrit.ovirt.org/8295
To unsubscribe, visit http://gerrit.ovirt.org/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I527c1f5201646f7f912d976b59355f70b8ca20eb
Gerrit-PatchSet: 1
Gerrit-Project: vdsm
Gerrit-Branch: master
Gerrit-Owner: Peter V. Saveliev <peet(a)redhat.com>
11 years, 7 months
Change in vdsm[master]: bootstrap: remove MAC address from vds unique id
by Dan Kenigsberg
Dan Kenigsberg has submitted this change and it was merged.
Change subject: bootstrap: remove MAC address from vds unique id
......................................................................
bootstrap: remove MAC address from vds unique id
CURRENT IMPLEMENTATION
vds unique id is at format: @BIOS UUID@_@Low(MAC)@
If BIOS UUID was not available either empty or "Not" were used.
PROBLEMS IN CURRENT IMPLEMENTATION
BIOS UUID may be missing or duplicate.
MAC may change either because of bonding (resolved) or
because of physical adapter change.
ASSUMPTION
Hosts with no BIOS UUID or with duplicate UUID are less than 0.05% of
the hosts we manage.
CONCLUSION
No need to add great complexity malformed UUID hosts 0.05%.
But remove the MAC issues from the solution.
METHOD
Remove the MAC address from vds unique id.
Allow to bypass BIOS UUID with configuration.
DETAILS
If /etc/vdsm/vdsm.id exists at host, content is the vds unique id.
If running on RHEV-H persist /etc/vdsm/vdsm.id during bootstrap or
vdsm-reg.
/etc/vdsm/vdsm.id is created by first engine vds unique id lookup
or manually by administrator.
SIDE EFFECTS
If RHEV-H is reinstalled on malformed host (one with no BIOS UUID)
it will be treated as a new host.
RHEV-H without the complimentary vdsm fix will not be able to
register if installed on BIOS that does not support UUID, as it will
not generate logical UUID before registration.
If BIOS contains duplicate UUID, manual intervention should apply,
creating /etc/vdsm/vdsm.id manually.
Change-Id: I763c7df40706a37eef53bc690294f0f84c57b374
Signed-off-by: Alon Bar-Lev <alonbl(a)redhat.com>
---
M vds_bootstrap/setup
M vdsm/constants.py.in
M vdsm/utils.py
M vdsm_reg/deployUtil.py.in
4 files changed, 50 insertions(+), 32 deletions(-)
Approvals:
Dan Kenigsberg: Verified; Looks good to me, approved
--
To view, visit http://gerrit.ovirt.org/8126
To unsubscribe, visit http://gerrit.ovirt.org/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I763c7df40706a37eef53bc690294f0f84c57b374
Gerrit-PatchSet: 3
Gerrit-Project: vdsm
Gerrit-Branch: master
Gerrit-Owner: Alon Bar-Lev <alonbl(a)redhat.com>
Gerrit-Reviewer: Alex Lourie <alourie(a)redhat.com>
Gerrit-Reviewer: Alon Bar-Lev <alonbl(a)redhat.com>
Gerrit-Reviewer: Barak Azulay <bazulay(a)redhat.com>
Gerrit-Reviewer: Dan Kenigsberg <danken(a)redhat.com>
Gerrit-Reviewer: Doron Fediuck <dfediuck(a)redhat.com>
Gerrit-Reviewer: Douglas Schilling Landgraf <dougsland(a)redhat.com>
Gerrit-Reviewer: Juan Hernandez <juan.hernandez(a)redhat.com>
Gerrit-Reviewer: Michael Burns <mburns(a)redhat.com>
Gerrit-Reviewer: Yair Zaslavsky <yzaslavs(a)redhat.com>
11 years, 7 months
Change in vdsm[master]: bootstrap: remove MAC address from vds unique id
by Dan Kenigsberg
Dan Kenigsberg has posted comments on this change.
Change subject: bootstrap: remove MAC address from vds unique id
......................................................................
Patch Set 3: Verified; Looks good to me, approved
Copying ps2's v+1.
--
To view, visit http://gerrit.ovirt.org/8126
To unsubscribe, visit http://gerrit.ovirt.org/settings
Gerrit-MessageType: comment
Gerrit-Change-Id: I763c7df40706a37eef53bc690294f0f84c57b374
Gerrit-PatchSet: 3
Gerrit-Project: vdsm
Gerrit-Branch: master
Gerrit-Owner: Alon Bar-Lev <alonbl(a)redhat.com>
Gerrit-Reviewer: Alex Lourie <alourie(a)redhat.com>
Gerrit-Reviewer: Alon Bar-Lev <alonbl(a)redhat.com>
Gerrit-Reviewer: Barak Azulay <bazulay(a)redhat.com>
Gerrit-Reviewer: Dan Kenigsberg <danken(a)redhat.com>
Gerrit-Reviewer: Doron Fediuck <dfediuck(a)redhat.com>
Gerrit-Reviewer: Douglas Schilling Landgraf <dougsland(a)redhat.com>
Gerrit-Reviewer: Juan Hernandez <juan.hernandez(a)redhat.com>
Gerrit-Reviewer: Michael Burns <mburns(a)redhat.com>
Gerrit-Reviewer: Yair Zaslavsky <yzaslavs(a)redhat.com>
11 years, 7 months
Change in vdsm[master]: bootstrap: remove MAC address from vds unique id
by Alon Bar-Lev
Alon Bar-Lev has posted comments on this change.
Change subject: bootstrap: remove MAC address from vds unique id
......................................................................
Patch Set 2: (1 inline comment)
....................................................
File vds_bootstrap/setup
Line 33: HYPERVISOR_PLATFORMS = [ "RedHatEnterpriseVirtualizationHypervisor", "RedHatEnterpriseHypervisor", "oVirtNodeHypervisor" ]
Line 34: HYPERVISOR_RELEASE_FILE = '/etc/rhev-hypervisor-release'
Line 35: REDHAT_RELEASE_FILE = '/etc/redhat-release'
Line 36: vdsm_reg_conf_file = '/etc/vdsm-reg/vdsm-reg.conf'
Line 37: vdsm_id_file = '/etc/vdsm/vdsm.id'
Right. Need to rewrite asap.
Line 38:
Line 39: try:
Line 40: LOGDIR=os.environ["OVIRT_LOGDIR"]
Line 41: except KeyError:
--
To view, visit http://gerrit.ovirt.org/8126
To unsubscribe, visit http://gerrit.ovirt.org/settings
Gerrit-MessageType: comment
Gerrit-Change-Id: I763c7df40706a37eef53bc690294f0f84c57b374
Gerrit-PatchSet: 2
Gerrit-Project: vdsm
Gerrit-Branch: master
Gerrit-Owner: Alon Bar-Lev <alonbl(a)redhat.com>
Gerrit-Reviewer: Alex Lourie <alourie(a)redhat.com>
Gerrit-Reviewer: Alon Bar-Lev <alonbl(a)redhat.com>
Gerrit-Reviewer: Barak Azulay <bazulay(a)redhat.com>
Gerrit-Reviewer: Dan Kenigsberg <danken(a)redhat.com>
Gerrit-Reviewer: Doron Fediuck <dfediuck(a)redhat.com>
Gerrit-Reviewer: Douglas Schilling Landgraf <dougsland(a)redhat.com>
Gerrit-Reviewer: Juan Hernandez <juan.hernandez(a)redhat.com>
Gerrit-Reviewer: Michael Burns <mburns(a)redhat.com>
Gerrit-Reviewer: Yair Zaslavsky <yzaslavs(a)redhat.com>
11 years, 7 months
Change in vdsm[master]: bootstrap: remove MAC address from vds unique id
by Dan Kenigsberg
Dan Kenigsberg has posted comments on this change.
Change subject: bootstrap: remove MAC address from vds unique id
......................................................................
Patch Set 2: I would prefer that you didn't submit this
(1 inline comment)
just a little naming issue
....................................................
File vds_bootstrap/setup
Line 33: HYPERVISOR_PLATFORMS = [ "RedHatEnterpriseVirtualizationHypervisor", "RedHatEnterpriseHypervisor", "oVirtNodeHypervisor" ]
Line 34: HYPERVISOR_RELEASE_FILE = '/etc/rhev-hypervisor-release'
Line 35: REDHAT_RELEASE_FILE = '/etc/redhat-release'
Line 36: vdsm_reg_conf_file = '/etc/vdsm-reg/vdsm-reg.conf'
Line 37: vdsm_id_file = '/etc/vdsm/vdsm.id'
you define this (with a different name) in deployUtil.py - you might as well use it.
Line 38:
Line 39: try:
Line 40: LOGDIR=os.environ["OVIRT_LOGDIR"]
Line 41: except KeyError:
--
To view, visit http://gerrit.ovirt.org/8126
To unsubscribe, visit http://gerrit.ovirt.org/settings
Gerrit-MessageType: comment
Gerrit-Change-Id: I763c7df40706a37eef53bc690294f0f84c57b374
Gerrit-PatchSet: 2
Gerrit-Project: vdsm
Gerrit-Branch: master
Gerrit-Owner: Alon Bar-Lev <alonbl(a)redhat.com>
Gerrit-Reviewer: Alex Lourie <alourie(a)redhat.com>
Gerrit-Reviewer: Alon Bar-Lev <alonbl(a)redhat.com>
Gerrit-Reviewer: Barak Azulay <bazulay(a)redhat.com>
Gerrit-Reviewer: Dan Kenigsberg <danken(a)redhat.com>
Gerrit-Reviewer: Doron Fediuck <dfediuck(a)redhat.com>
Gerrit-Reviewer: Douglas Schilling Landgraf <dougsland(a)redhat.com>
Gerrit-Reviewer: Juan Hernandez <juan.hernandez(a)redhat.com>
Gerrit-Reviewer: Michael Burns <mburns(a)redhat.com>
Gerrit-Reviewer: Yair Zaslavsky <yzaslavs(a)redhat.com>
11 years, 7 months
Change in vdsm[master]: bootstrap: remove MAC address from vds unique id
by bazulay＠redhat.com
Barak Azulay has posted comments on this change.
Change subject: bootstrap: remove MAC address from vds unique id
......................................................................
Patch Set 2: Looks good to me, but someone else must approve
--
To view, visit http://gerrit.ovirt.org/8126
To unsubscribe, visit http://gerrit.ovirt.org/settings
Gerrit-MessageType: comment
Gerrit-Change-Id: I763c7df40706a37eef53bc690294f0f84c57b374
Gerrit-PatchSet: 2
Gerrit-Project: vdsm
Gerrit-Branch: master
Gerrit-Owner: Alon Bar-Lev <alonbl(a)redhat.com>
Gerrit-Reviewer: Alex Lourie <alourie(a)redhat.com>
Gerrit-Reviewer: Alon Bar-Lev <alonbl(a)redhat.com>
Gerrit-Reviewer: Barak Azulay <bazulay(a)redhat.com>
Gerrit-Reviewer: Dan Kenigsberg <danken(a)redhat.com>
Gerrit-Reviewer: Doron Fediuck <dfediuck(a)redhat.com>
Gerrit-Reviewer: Douglas Schilling Landgraf <dougsland(a)redhat.com>
Gerrit-Reviewer: Juan Hernandez <juan.hernandez(a)redhat.com>
Gerrit-Reviewer: Michael Burns <mburns(a)redhat.com>
Gerrit-Reviewer: Yair Zaslavsky <yzaslavs(a)redhat.com>
11 years, 7 months
Change in vdsm[master]: bootstrap: remove MAC address from vds unique id
by Douglas Schilling Landgraf
Douglas Schilling Landgraf has posted comments on this change.
Change subject: bootstrap: remove MAC address from vds unique id
......................................................................
Patch Set 2: Looks good to me, but someone else must approve
--
To view, visit http://gerrit.ovirt.org/8126
To unsubscribe, visit http://gerrit.ovirt.org/settings
Gerrit-MessageType: comment
Gerrit-Change-Id: I763c7df40706a37eef53bc690294f0f84c57b374
Gerrit-PatchSet: 2
Gerrit-Project: vdsm
Gerrit-Branch: master
Gerrit-Owner: Alon Bar-Lev <alonbl(a)redhat.com>
Gerrit-Reviewer: Alex Lourie <alourie(a)redhat.com>
Gerrit-Reviewer: Alon Bar-Lev <alonbl(a)redhat.com>
Gerrit-Reviewer: Barak Azulay <bazulay(a)redhat.com>
Gerrit-Reviewer: Dan Kenigsberg <danken(a)redhat.com>
Gerrit-Reviewer: Doron Fediuck <dfediuck(a)redhat.com>
Gerrit-Reviewer: Douglas Schilling Landgraf <dougsland(a)redhat.com>
Gerrit-Reviewer: Juan Hernandez <juan.hernandez(a)redhat.com>
Gerrit-Reviewer: Yair Zaslavsky <yzaslavs(a)redhat.com>
11 years, 7 months
Change in vdsm[master]: bootstrap: remove MAC address from vds unique id
by Alon Bar-Lev
Alon Bar-Lev has posted comments on this change.
Change subject: bootstrap: remove MAC address from vds unique id
......................................................................
Patch Set 2:
People this is for actual merge.
Thanks!
--
To view, visit http://gerrit.ovirt.org/8126
To unsubscribe, visit http://gerrit.ovirt.org/settings
Gerrit-MessageType: comment
Gerrit-Change-Id: I763c7df40706a37eef53bc690294f0f84c57b374
Gerrit-PatchSet: 2
Gerrit-Project: vdsm
Gerrit-Branch: master
Gerrit-Owner: Alon Bar-Lev <alonbl(a)redhat.com>
Gerrit-Reviewer: Alex Lourie <alourie(a)redhat.com>
Gerrit-Reviewer: Alon Bar-Lev <alonbl(a)redhat.com>
Gerrit-Reviewer: Barak Azulay <bazulay(a)redhat.com>
Gerrit-Reviewer: Dan Kenigsberg <danken(a)redhat.com>
Gerrit-Reviewer: Doron Fediuck <dfediuck(a)redhat.com>
Gerrit-Reviewer: Douglas Schilling Landgraf <dougsland(a)redhat.com>
Gerrit-Reviewer: Juan Hernandez <juan.hernandez(a)redhat.com>
Gerrit-Reviewer: Yair Zaslavsky <yzaslavs(a)redhat.com>
11 years, 7 months