Change in vdsm[master]: vdsm.conf: Add drop-in dir
by automation＠ovirt.org
gerrit-hooks has posted comments on this change.
Change subject: vdsm.conf: Add drop-in dir
......................................................................
Patch Set 12:
* #1279555::Update tracker: OK
* Check Bug-Url::OK
* Check Public Bug::#1279555::OK, public bug
* Check Product::#1279555::OK, Correct classification oVirt
* Check TM::SKIP, not in a monitored branch (ovirt-3.6 ovirt-4.0)
* Check merged to previous::IGNORE, Not in stable branch (['ovirt-3.6', 'ovirt-4.0'])
--
To view, visit https://gerrit.ovirt.org/58728
To unsubscribe, visit https://gerrit.ovirt.org/settings
Gerrit-MessageType: comment
Gerrit-Change-Id: I3849829aca50b30742e9c860d7c19296d6361015
Gerrit-PatchSet: 12
Gerrit-Project: vdsm
Gerrit-Branch: master
Gerrit-Owner: Irit Goihman <igoihman(a)redhat.com>
Gerrit-Reviewer: Dan Kenigsberg <danken(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: Yaniv Bronhaim <ybronhei(a)redhat.com>
Gerrit-Reviewer: gerrit-hooks <automation(a)ovirt.org>
Gerrit-HasComments: No
7 years, 10 months
Change in vdsm[master]: vdsm.conf: Add drop-in dir
by automation＠ovirt.org
gerrit-hooks has posted comments on this change.
Change subject: vdsm.conf: Add drop-in dir
......................................................................
Patch Set 11:
* #1279555::Update tracker: OK
* Check Bug-Url::OK
* Check Public Bug::#1279555::OK, public bug
* Check Product::#1279555::OK, Correct classification oVirt
* Check TM::SKIP, not in a monitored branch (ovirt-3.6 ovirt-4.0)
* Check merged to previous::IGNORE, Not in stable branch (['ovirt-3.6', 'ovirt-4.0'])
--
To view, visit https://gerrit.ovirt.org/58728
To unsubscribe, visit https://gerrit.ovirt.org/settings
Gerrit-MessageType: comment
Gerrit-Change-Id: I3849829aca50b30742e9c860d7c19296d6361015
Gerrit-PatchSet: 11
Gerrit-Project: vdsm
Gerrit-Branch: master
Gerrit-Owner: Irit Goihman <igoihman(a)redhat.com>
Gerrit-Reviewer: Dan Kenigsberg <danken(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: Yaniv Bronhaim <ybronhei(a)redhat.com>
Gerrit-Reviewer: gerrit-hooks <automation(a)ovirt.org>
Gerrit-HasComments: No
7 years, 10 months
Change in vdsm[master]: Adding report_stats to virt.stats
by fromani＠redhat.com
Francesco Romani has posted comments on this change.
Change subject: Adding report_stats to virt.stats
......................................................................
Patch Set 3:
(2 comments)
https://gerrit.ovirt.org/#/c/59066/3/lib/vdsm/virt/vmstats.py
File lib/vdsm/virt/vmstats.py:
Line 192:
Line 193: def report_stats(vms_stats):
Line 194: report = {}
Line 195: try:
Line 196: for stat in vms_stats:
do you plan to add more data to reports or that's it?
If you want to add more data, will the result of Vm._getRunningVmStats() sufficient for your needs or you'll need something more?
Line 197: prefix = "vms." + stat['vmName']
Line 198: report[prefix + '.cpu.user'] = stat['cpuUser']
Line 199: report[prefix + '.cpu.sys'] = stat['cpuSys']
Line 200:
PS3, Line 217: logging.exception('Report host stat failed to report key: %s' %
: (e.args[0],))
why not just
logging.exception('Report host stat failed to report key: %s', e.args[0])
besides that, do you want the full stacktrace (not sure how useful it is here)?
Could perhaps
logging.error(...)
be enough?
--
To view, visit https://gerrit.ovirt.org/59066
To unsubscribe, visit https://gerrit.ovirt.org/settings
Gerrit-MessageType: comment
Gerrit-Change-Id: Idf494c6a3087d04c12731c587b619f253dd51165
Gerrit-PatchSet: 3
Gerrit-Project: vdsm
Gerrit-Branch: master
Gerrit-Owner: Yaniv Bronhaim <ybronhei(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: Piotr Kliczewski <piotr.kliczewski(a)gmail.com>
Gerrit-Reviewer: Vinzenz Feenstra <vfeenstr(a)redhat.com>
Gerrit-Reviewer: Yaniv Bronhaim <ybronhei(a)redhat.com>
Gerrit-Reviewer: gerrit-hooks <automation(a)ovirt.org>
Gerrit-HasComments: Yes
7 years, 10 months
Change in vdsm[master]: Send vm and host reports each sampling interval from HostMon...
by fromani＠redhat.com
Francesco Romani has posted comments on this change.
Change subject: Send vm and host reports each sampling interval from HostMonitor
......................................................................
Patch Set 3:
(1 comment)
https://gerrit.ovirt.org/#/c/59067/3/lib/vdsm/virt/sampling.py
File lib/vdsm/virt/sampling.py:
PS3, Line 555: tmp_vmstats = self._cif.getAllVmStats()
this works, but I'm not sure it is the best solution. We want to send the runtime stats, right?
e.g. we don't care about VM configuration.
--
To view, visit https://gerrit.ovirt.org/59067
To unsubscribe, visit https://gerrit.ovirt.org/settings
Gerrit-MessageType: comment
Gerrit-Change-Id: I724199135b89f85ac8abe7dc8073412f4764bc51
Gerrit-PatchSet: 3
Gerrit-Project: vdsm
Gerrit-Branch: master
Gerrit-Owner: Yaniv Bronhaim <ybronhei(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: Piotr Kliczewski <piotr.kliczewski(a)gmail.com>
Gerrit-Reviewer: gerrit-hooks <automation(a)ovirt.org>
Gerrit-HasComments: Yes
7 years, 10 months
Change in vdsm[ovirt-4.0]: jsonrpc: close client
by fromani＠redhat.com
Francesco Romani has submitted this change and it was merged.
Change subject: jsonrpc: close client
......................................................................
jsonrpc: close client
We want to explicitly expose ability to close resources like a socket
which is used to communicate and a reactor.
Change-Id: Icd066fa02f93e20aa28fcede76e09c79da2e9e38
Bug-Url: https://bugzilla.redhat.com/1343005
Signed-off-by: Piotr Kliczewski <piotr.kliczewski(a)gmail.com>
Reviewed-on: https://gerrit.ovirt.org/57942
Reviewed-by: Nir Soffer <nsoffer(a)redhat.com>
Continuous-Integration: Jenkins CI
Reviewed-by: Simone Tiraboschi <stirabos(a)redhat.com>
(cherry picked from commit 3359e6431ec1eaf8c06f71427de4c90d4aec8238)
Reviewed-on: https://gerrit.ovirt.org/59106
Tested-by: Simone Tiraboschi <stirabos(a)redhat.com>
Reviewed-by: Francesco Romani <fromani(a)redhat.com>
---
M lib/vdsm/jsonrpcvdscli.py
M lib/yajsonrpc/betterAsyncore.py
M lib/yajsonrpc/stompreactor.py
A tests/better_asyncore_tests.py
4 files changed, 78 insertions(+), 0 deletions(-)
Approvals:
Simone Tiraboschi: Verified; Looks good to me, but someone else must approve
Jenkins CI: Passed CI tests
Francesco Romani: Looks good to me, approved
--
To view, visit https://gerrit.ovirt.org/59106
To unsubscribe, visit https://gerrit.ovirt.org/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Icd066fa02f93e20aa28fcede76e09c79da2e9e38
Gerrit-PatchSet: 2
Gerrit-Project: vdsm
Gerrit-Branch: ovirt-4.0
Gerrit-Owner: Piotr Kliczewski <piotr.kliczewski(a)gmail.com>
Gerrit-Reviewer: Francesco Romani <fromani(a)redhat.com>
Gerrit-Reviewer: Jenkins CI
Gerrit-Reviewer: Piotr Kliczewski <piotr.kliczewski(a)gmail.com>
Gerrit-Reviewer: Simone Tiraboschi <stirabos(a)redhat.com>
Gerrit-Reviewer: Yaniv Bronhaim <ybronhei(a)redhat.com>
Gerrit-Reviewer: gerrit-hooks <automation(a)ovirt.org>
7 years, 10 months
Change in vdsm[ovirt-4.0]: jsonrpc: close client
by fromani＠redhat.com
Francesco Romani has posted comments on this change.
Change subject: jsonrpc: close client
......................................................................
Patch Set 1: Code-Review+2
raising score
--
To view, visit https://gerrit.ovirt.org/59106
To unsubscribe, visit https://gerrit.ovirt.org/settings
Gerrit-MessageType: comment
Gerrit-Change-Id: Icd066fa02f93e20aa28fcede76e09c79da2e9e38
Gerrit-PatchSet: 1
Gerrit-Project: vdsm
Gerrit-Branch: ovirt-4.0
Gerrit-Owner: Piotr Kliczewski <piotr.kliczewski(a)gmail.com>
Gerrit-Reviewer: Francesco Romani <fromani(a)redhat.com>
Gerrit-Reviewer: Jenkins CI
Gerrit-Reviewer: Piotr Kliczewski <piotr.kliczewski(a)gmail.com>
Gerrit-Reviewer: Simone Tiraboschi <stirabos(a)redhat.com>
Gerrit-Reviewer: Yaniv Bronhaim <ybronhei(a)redhat.com>
Gerrit-Reviewer: gerrit-hooks <automation(a)ovirt.org>
Gerrit-HasComments: No
7 years, 10 months
Change in vdsm[ovirt-4.0]: jsonrpc: close client
by stirabos＠redhat.com
Simone Tiraboschi has posted comments on this change.
Change subject: jsonrpc: close client
......................................................................
Patch Set 1: Code-Review+1 Verified+1
Verified:
The open file count on eventfd get back to 4.
[root@c72he20160615h1 ~]# lsof | grep ovirt-ha | grep event | wc -l
4
[root@c72he20160615h1 ~]# lsof | grep ovirt-ha | grep event | wc -l
4
[root@c72he20160615h1 ~]# lsof | grep ovirt-ha | grep event | wc -l
12
[root@c72he20160615h1 ~]# lsof | grep ovirt-ha | grep event | wc -l
4
[root@c72he20160615h1 ~]# lsof | grep ovirt-ha | grep event | wc -l
12
[root@c72he20160615h1 ~]# lsof | grep ovirt-ha | grep event | wc -l
24
[root@c72he20160615h1 ~]# lsof | grep ovirt-ha | grep event | wc -l
4
[root@c72he20160615h1 ~]# lsof | grep ovirt-ha | grep event | wc -l
4
--
To view, visit https://gerrit.ovirt.org/59106
To unsubscribe, visit https://gerrit.ovirt.org/settings
Gerrit-MessageType: comment
Gerrit-Change-Id: Icd066fa02f93e20aa28fcede76e09c79da2e9e38
Gerrit-PatchSet: 1
Gerrit-Project: vdsm
Gerrit-Branch: ovirt-4.0
Gerrit-Owner: Piotr Kliczewski <piotr.kliczewski(a)gmail.com>
Gerrit-Reviewer: Francesco Romani <fromani(a)redhat.com>
Gerrit-Reviewer: Jenkins CI
Gerrit-Reviewer: Piotr Kliczewski <piotr.kliczewski(a)gmail.com>
Gerrit-Reviewer: Simone Tiraboschi <stirabos(a)redhat.com>
Gerrit-Reviewer: Yaniv Bronhaim <ybronhei(a)redhat.com>
Gerrit-Reviewer: gerrit-hooks <automation(a)ovirt.org>
Gerrit-HasComments: No
7 years, 10 months
Change in vdsm[ovirt-3.6]: jsonrpc: events: do not send events on recovery
by fromani＠redhat.com
Hello Piotr Kliczewski, Dan Kenigsberg,
I'd like you to do a code review. Please visit
https://gerrit.ovirt.org/59235
to review the following change.
Change subject: jsonrpc: events: do not send events on recovery
......................................................................
jsonrpc: events: do not send events on recovery
While the recovery is in progress, Vdsm should
not answer to API calls, to avoid reporting incomplete
or misleading data.
It should not send events as well.
Change-Id: I9fec865604fa872d2cfefc8bd72f0aa1a5712863
Backport-To: 4.0
Backport-To: 3.6
Bug-Url: https://bugzilla.redhat.com/1339291
Signed-off-by: Francesco Romani <fromani(a)redhat.com>
Reviewed-on: https://gerrit.ovirt.org/58890
Reviewed-by: Dan Kenigsberg <danken(a)redhat.com>
Reviewed-by: Piotr Kliczewski <piotr.kliczewski(a)gmail.com>
Continuous-Integration: Jenkins CI
Reviewed-on: https://gerrit.ovirt.org/59230
---
M tests/clientifTests.py
M tests/vmfakelib.py
M vdsm/clientIF.py
3 files changed, 63 insertions(+), 4 deletions(-)
git pull ssh://gerrit.ovirt.org:29418/vdsm refs/changes/35/59235/1
diff --git a/tests/clientifTests.py b/tests/clientifTests.py
index 30725cd..6286d42 100644
--- a/tests/clientifTests.py
+++ b/tests/clientifTests.py
@@ -18,6 +18,7 @@
# Refer to the README and COPYING files for full details of the license
#
+import json
import os.path
from testlib import VdsmTestCase as TestCaseBase
from testlib import temporaryPath
@@ -212,3 +213,29 @@
self.assertEqual(len(vms), 2)
self.assertIn(testvm1.id, vms)
self.assertIn(testvm2.id, vms)
+
+
+class TestNotification(TestCaseBase):
+
+ TEST_EVENT_NAME = 'test_event'
+
+ def setUp(self):
+ self.cif = fake.ClientIF()
+ self.serv = fake.JsonRpcServer()
+ self.cif.bindings["jsonrpc"] = self.serv
+
+ def test_notify(self):
+ self.assertTrue(self.cif.ready)
+ self.cif.notify(self.TEST_EVENT_NAME)
+ message, address = self.serv.notifications[0]
+ self._assertEvent(message, self.TEST_EVENT_NAME)
+
+ def test_skip_notify_in_recovery(self):
+ self.cif._recovery = True
+ self.assertFalse(self.cif.ready)
+ self.cif.notify('test_event')
+ self.assertEquals(self.serv.notifications, [])
+
+ def _assertEvent(self, event, method):
+ ev = json.loads(event)
+ self.assertEquals(ev["method"], method)
diff --git a/tests/vmfakelib.py b/tests/vmfakelib.py
index e4413b1..a21ef79 100644
--- a/tests/vmfakelib.py
+++ b/tests/vmfakelib.py
@@ -149,17 +149,44 @@
return uuid, usage_type, usage_id, description
+class IRS(object):
+
+ def __init__(self):
+ self.ready = True
+
+ def inappropriateDevices(self, ident):
+ pass
+
+
+class _Server(object):
+ def __init__(self, notifications):
+ self.notifications = notifications
+
+ def send(self, message, address):
+ self.notifications.append((message, address))
+
+
+class _Reactor(object):
+ def __init__(self, notifications):
+ self.server = _Server(notifications)
+
+
+class JsonRpcServer(object):
+ def __init__(self):
+ self.notifications = []
+ self.reactor = _Reactor(self.notifications)
+
+
class ClientIF(clientIF.clientIF):
def __init__(self):
# the bare minimum initialization for our test needs.
- self.irs = None # just to make sure nothing ever happens
+ self.irs = IRS()
self.log = logging.getLogger('fake.ClientIF')
self.channelListener = None
self.vmContainerLock = threading.Lock()
self.vmContainer = {}
-
- def notify(self, event_id, **kwargs):
- pass
+ self.bindings = {}
+ self._recovery = False
class Domain(object):
diff --git a/vdsm/clientIF.py b/vdsm/clientIF.py
index ebb21ef..06d3a35 100644
--- a/vdsm/clientIF.py
+++ b/vdsm/clientIF.py
@@ -149,6 +149,11 @@
event_id and a dictionary as event body. Before sending
there is notify_time added on top level to the dictionary.
"""
+ if not self.ready:
+ self.log.warning('Not ready yet, ignoring event %r args=%r',
+ event_id, kwargs)
+ return
+
notification = Notification(
event_id,
self._send_notification,
--
To view, visit https://gerrit.ovirt.org/59235
To unsubscribe, visit https://gerrit.ovirt.org/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I9fec865604fa872d2cfefc8bd72f0aa1a5712863
Gerrit-PatchSet: 1
Gerrit-Project: vdsm
Gerrit-Branch: ovirt-3.6
Gerrit-Owner: Francesco Romani <fromani(a)redhat.com>
Gerrit-Reviewer: Dan Kenigsberg <danken(a)redhat.com>
Gerrit-Reviewer: Piotr Kliczewski <piotr.kliczewski(a)gmail.com>
7 years, 10 months
Change in vdsm[master]: rpc: Log important info from VM stats
by fromani＠redhat.com
Francesco Romani has posted comments on this change.
Change subject: rpc: Log important info from VM stats
......................................................................
Patch Set 16: Code-Review+1
--
To view, visit https://gerrit.ovirt.org/58465
To unsubscribe, visit https://gerrit.ovirt.org/settings
Gerrit-MessageType: comment
Gerrit-Change-Id: Ifcbac615323b62fb9a27e5c0f5a4e98990076146
Gerrit-PatchSet: 16
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: Michal Skrivanek <michal.skrivanek(a)redhat.com>
Gerrit-Reviewer: Milan Zamazal <mzamazal(a)redhat.com>
Gerrit-Reviewer: Nir Soffer <nsoffer(a)redhat.com>
Gerrit-Reviewer: Piotr Kliczewski <piotr.kliczewski(a)gmail.com>
Gerrit-Reviewer: gerrit-hooks <automation(a)ovirt.org>
Gerrit-HasComments: No
7 years, 10 months
Change in vdsm[master]: rpc: Use Suppressed class instead of logging workarounds
by fromani＠redhat.com
Francesco Romani has posted comments on this change.
Change subject: rpc: Use Suppressed class instead of logging workarounds
......................................................................
Patch Set 3: Code-Review+1
looks good to me.
--
To view, visit https://gerrit.ovirt.org/59078
To unsubscribe, visit https://gerrit.ovirt.org/settings
Gerrit-MessageType: comment
Gerrit-Change-Id: Idaf00e557fccb8f08fa3aeb38d51cb4bbe0ffe53
Gerrit-PatchSet: 3
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: Milan Zamazal <mzamazal(a)redhat.com>
Gerrit-Reviewer: Nir Soffer <nsoffer(a)redhat.com>
Gerrit-Reviewer: Piotr Kliczewski <piotr.kliczewski(a)gmail.com>
Gerrit-Reviewer: gerrit-hooks <automation(a)ovirt.org>
Gerrit-HasComments: No
7 years, 10 months