Yaniv Bronhaim has uploaded a new change for review. Change subject: moving zombieReaper to lib/vdsm ......................................................................
moving zombieReaper to lib/vdsm Change-Id: I0d6040f3bfe2cdc34c04e3d460cccaa9df1048b1 Signed-off-by: Yaniv Bronhaim <[email protected]> --- M debian/vdsm-python.install M debian/vdsm.install M lib/vdsm/Makefile.am M lib/vdsm/utils.py R lib/vdsm/zombieReaper.py M tests/testrunner.py M tests/zombieReaperTests.py M vdsm.spec.in M vdsm/Makefile.am M vdsm/storage/remoteFileHandler.py M vdsm/vdsm 11 files changed, 8 insertions(+), 11 deletions(-) git pull ssh://gerrit.ovirt.org:29418/vdsm refs/changes/26/23226/1 diff --git a/debian/vdsm-python.install b/debian/vdsm-python.install index 0e73bfb..362473b 100644 --- a/debian/vdsm-python.install +++ b/debian/vdsm-python.install @@ -22,5 +22,6 @@ ./usr/lib/python2.7/dist-packages/vdsm/tool/validate_ovirt_certs.py ./usr/lib/python2.7/dist-packages/vdsm/tool/vdsm-id.py ./usr/lib/python2.7/dist-packages/vdsm/utils.py +./usr/lib/python2.7/dist-packages/vdsm/zombieReaper.py ./usr/lib/python2.7/dist-packages/vdsm/vdscli.py ./usr/libexec/vdsm/libvirt_configure.sh diff --git a/debian/vdsm.install b/debian/vdsm.install index 89b6e6c..4667bb4 100644 --- a/debian/vdsm.install +++ b/debian/vdsm.install @@ -134,5 +134,4 @@ ./usr/share/vdsm/vdsmapi-schema.json ./usr/share/vdsm/vm.py ./usr/share/vdsm/vmChannels.py -./usr/share/vdsm/zombieReaper.py ./var/lib/polkit-1/localauthority/10-vendor.d/10-vdsm-libvirt-access.pkla diff --git a/lib/vdsm/Makefile.am b/lib/vdsm/Makefile.am index 0e30c5a..ce95200 100644 --- a/lib/vdsm/Makefile.am +++ b/lib/vdsm/Makefile.am @@ -31,6 +31,7 @@ qemuImg.py \ SecureXMLRPCServer.py \ utils.py \ + zombieReaper.py \ $(NULL) nodist_vdsmpylib_PYTHON = \ diff --git a/lib/vdsm/utils.py b/lib/vdsm/utils.py index 0d3ec91..57b3254 100644 --- a/lib/vdsm/utils.py +++ b/lib/vdsm/utils.py @@ -48,7 +48,7 @@ import subprocess import threading import time -import zombieReaper +from vdsm import zombieReaper from cpopen import CPopen as BetterPopen from config import config diff --git a/vdsm/zombieReaper.py b/lib/vdsm/zombieReaper.py similarity index 100% rename from vdsm/zombieReaper.py rename to lib/vdsm/zombieReaper.py diff --git a/tests/testrunner.py b/tests/testrunner.py index bf49dd1..f647aba 100644 --- a/tests/testrunner.py +++ b/tests/testrunner.py @@ -24,7 +24,7 @@ from functools import wraps import re -from vdsm import utils +from vdsm import utils, zombieReaper from nose import config from nose import core @@ -40,7 +40,6 @@ from testValidation import SlowTestsPlugin, StressTestsPlugin -import zombieReaper zombieReaper.registerSignalHandler() PERMUTATION_ATTR = "_permutations_" diff --git a/tests/zombieReaperTests.py b/tests/zombieReaperTests.py index ff5c641..b4051c9 100644 --- a/tests/zombieReaperTests.py +++ b/tests/zombieReaperTests.py @@ -21,7 +21,7 @@ import os from testrunner import VdsmTestCase as TestCaseBase -import zombieReaper +from vdsm import zombieReaper from cpopen import CPopen as BetterPopen diff --git a/vdsm.spec.in b/vdsm.spec.in index 8d3ba09..6f2a81f 100644 --- a/vdsm.spec.in +++ b/vdsm.spec.in @@ -858,7 +858,6 @@ %{_datadir}/%{vdsm_name}/vdsm-restore-net-config %{_datadir}/%{vdsm_name}/vdsm-store-net-config %{_datadir}/%{vdsm_name}/vm.py* -%{_datadir}/%{vdsm_name}/zombieReaper.py* %config(noreplace) %{_sysconfdir}/%{vdsm_name}/logger.conf %config(noreplace) %{_sysconfdir}/%{vdsm_name}/svdsm.logger.conf %config(noreplace) %{_sysconfdir}/%{vdsm_name}/mom.conf @@ -1052,6 +1051,7 @@ %{python_sitearch}/%{vdsm_name}/qemuImg.py* %{python_sitearch}/%{vdsm_name}/SecureXMLRPCServer.py* %{python_sitearch}/%{vdsm_name}/utils.py* +%{python_sitearch}/%{vdsm_name}/zombieReaper.py* %{python_sitearch}/%{vdsm_name}/vdscli.py* %{python_sitearch}/%{vdsm_name}/tool/__init__.py* %if 0%{?with_systemd} diff --git a/vdsm/Makefile.am b/vdsm/Makefile.am index 5ab291e..31965af 100644 --- a/vdsm/Makefile.am +++ b/vdsm/Makefile.am @@ -53,7 +53,6 @@ vdsmDebugPlugin.py \ vmChannels.py \ vm.py \ - zombieReaper.py \ $(NULL) dist_vdsmexec_SCRIPTS = \ diff --git a/vdsm/storage/remoteFileHandler.py b/vdsm/storage/remoteFileHandler.py index f01461f..c383edb 100644 --- a/vdsm/storage/remoteFileHandler.py +++ b/vdsm/storage/remoteFileHandler.py @@ -46,8 +46,7 @@ import misc import fileUtils -import zombieReaper -from vdsm import utils +from vdsm import utils, zombieReaper # Crabs are known for their remote process calls diff --git a/vdsm/vdsm b/vdsm/vdsm index 4fc11c7..957de53 100755 --- a/vdsm/vdsm +++ b/vdsm/vdsm @@ -20,8 +20,7 @@ import syslog from logging import config as lconfig -from vdsm import constants -import zombieReaper +from vdsm import constants, zombieReaper import dsaversion if sys.version_info[0] == 2: # as long as we work with Python 2, we need to monkey-patch threading -- To view, visit http://gerrit.ovirt.org/23226 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I0d6040f3bfe2cdc34c04e3d460cccaa9df1048b1 Gerrit-PatchSet: 1 Gerrit-Project: vdsm Gerrit-Branch: ovirt-3.3 Gerrit-Owner: Yaniv Bronhaim <[email protected]> _______________________________________________ vdsm-patches mailing list [email protected] https://lists.fedorahosted.org/mailman/listinfo/vdsm-patches
