Change in vdsm[master]: Rename vm rx tx metric names to align with host report
by Code Review
From Yaniv Bronhaim <ybronhei(a)redhat.com>:
Yaniv Bronhaim has uploaded a new change for review.
Change subject: Rename vm rx tx metric names to align with host report
......................................................................
Rename vm rx tx metric names to align with host report
In host/api.py we report all rx* tx* fields in the format rx_* tx_*
Change-Id: I1b36acfe927c10a012bf477fed52f84471968c58
Signed-off-by: Yaniv Bronhaim <ybronhei(a)redhat.com>
---
M lib/vdsm/virt/vmstats.py
1 file changed, 6 insertions(+), 6 deletions(-)
git pull ssh://gerrit.ovirt.org:29418/vdsm refs/changes/33/66233/1
diff --git a/lib/vdsm/virt/vmstats.py b/lib/vdsm/virt/vmstats.py
index 954e95e..f5dc15f 100644
--- a/lib/vdsm/virt/vmstats.py
+++ b/lib/vdsm/virt/vmstats.py
@@ -244,13 +244,13 @@
netprefix = prefix + '.nic.' + interface
if_info = stat['network'][interface]
data[netprefix + '.speed'] = if_info['speed']
- data[netprefix + '.rx.bytes'] = if_info['rx']
- data[netprefix + '.rx.errors'] = if_info['rxErrors']
- data[netprefix + '.rx.dropped'] = if_info['rxDropped']
+ data[netprefix + '.rx_bytes'] = if_info['rx']
+ data[netprefix + '.rx_errors'] = if_info['rxErrors']
+ data[netprefix + '.rx_dropped'] = if_info['rxDropped']
- data[netprefix + '.tx.bytes'] = if_info['tx']
- data[netprefix + '.tx.errors'] = if_info['txErrors']
- data[netprefix + '.tx.dropped'] = if_info['txDropped']
+ data[netprefix + '.tx_bytes'] = if_info['tx']
+ data[netprefix + '.tx_errors'] = if_info['txErrors']
+ data[netprefix + '.tx_dropped'] = if_info['txDropped']
# Guest cpu-count,apps list, status, mac addr, client IP,
# display type, kvm enabled, username, vcpu info, vm jobs,
--
To view, visit https://gerrit.ovirt.org/66233
To unsubscribe, visit https://gerrit.ovirt.org/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I1b36acfe927c10a012bf477fed52f84471968c58
Gerrit-PatchSet: 1
Gerrit-Project: vdsm
Gerrit-Branch: master
Gerrit-Owner: Yaniv Bronhaim <ybronhei(a)redhat.com>
7 years, 6 months
Change in vdsm[master]: Remove rx\txRate metrics
by Code Review
From Yaniv Bronhaim <ybronhei(a)redhat.com>:
Yaniv Bronhaim has uploaded a new change for review.
Change subject: Remove rx\txRate metrics
......................................................................
Remove rx\txRate metrics
Those values were removed from host stats
Change-Id: Ice312e5a5d09bd8b625f10b1b0803554fcf110c0
Signed-off-by: Yaniv Bronhaim <ybronhei(a)redhat.com>
---
M lib/vdsm/host/api.py
1 file changed, 0 insertions(+), 2 deletions(-)
git pull ssh://gerrit.ovirt.org:29418/vdsm refs/changes/37/66237/1
diff --git a/lib/vdsm/host/api.py b/lib/vdsm/host/api.py
index 138b6e8..d9ee16b 100644
--- a/lib/vdsm/host/api.py
+++ b/lib/vdsm/host/api.py
@@ -124,8 +124,6 @@
if_info = hoststats['network'][interface]
net_prefix = prefix + '.nic.' + interface
data[net_prefix + '.speed'] = if_info['speed']
- data[net_prefix + '.rx_rate'] = if_info['rxRate']
- data[net_prefix + '.tx_rate'] = if_info['txRate']
data[net_prefix + '.rx_errors'] = if_info['rxErrors']
data[net_prefix + '.tx_errors'] = if_info['txErrors']
data[net_prefix + '.rx_dropped'] = if_info['rxDropped']
--
To view, visit https://gerrit.ovirt.org/66237
To unsubscribe, visit https://gerrit.ovirt.org/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ice312e5a5d09bd8b625f10b1b0803554fcf110c0
Gerrit-PatchSet: 1
Gerrit-Project: vdsm
Gerrit-Branch: master
Gerrit-Owner: Yaniv Bronhaim <ybronhei(a)redhat.com>
7 years, 6 months
Change in vdsm[master]: Enable metrics by default
by Code Review
From Yaniv Bronhaim <ybronhei(a)redhat.com>:
Yaniv Bronhaim has uploaded a new change for review.
Change subject: Enable metrics by default
......................................................................
Enable metrics by default
To avoid restart of vdsm service after first engine deploy to enable metrics
we set the metrics to enabled by default
Change-Id: I16cc758b4c9457ecef95fb33a81de58c4b909b0d
Signed-off-by: Yaniv Bronhaim <ybronhei(a)redhat.com>
---
M lib/vdsm/config.py.in
1 file changed, 2 insertions(+), 2 deletions(-)
git pull ssh://gerrit.ovirt.org:29418/vdsm refs/changes/29/66229/1
diff --git a/lib/vdsm/config.py.in b/lib/vdsm/config.py.in
index 47184ab..d606da2 100644
--- a/lib/vdsm/config.py.in
+++ b/lib/vdsm/config.py.in
@@ -452,8 +452,8 @@
# Section: [metrics]
('metrics', [
- ('enabled', 'false',
- 'Enable metrics collection (default false)'),
+ ('enabled', 'true',
+ 'Enable metrics collection (default true)'),
('collector_address', 'localhost',
'Metrics collector address (default localhost)'),
--
To view, visit https://gerrit.ovirt.org/66229
To unsubscribe, visit https://gerrit.ovirt.org/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I16cc758b4c9457ecef95fb33a81de58c4b909b0d
Gerrit-PatchSet: 1
Gerrit-Project: vdsm
Gerrit-Branch: master
Gerrit-Owner: Yaniv Bronhaim <ybronhei(a)redhat.com>
7 years, 6 months
Change in vdsm[master]: Limit vm name metric report to 30 character otherwise statsd...
by Code Review
From Yaniv Bronhaim <ybronhei(a)redhat.com>:
Yaniv Bronhaim has uploaded a new change for review.
Change subject: Limit vm name metric report to 30 character otherwise statsd plugin cuts it
......................................................................
Limit vm name metric report to 30 character otherwise statsd plugin cuts it
Current metrics len don't pass 30 characters excluding the vmname\uuid -
this patch limits the name length to 30 chars to avoid passing collectd
limit which is 63 characters.
Change-Id: I87e3503b390217a8db3ba7abd4f845c19e7b2913
Signed-off-by: Yaniv Bronhaim <ybronhei(a)redhat.com>
---
M lib/vdsm/virt/vmstats.py
1 file changed, 2 insertions(+), 1 deletion(-)
git pull ssh://gerrit.ovirt.org:29418/vdsm refs/changes/35/66235/1
diff --git a/lib/vdsm/virt/vmstats.py b/lib/vdsm/virt/vmstats.py
index 6ab3ac4..76b6b63 100644
--- a/lib/vdsm/virt/vmstats.py
+++ b/lib/vdsm/virt/vmstats.py
@@ -195,7 +195,8 @@
try:
for vm_uuid in vms_stats:
stat = vms_stats[vm_uuid]
- prefix = "vms." + stat['vmName']
+ # cut vm name to 30 characters to avoid metric provider trimming
+ prefix = "vms." + stat['vmName'][:30]
data[prefix + '.cpu.user'] = stat['cpuUser']
data[prefix + '.cpu.sys'] = stat['cpuSys']
data[prefix + '.cpu.usage'] = stat['cpuUsage']
--
To view, visit https://gerrit.ovirt.org/66235
To unsubscribe, visit https://gerrit.ovirt.org/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I87e3503b390217a8db3ba7abd4f845c19e7b2913
Gerrit-PatchSet: 1
Gerrit-Project: vdsm
Gerrit-Branch: master
Gerrit-Owner: Yaniv Bronhaim <ybronhei(a)redhat.com>
7 years, 6 months
Change in vdsm[master]: stomp: broker cleanup
by Piotr Kliczewski
Piotr Kliczewski has uploaded a new change for review.
Change subject: stomp: broker cleanup
......................................................................
stomp: broker cleanup
We can remove engine 3.5 supported queue names since we do not support
this version anymore.
Change-Id: I972268a72f51975eb78c6bac926e29ac53178dca
Signed-off-by: Piotr Kliczewski <piotr.kliczewski(a)gmail.com>
---
M lib/yajsonrpc/stomp.py
M lib/yajsonrpc/stompreactor.py
2 files changed, 2 insertions(+), 13 deletions(-)
git pull ssh://gerrit.ovirt.org:29418/vdsm refs/changes/81/65681/1
diff --git a/lib/yajsonrpc/stomp.py b/lib/yajsonrpc/stomp.py
index 41ac70f..558c519 100644
--- a/lib/yajsonrpc/stomp.py
+++ b/lib/yajsonrpc/stomp.py
@@ -22,11 +22,6 @@
from vdsm import utils
import re
-# REQUIRED_FOR: engine-3.5
-# safe to remove when 3.5 support is dropped
-LEGACY_SUBSCRIPTION_ID_REQUEST = "/queue/_local/vdsm/requests"
-LEGACY_SUBSCRIPTION_ID_RESPONSE = "/queue/_local/vdsm/reponses"
-
_RE_ESCAPE_SEQUENCE = re.compile(r"\\(.)")
_RE_ENCODE_CHARS = re.compile(r"[\r\n\\:]")
diff --git a/lib/yajsonrpc/stompreactor.py b/lib/yajsonrpc/stompreactor.py
index 233bee3..42d7d01 100644
--- a/lib/yajsonrpc/stompreactor.py
+++ b/lib/yajsonrpc/stompreactor.py
@@ -200,11 +200,6 @@
frame.headers.get(stomp.Headers.REPLY_TO),
frame.body)
return
- elif stomp.LEGACY_SUBSCRIPTION_ID_REQUEST == destination:
- self._handle_internal(dispatcher,
- stomp.LEGACY_SUBSCRIPTION_ID_RESPONSE,
- frame.body)
- return
else:
try:
subs = self._sub_dests[destination]
@@ -323,7 +318,7 @@
"""
Sends message to all subscribes that subscribed to destination.
"""
- def send(self, message, destination=stomp.LEGACY_SUBSCRIPTION_ID_RESPONSE):
+ def send(self, message, destination):
resp = json.loads(message)
response_id = resp.get("id")
@@ -414,8 +409,7 @@
self._reactor.wakeup()
return sub
- def send(self, message, destination=stomp.LEGACY_SUBSCRIPTION_ID_RESPONSE,
- headers=None):
+ def send(self, message, destination, headers=None):
self.log.debug("Sending response")
self._aclient.send(
destination,
--
To view, visit https://gerrit.ovirt.org/65681
To unsubscribe, visit https://gerrit.ovirt.org/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I972268a72f51975eb78c6bac926e29ac53178dca
Gerrit-PatchSet: 1
Gerrit-Project: vdsm
Gerrit-Branch: master
Gerrit-Owner: Piotr Kliczewski <piotr.kliczewski(a)gmail.com>
7 years, 6 months
Change in vdsm[master]: utils: add custom closing context manager
by Code Review
From Yaniv Bronhaim <ybronhei(a)redhat.com>:
Yaniv Bronhaim has posted comments on this change.
Change subject: utils: add custom closing context manager
......................................................................
Patch Set 4:
(2 comments)
https://gerrit.ovirt.org/#/c/65982/4/lib/vdsm/utils.py
File lib/vdsm/utils.py:
Line 434: completion of the with statement.
Line 435: __exit__ will be called in the end of the with statement and in case of
Line 436: exception during the object lifetime.
Line 437:
Line 438: Adaptation from https://docs.python.org/2.7/library/contextlib.html
its deprecated in 2.7 before now with statement does it for you? so we can remove it once we py3? can't we using the contextlib.closing if available?
Line 439: """
Line 440: def __init__(self, obj, log=""):
Line 441: self.obj = obj
Line 442: self.log = log
Line 450: except Exception:
Line 451: if t is None:
Line 452: raise
Line 453: log = logging.getLogger(self.log)
Line 454: log.exception(tb)
you can just use logging.exception(*). I think its better
Line 455:
Line 456:
Line 457: class memoized(object):
Line 458: """
--
To view, visit https://gerrit.ovirt.org/65982
To unsubscribe, visit https://gerrit.ovirt.org/settings
Gerrit-MessageType: comment
Gerrit-Change-Id: I29e9ed0f44603dd5299be5e3b814d08833055a94
Gerrit-PatchSet: 4
Gerrit-Project: vdsm
Gerrit-Branch: master
Gerrit-Owner: Irit Goihman <igoihman(a)redhat.com>
Gerrit-Reviewer: Dan Kenigsberg <danken(a)redhat.com>
Gerrit-Reviewer: Francesco Romani <fromani(a)redhat.com>
Gerrit-Reviewer: Irit Goihman <igoihman(a)redhat.com>
Gerrit-Reviewer: Jenkins CI
Gerrit-Reviewer: Nir Soffer <nsoffer(a)redhat.com>
Gerrit-Reviewer: Piotr Kliczewski <piotr.kliczewski(a)gmail.com>
Gerrit-Reviewer: Yaniv Bronhaim <ybronhei(a)redhat.com>
Gerrit-Reviewer: gerrit-hooks <automation(a)ovirt.org>
Gerrit-HasComments: Yes
7 years, 6 months
Change in vdsm[master]: virt: Always execute after_hibernation event
by Vinzenz Feenstra
Vinzenz Feenstra has uploaded a new change for review.
Change subject: virt: Always execute after_hibernation event
......................................................................
virt: Always execute after_hibernation event
Previously we had no way that the after_hibernation event got executed.
The enableGuestEvents value was never set to true and we're now also
dropping it on the migration destination.
Since there is also no parameter for enabling guest events on the suspend
call it, we decided that it is much more beneficial to let the VM always
know that it is going to be hibernated and/or has been resumed from
hibernation.
Since purely from theory this information can be also determined without
the notifications there's no security issue that the Virtual Machine would
know too much about it's environment. However it's beneficial for a range of
applications which need to resynchronize, adjust the time or re-accquire an
IP address via DHCP etc.
Change-Id: Ic52b8c22d57028fb6459c7faa2bcfebd8f32d6c4
Bug-Url: https://bugzilla.redhat.com/1349907
Signed-off-by: Vinzenz Feenstra <vfeenstr(a)redhat.com>
---
M vdsm/virt/vm.py
1 file changed, 12 insertions(+), 7 deletions(-)
git pull ssh://gerrit.ovirt.org:29418/vdsm refs/changes/14/59914/1
diff --git a/vdsm/virt/vm.py b/vdsm/virt/vm.py
index c2b1b93..d8e4239 100644
--- a/vdsm/virt/vm.py
+++ b/vdsm/virt/vm.py
@@ -1866,14 +1866,19 @@
except Exception:
self.log.exception("Failed to connect to guest agent channel")
- try:
- if self.conf.get('enableGuestEvents', False):
- if self.lastStatus == vmstatus.MIGRATION_DESTINATION:
+ if self.lastStatus == vmstatus.RESTORING_STATE:
+ try:
+ self.guestAgent.events.after_hibernation()
+ except Exception:
+ self.log.exception("Unexpected error on guest after "
+ "hibernation notification")
+ elif self.conf.get('enableGuestEvents', False):
+ if self.lastStatus == vmstatus.MIGRATION_DESTINATION:
+ try:
self.guestAgent.events.after_migration()
- elif self.lastStatus == vmstatus.RESTORING_STATE:
- self.guestAgent.events.after_hibernation()
- except Exception:
- self.log.exception("Unexpected error on guest event notification")
+ except Exception:
+ self.log.exception("Unexpected error on guest after "
+ "migration notification")
# Drop enableGuestEvents from conf - Not required from here anymore
self.conf.pop('enableGuestEvents', None)
--
To view, visit https://gerrit.ovirt.org/59914
To unsubscribe, visit https://gerrit.ovirt.org/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ic52b8c22d57028fb6459c7faa2bcfebd8f32d6c4
Gerrit-PatchSet: 1
Gerrit-Project: vdsm
Gerrit-Branch: master
Gerrit-Owner: Vinzenz Feenstra <vfeenstr(a)redhat.com>
7 years, 6 months
Change in vdsm[master]: numa: Test NUMA crash fix
by Code Review
From Dan Kenigsberg <danken(a)redhat.com>:
Dan Kenigsberg has submitted this change and it was merged.
Change subject: numa: Test NUMA crash fix
......................................................................
numa: Test NUMA crash fix
In a previous patch, we fixed KeyError in getVmNumaNodeRuntimeInfo on
CPUs not pinned to any node in the Engine NUMA mapping. This patch adds
such a CPU to an already existent test, to ensure the error won't occur
anymore.
Change-Id: I465fe682e25cdb9a0407e013ac63f25116857f16
Signed-off-by: Milan Zamazal <mzamazal(a)redhat.com>
Reviewed-on: https://gerrit.ovirt.org/66065
Continuous-Integration: Jenkins CI
Reviewed-by: Martin Polednik <mpolednik(a)redhat.com>
Reviewed-by: Francesco Romani <fromani(a)redhat.com>
---
M tests/numaUtilsTests.py
1 file changed, 3 insertions(+), 1 deletion(-)
Approvals:
Jenkins CI: Passed CI tests
Francesco Romani: Looks good to me, approved
Martin Polednik: Looks good to me, but someone else must approve
Milan Zamazal: Verified
--
To view, visit https://gerrit.ovirt.org/66065
To unsubscribe, visit https://gerrit.ovirt.org/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I465fe682e25cdb9a0407e013ac63f25116857f16
Gerrit-PatchSet: 2
Gerrit-Project: vdsm
Gerrit-Branch: master
Gerrit-Owner: Milan Zamazal <mzamazal(a)redhat.com>
Gerrit-Reviewer: Dan Kenigsberg <danken(a)redhat.com>
Gerrit-Reviewer: Francesco Romani <fromani(a)redhat.com>
Gerrit-Reviewer: Jenkins CI
Gerrit-Reviewer: Martin Polednik <mpolednik(a)redhat.com>
Gerrit-Reviewer: Milan Zamazal <mzamazal(a)redhat.com>
Gerrit-Reviewer: gerrit-hooks <automation(a)ovirt.org>
7 years, 6 months
Change in vdsm[ovirt-4.0]: net: do not require openvswitch for now
by Code Review
From Dan Kenigsberg <danken(a)redhat.com>:
Dan Kenigsberg has uploaded a new change for review.
Change subject: net: do not require openvswitch for now
......................................................................
net: do not require openvswitch for now
Due to Bug 1378501, openvswitch currently does not start on AMD
machines. We'd like to soft-require OvS until that is solved.
The patch is ovirt-4.0 only because I believe openvswitch would be fixed
before ovirt-4.1 is released.
Change-Id: Ibc2f37e35d26996931008744fb8b6c71fe44f4e8
Bug-Url: https://bugzilla.redhat.com/1391856
Signed-off-by: Dan Kenigsberg <danken(a)redhat.com>
---
M init/systemd/vdsm-network-init.service.in
1 file changed, 2 insertions(+), 1 deletion(-)
git pull ssh://gerrit.ovirt.org:29418/vdsm refs/changes/99/66099/1
diff --git a/init/systemd/vdsm-network-init.service.in b/init/systemd/vdsm-network-init.service.in
index 82c7ded..30cfd5b 100644
--- a/init/systemd/vdsm-network-init.service.in
+++ b/init/systemd/vdsm-network-init.service.in
@@ -1,7 +1,8 @@
[Unit]
Description=Virtual Desktop Server Manager network IP+link restoration
Wants=network.target
-Requires=@OPENVSWITCHSERVICE@
+# do not require openvswitch until it starts on AMD BZ#1391856
+# Requires=@OPENVSWITCHSERVICE@
After=@OPENVSWITCHSERVICE@
Before=libvirtd.service
--
To view, visit https://gerrit.ovirt.org/66099
To unsubscribe, visit https://gerrit.ovirt.org/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ibc2f37e35d26996931008744fb8b6c71fe44f4e8
Gerrit-PatchSet: 1
Gerrit-Project: vdsm
Gerrit-Branch: ovirt-4.0
Gerrit-Owner: Dan Kenigsberg <danken(a)redhat.com>
7 years, 6 months
Change in vdsm[ovirt-4.0.5]: net: do not require openvswitch for now
by Code Review
From Dan Kenigsberg <danken(a)redhat.com>:
Dan Kenigsberg has uploaded a new change for review.
Change subject: net: do not require openvswitch for now
......................................................................
net: do not require openvswitch for now
Due to Bug 1378501, openvswitch currently does not start on AMD
machines. We'd like to soft-require OvS until that is solved.
The patch is ovirt-4.0 only because I believe openvswitch would be fixed
before ovirt-4.1 is released.
Change-Id: Ibc2f37e35d26996931008744fb8b6c71fe44f4e8
Bug-Url: https://bugzilla.redhat.com/1391856
Signed-off-by: Dan Kenigsberg <danken(a)redhat.com>
---
M init/systemd/vdsm-network-init.service.in
1 file changed, 2 insertions(+), 1 deletion(-)
git pull ssh://gerrit.ovirt.org:29418/vdsm refs/changes/00/66100/1
diff --git a/init/systemd/vdsm-network-init.service.in b/init/systemd/vdsm-network-init.service.in
index 82c7ded..9f42708 100644
--- a/init/systemd/vdsm-network-init.service.in
+++ b/init/systemd/vdsm-network-init.service.in
@@ -1,7 +1,8 @@
[Unit]
Description=Virtual Desktop Server Manager network IP+link restoration
Wants=network.target
-Requires=@OPENVSWITCHSERVICE@
+# do not require openvswitch until it starts on AMD (BZ#1378501)
+# Requires=@OPENVSWITCHSERVICE@
After=@OPENVSWITCHSERVICE@
Before=libvirtd.service
--
To view, visit https://gerrit.ovirt.org/66100
To unsubscribe, visit https://gerrit.ovirt.org/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ibc2f37e35d26996931008744fb8b6c71fe44f4e8
Gerrit-PatchSet: 1
Gerrit-Project: vdsm
Gerrit-Branch: ovirt-4.0.5
Gerrit-Owner: Dan Kenigsberg <danken(a)redhat.com>
7 years, 6 months