Change in vdsm[ovirt-4.1]: api: adding context for api calls
by Code Review
From Yaniv Bronhaim <ybronhei(a)redhat.com>:
Yaniv Bronhaim has posted comments on this change.
Change subject: api: adding context for api calls
......................................................................
Patch Set 2: Code-Review+2
--
To view, visit https://gerrit.ovirt.org/77172
To unsubscribe, visit https://gerrit.ovirt.org/settings
Gerrit-MessageType: comment
Gerrit-Change-Id: I8e73edc929e6d3e55d3f33a51229180ba35c52ac
Gerrit-PatchSet: 2
Gerrit-Project: vdsm
Gerrit-Branch: ovirt-4.1
Gerrit-Owner: Piotr Kliczewski <piotr.kliczewski(a)gmail.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: No
6 years, 11 months
Change in vdsm[master]: check-merged: adding virtTests
by Code Review
From Yaniv Bronhaim <ybronhei(a)redhat.com>:
Yaniv Bronhaim has uploaded a new change for review.
Change subject: check-merged: adding virtTests
......................................................................
check-merged: adding virtTests
Change-Id: Ibdd67ff59beb20a13c187087e9cfa148ba705eb6
Signed-off-by: Yaniv Bronhaim <ybronhei(a)redhat.com>
---
M automation/check-merged.sh
1 file changed, 19 insertions(+), 1 deletion(-)
git pull ssh://gerrit.ovirt.org:29418/vdsm refs/changes/37/70837/1
diff --git a/automation/check-merged.sh b/automation/check-merged.sh
index e6933b9..c913610 100755
--- a/automation/check-merged.sh
+++ b/automation/check-merged.sh
@@ -65,6 +65,20 @@
return $res
}
+function run_virt_tests {
+ local res=0
+ lago shell "$VM_NAME" -c \
+ " \
+ cd /usr/share/vdsm/tests
+ ./run_tests.sh \
+ --with-xunit \
+ --xunit-file=/tmp/nosetests-${DISTRO}.xml \
+ -s \
+ functional/virtTests.py \
+ " || res=$?
+ return $res
+}
+
function run_network_tests {
local res=0
lago shell "$VM_NAME" -c \
@@ -113,9 +127,13 @@
function run_all_tests {
run_infra_tests | tee "$EXPORTS/functional_tests_stdout.$DISTRO.log"
- failed="${PIPESTATUS[0]}"
+ local failed="${PIPESTATUS[0]}"
run_network_tests | tee -a "$EXPORTS/functional_tests_stdout.$DISTRO.log"
+ local res="${PIPESTATUS[0]}"
+ [ "$res" -ne 0 ] && failed="$res"
+
+ run_virt_tests | tee -a "$EXPORTS/functional_tests_stdout.$DISTRO.log"
res="${PIPESTATUS[0]}"
[ "$res" -ne 0 ] && failed="$res"
}
--
To view, visit https://gerrit.ovirt.org/70837
To unsubscribe, visit https://gerrit.ovirt.org/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ibdd67ff59beb20a13c187087e9cfa148ba705eb6
Gerrit-PatchSet: 1
Gerrit-Project: vdsm
Gerrit-Branch: master
Gerrit-Owner: Yaniv Bronhaim <ybronhei(a)redhat.com>
6 years, 11 months
Change in vdsm[master]: ci: align with new ci junit suffix for nose xml output
by Code Review
From Yaniv Bronhaim <ybronhei(a)redhat.com>:
Yaniv Bronhaim has uploaded a new change for review.
Change subject: ci: align with new ci junit suffix for nose xml output
......................................................................
ci: align with new ci junit suffix for nose xml output
Change-Id: I76b1df84eaaa053cc6c3acfafc630454edacedf2
Signed-off-by: Yaniv Bronhaim <ybronhei(a)redhat.com>
---
M automation/check-merged.sh
1 file changed, 1 insertion(+), 1 deletion(-)
git pull ssh://gerrit.ovirt.org:29418/vdsm refs/changes/21/75221/1
diff --git a/automation/check-merged.sh b/automation/check-merged.sh
index 742681d..98045f3 100755
--- a/automation/check-merged.sh
+++ b/automation/check-merged.sh
@@ -139,7 +139,7 @@
mkdir "$EXPORTS"/lago-logs
lago copy-from-vm "$VM_NAME" \
"/tmp/nosetests-${DISTRO}.xml" \
- "$EXPORTS/nosetests-${DISTRO}.xml" || :
+ "$EXPORTS/nosetests-${DISTRO}.junit.xml" || :
lago collect --output "$EXPORTS"/lago-logs
cp "$PREFIX"/current/logs/*.log "$EXPORTS"/lago-logs
}
--
To view, visit https://gerrit.ovirt.org/75221
To unsubscribe, visit https://gerrit.ovirt.org/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I76b1df84eaaa053cc6c3acfafc630454edacedf2
Gerrit-PatchSet: 1
Gerrit-Project: vdsm
Gerrit-Branch: master
Gerrit-Owner: Yaniv Bronhaim <ybronhei(a)redhat.com>
6 years, 11 months
Change in vdsm[master]: virt: graphics: resolve specParams[displayNetwork] once
by Code Review
From Dan Kenigsberg <danken(a)redhat.com>:
Dan Kenigsberg has uploaded a new change for review.
Change subject: virt: graphics: resolve specParams[displayNetwork] once
......................................................................
virt: graphics: resolve specParams[displayNetwork] once
Once we know we have a valid display_network, we'd better use it.
This patch has no functional change.
Change-Id: Ic211c4685b1de5fee08490dcae53b1c01596db5d
Signed-off-by: Dan Kenigsberg <danken(a)redhat.com>
---
M lib/vdsm/virt/vmdevices/graphics.py
1 file changed, 1 insertion(+), 2 deletions(-)
git pull ssh://gerrit.ovirt.org:29418/vdsm refs/changes/56/77156/1
diff --git a/lib/vdsm/virt/vmdevices/graphics.py b/lib/vdsm/virt/vmdevices/graphics.py
index d73924e..acc289d 100644
--- a/lib/vdsm/virt/vmdevices/graphics.py
+++ b/lib/vdsm/virt/vmdevices/graphics.py
@@ -158,8 +158,7 @@
elif display_network:
graphics.appendChildWithArgs(
'listen', type='network',
- network=libvirtnetwork.netname_o2l(
- self.specParams['displayNetwork']))
+ network=libvirtnetwork.netname_o2l(display_network))
else:
graphics.setAttrs(listen='0')
--
To view, visit https://gerrit.ovirt.org/77156
To unsubscribe, visit https://gerrit.ovirt.org/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ic211c4685b1de5fee08490dcae53b1c01596db5d
Gerrit-PatchSet: 1
Gerrit-Project: vdsm
Gerrit-Branch: master
Gerrit-Owner: Dan Kenigsberg <danken(a)redhat.com>
6 years, 11 months
Change in vdsm[master]: virt: devices: graphics: add from_xml_tree
by Code Review
From Dan Kenigsberg <danken(a)redhat.com>:
Dan Kenigsberg has posted comments on this change.
Change subject: virt: devices: graphics: add from_xml_tree
......................................................................
Patch Set 37:
(2 comments)
minor comment, but generally you have my blessing.
https://gerrit.ovirt.org/#/c/73261/37/lib/vdsm/virt/vmdevices/graphics.py
File lib/vdsm/virt/vmdevices/graphics.py:
PS37, Line 178: self.specParams['displayNetwork'])
this should have been display_network, no need to __getitem__ twice.
PS37, Line 292: if dev.attrib.get('listen') == '0':
: specParams['displayIp'] = '0'
I'm not sure we should prefer this deprecated libvirt attrib. Actually, I think we should drop these two lines, as we would explode on find_first('listen') if the new prefereed listen element does not exist.
--
To view, visit https://gerrit.ovirt.org/73261
To unsubscribe, visit https://gerrit.ovirt.org/settings
Gerrit-MessageType: comment
Gerrit-Change-Id: Iacbd97217042e38e03cf4f8cee947287b9d3a945
Gerrit-PatchSet: 37
Gerrit-Project: vdsm
Gerrit-Branch: master
Gerrit-Owner: Francesco Romani <fromani(a)redhat.com>
Gerrit-Reviewer: Dan Kenigsberg <danken(a)redhat.com>
Gerrit-Reviewer: Edward Haas <edwardh(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>
Gerrit-HasComments: Yes
6 years, 11 months
Change in vdsm[master]: network: use driverloader in vdsm.network.link.bond
by Code Review
From Dan Kenigsberg <danken(a)redhat.com>:
Dan Kenigsberg has submitted this change and it was merged.
Change subject: network: use driverloader in vdsm.network.link.bond
......................................................................
network: use driverloader in vdsm.network.link.bond
Change-Id: Iafca5ab6c546ab0f515164b2bdfc71fb0f5422cf
Signed-off-by: Petr Horacek <phoracek(a)redhat.com>
---
M lib/vdsm/network/link/bond/__init__.py
1 file changed, 8 insertions(+), 16 deletions(-)
Approvals:
Jenkins CI: Passed CI tests
Petr Horáček: Verified
Edward Haas: Looks good to me, approved
--
To view, visit https://gerrit.ovirt.org/77045
To unsubscribe, visit https://gerrit.ovirt.org/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Iafca5ab6c546ab0f515164b2bdfc71fb0f5422cf
Gerrit-PatchSet: 5
Gerrit-Project: vdsm
Gerrit-Branch: master
Gerrit-Owner: Petr Horáček <phoracek(a)redhat.com>
Gerrit-Reviewer: Dan Kenigsberg <danken(a)redhat.com>
Gerrit-Reviewer: Edward Haas <edwardh(a)redhat.com>
Gerrit-Reviewer: Jenkins CI
Gerrit-Reviewer: Petr Horacek <phoracek(a)redhat.com>
Gerrit-Reviewer: Petr Horáček <phoracek(a)redhat.com>
Gerrit-Reviewer: gerrit-hooks <automation(a)ovirt.org>
6 years, 11 months
Change in vdsm[master]: ssl: remove m2crypto
by Code Review
From Dan Kenigsberg <danken(a)redhat.com>:
Dan Kenigsberg has submitted this change and it was merged.
Change subject: ssl: remove m2crypto
......................................................................
ssl: remove m2crypto
We introduced this library because it supports ssl session caching which
improved performance of xmlrpc communication where we established many
connections. Now with jsonrpc we connect once and we maintain the
connection for long time so cached session do not give us any benefits.
By removing m2crypto we reduce maintenance pain of supporting two ssl
libraries.
Change-Id: Iab4f2f745e19d90dbb10206a96bdbd29fd77a420
Signed-off-by: Piotr Kliczewski <piotr.kliczewski(a)gmail.com>
---
M automation/build-artifacts.packages.el7
M automation/build-artifacts.packages.fc24
M automation/build-artifacts.packages.fc25
M automation/check-merged.packages.el7
M automation/check-merged.packages.fc24
M automation/check-patch.packages.el7
M automation/check-patch.packages.fc24
M automation/check-patch.packages.fc25
M lib/vdsm/Makefile.am
M lib/vdsm/config.py.in
M lib/vdsm/kaxmlrpclib.py
D lib/vdsm/m2cutils.py
M lib/vdsm/protocoldetector.py
D lib/vdsm/sslcompat.py
M lib/vdsm/virt/migration.py
M lib/yajsonrpc/betterAsyncore.py
M lib/yajsonrpc/stompreactor.py
M tests/integration/Makefile.am
M tests/integration/jsonRpcHelper.py
D tests/integration/m2chelper.py
M tests/network/netfunctestlib.py
M tests/protocoldetector_test.py
M tests/ssl_test.py
M tests/stomp_test.py
M vdsm.spec.in
M vdsm/clientIF.py
26 files changed, 17 insertions(+), 502 deletions(-)
Approvals:
Piotr Kliczewski: Verified
Martin Peřina: Looks good to me, but someone else must approve
Jenkins CI: Passed CI tests
Dan Kenigsberg: Looks good to me, approved
Edward Haas: Looks good to me, but someone else must approve
--
To view, visit https://gerrit.ovirt.org/76027
To unsubscribe, visit https://gerrit.ovirt.org/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Iab4f2f745e19d90dbb10206a96bdbd29fd77a420
Gerrit-PatchSet: 10
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: Edward Haas <edwardh(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: Martin Peřina <mperina(a)redhat.com>
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>
6 years, 11 months
Change in vdsm[master]: ssl: remove m2crypto
by Code Review
From Dan Kenigsberg <danken(a)redhat.com>:
Dan Kenigsberg has posted comments on this change.
Change subject: ssl: remove m2crypto
......................................................................
Patch Set 9: Code-Review+2
--
To view, visit https://gerrit.ovirt.org/76027
To unsubscribe, visit https://gerrit.ovirt.org/settings
Gerrit-MessageType: comment
Gerrit-Change-Id: Iab4f2f745e19d90dbb10206a96bdbd29fd77a420
Gerrit-PatchSet: 9
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: Edward Haas <edwardh(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: Martin Peřina <mperina(a)redhat.com>
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: No
6 years, 11 months
Change in vdsm[master]: logutils: drop TracebackRepeatFilter
by Code Review
From Dan Kenigsberg <danken(a)redhat.com>:
Dan Kenigsberg has uploaded a new change for review.
Change subject: logutils: drop TracebackRepeatFilter
......................................................................
logutils: drop TracebackRepeatFilter
Since its introduction in prehitoric commit 6f8a7a7 due to rhbz#572050,
logger.conf had a wrong reference to TracebackRepeatFilter. The class
has never been used in production code, and it is time to retire it.
Change-Id: I599964083ea3827984da5a972dc2947ca8631740
Signed-off-by: Dan Kenigsberg <danken(a)redhat.com>
---
M lib/vdsm/logUtils.py
M static/etc/vdsm/logger.conf.in
M static/etc/vdsm/svdsm.logger.conf.in
3 files changed, 0 insertions(+), 22 deletions(-)
git pull ssh://gerrit.ovirt.org:29418/vdsm refs/changes/62/77062/1
diff --git a/lib/vdsm/logUtils.py b/lib/vdsm/logUtils.py
index 9b8e0c5..7a10976 100644
--- a/lib/vdsm/logUtils.py
+++ b/lib/vdsm/logUtils.py
@@ -97,26 +97,6 @@
return self.prefix + msg, kwargs
-class TracebackRepeatFilter(logging.Filter):
- """
- Makes sure a traceback is logged only once for each exception.
- """
- def filter(self, record):
- if not record.exc_info:
- return 1
-
- info = sys.exc_info()
- ex = info[1]
- if ex is None:
- return 1
-
- if hasattr(ex, "_logged") and ex._logged:
- record.exc_info = False
- ex._logged = True
-
- return 1
-
-
class QueueHandler(logging.Handler):
"""
This handler sends events to a queue. Typically, it would be used together
diff --git a/static/etc/vdsm/logger.conf.in b/static/etc/vdsm/logger.conf.in
index 7be5f6b..d669a97 100644
--- a/static/etc/vdsm/logger.conf.in
+++ b/static/etc/vdsm/logger.conf.in
@@ -63,7 +63,6 @@
[handler_logfile]
class=vdsm.logUtils.UserGroupEnforcingHandler
args=('@VDSMUSER@', '@VDSMGROUP@', '@VDSMLOGDIR(a)/vdsm.log',)
-filters=storage.misc.TracebackRepeatFilter
level=DEBUG
formatter=long
diff --git a/static/etc/vdsm/svdsm.logger.conf.in b/static/etc/vdsm/svdsm.logger.conf.in
index 2b3e21e..c40624f 100644
--- a/static/etc/vdsm/svdsm.logger.conf.in
+++ b/static/etc/vdsm/svdsm.logger.conf.in
@@ -27,7 +27,6 @@
[handler_logfile]
class=vdsm.logUtils.UserGroupEnforcingHandler
args=('root', 'root', '@VDSMLOGDIR(a)/supervdsm.log',)
-filters=storage.misc.TracebackRepeatFilter
level=DEBUG
formatter=long
--
To view, visit https://gerrit.ovirt.org/77062
To unsubscribe, visit https://gerrit.ovirt.org/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I599964083ea3827984da5a972dc2947ca8631740
Gerrit-PatchSet: 1
Gerrit-Project: vdsm
Gerrit-Branch: master
Gerrit-Owner: Dan Kenigsberg <danken(a)redhat.com>
6 years, 11 months
Change in vdsm[master]: logutils: drop QueueHandler
by Code Review
From Dan Kenigsberg <danken(a)redhat.com>:
Dan Kenigsberg has uploaded a new change for review.
Change subject: logutils: drop QueueHandler
......................................................................
logutils: drop QueueHandler
The last usage of QueueHandler was removed by
http://gerrit.ovirt.org/4318 .
There is no need to keep this class around.
Change-Id: I725157f355c3c9be2b1a6521b83cde710a097653
Signed-off-by: Dan Kenigsberg <danken(a)redhat.com>
---
M lib/vdsm/logUtils.py
1 file changed, 0 insertions(+), 52 deletions(-)
git pull ssh://gerrit.ovirt.org:29418/vdsm refs/changes/63/77063/1
diff --git a/lib/vdsm/logUtils.py b/lib/vdsm/logUtils.py
index 7a10976..e406876 100644
--- a/lib/vdsm/logUtils.py
+++ b/lib/vdsm/logUtils.py
@@ -97,58 +97,6 @@
return self.prefix + msg, kwargs
-class QueueHandler(logging.Handler):
- """
- This handler sends events to a queue. Typically, it would be used together
- with a multiprocessing Queue to centralise logging to file in one process
- (in a multi-process application), so as to avoid file write contention
- between processes.
-
- This code is new in Python 3.2, but this class can be copy pasted into
- user code for use with earlier Python versions.
- """
-
- def __init__(self, queue):
- """
- Initialise an instance, using the passed queue.
- """
- logging.Handler.__init__(self)
- self.queue = queue
-
- def enqueue(self, record):
- """
- Enqueue a record.
-
- The base implementation uses put_nowait. You may want to override
- this method if you want to use blocking, timeouts or custom queue
- implementations.
- """
- self.queue.put_nowait(record)
-
- def emit(self, record):
- """
- Emit a record.
-
- Writes the LogRecord to the queue, preparing it for pickling first.
- """
- try:
- # The format operation gets traceback text into record.exc_text
- # (if there's exception data), and also puts the message into
- # record.message. We can then use this to replace the original
- # msg + args, as these might be unpickleable. We also zap the
- # exc_info attribute, as it's no longer needed and, if not None,
- # will typically not be pickleable.
- self.format(record)
- record.msg = record.message
- record.args = None
- record.exc_info = None
- self.enqueue(record)
- except (KeyboardInterrupt, SystemExit):
- raise
- except:
- self.handleError(record)
-
-
class UserGroupEnforcingHandler(logging.handlers.WatchedFileHandler):
"""
This log handler acts like WatchedFileHandler.
--
To view, visit https://gerrit.ovirt.org/77063
To unsubscribe, visit https://gerrit.ovirt.org/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I725157f355c3c9be2b1a6521b83cde710a097653
Gerrit-PatchSet: 1
Gerrit-Project: vdsm
Gerrit-Branch: master
Gerrit-Owner: Dan Kenigsberg <danken(a)redhat.com>
6 years, 11 months