Change in vdsm[master]: Revert supervdsm: Decorator for supervdsm proxied calls.
Dima Kuznetsov has posted comments on this change. Change subject: Revert supervdsm: Decorator for supervdsm proxied calls. .. Patch Set 1: I think the ease of use is not a vice. It faces only the developer of the function, and not the user, and allows you keep all the code related to some topic in the same place (vs another method in supervsdmServer). IMO it's irrelevant for whoever uses a specific function, to know whether it should be called through supervdsm proxy or otherwise. One such example is reading hardware info, you care about getting the system data, implementation details (such that dmidecode requires privileges) should be part of the concerns. And I'd trust whoever writes the module to tag only the relevant parts for supervdsm invocation. -- To view, visit https://gerrit.ovirt.org/45316 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: I1f83b4a8820f3fef437641329ba514742434dab4 Gerrit-PatchSet: 1 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Dan Kenigsberg dan...@redhat.com Gerrit-Reviewer: Dima Kuznetsov dkuzn...@redhat.com Gerrit-Reviewer: Francesco Romani from...@redhat.com Gerrit-Reviewer: Jenkins CI Gerrit-Reviewer: Nir Soffer nsof...@redhat.com Gerrit-Reviewer: Piotr Kliczewski piotr.kliczew...@gmail.com Gerrit-Reviewer: automat...@ovirt.org Gerrit-HasComments: No ___ vdsm-patches mailing list vdsm-patches@lists.fedorahosted.org https://lists.fedorahosted.org/mailman/listinfo/vdsm-patches
Change in vdsm[master]: dmidecodeUtil: move into lib
Dima Kuznetsov has posted comments on this change. Change subject: dmidecodeUtil: move into lib .. Patch Set 5: Verified+1 Build rpms with this change and deployed a host with it. VDSM reports correct hardware info. [root@host3 ~]# vdsClient -s 0 getVdsHardwareInfo systemFamily = 'Red Hat Enterprise Linux' systemManufacturer = 'Red Hat' systemProductName = 'KVM' systemUUID = 'D0C433B2-F0A0-4CE7-9A9A-0CF5A1CB8B58' systemVersion = 'RHEL 7.1.0 PC (i440FX + PIIX, 1996)' -- To view, visit https://gerrit.ovirt.org/44736 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: If190e2b7b07faaacdc81e59a12ec08d2bd83f4bb Gerrit-PatchSet: 5 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Dima Kuznetsov dkuzn...@redhat.com Gerrit-Reviewer: Dima Kuznetsov dkuzn...@redhat.com Gerrit-Reviewer: Jenkins CI Gerrit-Reviewer: Yeela Kaplan ykap...@redhat.com Gerrit-Reviewer: automat...@ovirt.org Gerrit-HasComments: No ___ vdsm-patches mailing list vdsm-patches@lists.fedorahosted.org https://lists.fedorahosted.org/mailman/listinfo/vdsm-patches
Change in vdsm[master]: mount: Perform mount and umount in supervdsm
Dima Kuznetsov has posted comments on this change. Change subject: mount: Perform mount and umount in supervdsm .. Patch Set 4: Code-Review-1 1. supervdsm was moved into lib/vdsm a few days ago, so please import it from vdsm. 2. I suggest you to take a look at https://gerrit.ovirt.org/#/c/44598/ It offers a mechanism to dispatch calls to supervdsm seamlessly if not running with root priv. I have a patch that uses it here: https://gerrit.ovirt.org/#/c/44599 -- To view, visit https://gerrit.ovirt.org/43969 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: I38fb0eed0ba3e2c36aba8ca4ec262032cb012fc2 Gerrit-PatchSet: 4 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Nir Soffer nsof...@redhat.com Gerrit-Reviewer: Adam Litke ali...@redhat.com Gerrit-Reviewer: Allon Mureinik amure...@redhat.com Gerrit-Reviewer: Dan Kenigsberg dan...@redhat.com Gerrit-Reviewer: Dima Kuznetsov dkuzn...@redhat.com Gerrit-Reviewer: Federico Simoncelli fsimo...@redhat.com Gerrit-Reviewer: Jenkins CI Gerrit-Reviewer: Nir Soffer nsof...@redhat.com Gerrit-Reviewer: Yaniv Bronhaim ybron...@redhat.com Gerrit-Reviewer: automat...@ovirt.org Gerrit-HasComments: No ___ vdsm-patches mailing list vdsm-patches@lists.fedorahosted.org https://lists.fedorahosted.org/mailman/listinfo/vdsm-patches
Change in vdsm[master]: supervdsm: Remove getHardwareInfo call
Dima Kuznetsov has posted comments on this change. Change subject: supervdsm: Remove getHardwareInfo call .. Patch Set 6: Hello, Nir. I disagree. Supervdsm is not pulling code from vdsm, it is using code found in its python path. You can add arbitrary code to supervdsm only if you have root access or some of the python path is owned by non-root users. In first case you can rewrite supervdsm itself and in the second, it is a security vulnerability not related to this patch. -- To view, visit https://gerrit.ovirt.org/44738 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: Ic2a863e47b9346e0cd49d8795feec89745de134e Gerrit-PatchSet: 6 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Dima Kuznetsov dkuzn...@redhat.com Gerrit-Reviewer: Dima Kuznetsov dkuzn...@redhat.com Gerrit-Reviewer: Jenkins CI Gerrit-Reviewer: Nir Soffer nsof...@redhat.com Gerrit-Reviewer: automat...@ovirt.org Gerrit-HasComments: No ___ vdsm-patches mailing list vdsm-patches@lists.fedorahosted.org https://lists.fedorahosted.org/mailman/listinfo/vdsm-patches
Change in vdsm[master]: supervdsm: Remove getHardwareInfo call
Dima Kuznetsov has posted comments on this change. Change subject: supervdsm: Remove getHardwareInfo call .. Patch Set 6: Nir, This approach only leads to more code duplication and in my opinion that's moving backwards. You're always going to rely on your python path, unless you decide to abandon python altogether for supervdsm which is somewhat extreme. If you want to limit what code goes into supervdsm, you have permissions mechanism to do this. I think that moving code into supervsdmServer is a generally bad idea, because, most of the time, when you have a module dedicated to something specific (like mounts), you'd like to have all your code in a single python file. Furthermore, most of the time, very small parts of it require privileges to run correctly. Having 2 sets of these functions serves no purpose, and is harder to manage. -- To view, visit https://gerrit.ovirt.org/44738 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: Ic2a863e47b9346e0cd49d8795feec89745de134e Gerrit-PatchSet: 6 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Dima Kuznetsov dkuzn...@redhat.com Gerrit-Reviewer: Dima Kuznetsov dkuzn...@redhat.com Gerrit-Reviewer: Jenkins CI Gerrit-Reviewer: Nir Soffer nsof...@redhat.com Gerrit-Reviewer: automat...@ovirt.org Gerrit-HasComments: No ___ vdsm-patches mailing list vdsm-patches@lists.fedorahosted.org https://lists.fedorahosted.org/mailman/listinfo/vdsm-patches
Change in vdsm[master]: ppc64HardwareInfo: move into lib
Dima Kuznetsov has posted comments on this change. Change subject: ppc64HardwareInfo: move into lib .. Patch Set 5: Verified+1 Verified by building on a ppc64 host and reading hw info: [root@ibm-p8-rhevm-02 vdsm-dkuznets]# vdsClient 0 getVdsHardwareInfo systemFamily = 'PowerNV' systemManufacturer = 'IBM' systemProductName = 'IBM Power System S822L' systemSerialNumber = '8247-22L' systemUUID = '211DA9A' systemVersion = 'PowerNV 8247-22L' -- To view, visit https://gerrit.ovirt.org/44737 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: I4bee7f8ea4262d162bec8887ed8c98a0759a5f8c Gerrit-PatchSet: 5 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Dima Kuznetsov dkuzn...@redhat.com Gerrit-Reviewer: Dima Kuznetsov dkuzn...@redhat.com Gerrit-Reviewer: Jenkins CI Gerrit-Reviewer: Yeela Kaplan ykap...@redhat.com Gerrit-Reviewer: automat...@ovirt.org Gerrit-HasComments: No ___ vdsm-patches mailing list vdsm-patches@lists.fedorahosted.org https://lists.fedorahosted.org/mailman/listinfo/vdsm-patches
Change in vdsm[ovirt-3.5]: init: add a lock when starting / stopping svdsm
Dima Kuznetsov has posted comments on this change. Change subject: init: add a lock when starting / stopping svdsm .. Patch Set 3: Code-Review+1 -- To view, visit https://gerrit.ovirt.org/45202 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: I10bb3f7d39b7dc6a61bce99fab718b51496a37b0 Gerrit-PatchSet: 3 Gerrit-Project: vdsm Gerrit-Branch: ovirt-3.5 Gerrit-Owner: Yeela Kaplan ykap...@redhat.com Gerrit-Reviewer: Dan Kenigsberg dan...@redhat.com Gerrit-Reviewer: Dima Kuznetsov dkuzn...@redhat.com Gerrit-Reviewer: Piotr Kliczewski piotr.kliczew...@gmail.com Gerrit-Reviewer: Yaniv Bronhaim ybron...@redhat.com Gerrit-Reviewer: Yeela Kaplan ykap...@redhat.com Gerrit-Reviewer: automat...@ovirt.org Gerrit-HasComments: No ___ vdsm-patches mailing list vdsm-patches@lists.fedorahosted.org https://lists.fedorahosted.org/mailman/listinfo/vdsm-patches
Change in vdsm[master]: service: change vdsm KillMode to mixed
Dima Kuznetsov has posted comments on this change. Change subject: service: change vdsm KillMode to mixed .. Patch Set 4: Code-Review+1 -- To view, visit https://gerrit.ovirt.org/45038 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: I5a7554609e5b43d6fce3dd3c4c1817cc98372b6c Gerrit-PatchSet: 4 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Yeela Kaplan ykap...@redhat.com Gerrit-Reviewer: Dan Kenigsberg dan...@redhat.com Gerrit-Reviewer: Dima Kuznetsov dkuzn...@redhat.com Gerrit-Reviewer: Douglas Schilling Landgraf dougsl...@redhat.com Gerrit-Reviewer: Fabian Deutsch fabi...@redhat.com Gerrit-Reviewer: Piotr Kliczewski piotr.kliczew...@gmail.com Gerrit-Reviewer: Yaniv Bronhaim ybron...@redhat.com Gerrit-Reviewer: Yeela Kaplan ykap...@redhat.com Gerrit-Reviewer: automat...@ovirt.org Gerrit-HasComments: No ___ vdsm-patches mailing list vdsm-patches@lists.fedorahosted.org https://lists.fedorahosted.org/mailman/listinfo/vdsm-patches
Change in vdsm[master]: spmprotect: Switch from fencing by pid to fencing using syst...
Dima Kuznetsov has posted comments on this change. Change subject: spmprotect: Switch from fencing by pid to fencing using systemctl .. Patch Set 7: (1 comment) https://gerrit.ovirt.org/#/c/43211/7/vdsm/storage/protect/spmprotect.sh.in File vdsm/storage/protect/spmprotect.sh.in: Line 73: (sleep 20 echodo $REBOOTCMD) Line 74: disown Line 75: (sleep 7 Line 76: log Trying to stop vdsm for sdUUID=$sdUUID id=$ID lease_path=$LEASE_FILE Line 77: echodo $SYSTEMCTL kill --signal=TERM vdsmd.service Does kill and systemctl kill fail in the same way? systemctl kill exits with 1 in same cases kill(2) returns with error. Line 78: sleep 2 Line 79: echodo $SYSTEMCTL kill --signal=KILL vdsmd.service Line 80: ) Line 81: disown -- To view, visit https://gerrit.ovirt.org/43211 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: Ifdea618514232a1f751afae54337de787f297b9e Gerrit-PatchSet: 7 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Dima Kuznetsov dkuzn...@redhat.com Gerrit-Reviewer: Allon Mureinik amure...@redhat.com Gerrit-Reviewer: Dan Kenigsberg dan...@redhat.com Gerrit-Reviewer: Dima Kuznetsov dkuzn...@redhat.com Gerrit-Reviewer: Federico Simoncelli fsimo...@redhat.com Gerrit-Reviewer: Jenkins CI Gerrit-Reviewer: Nir Soffer nsof...@redhat.com Gerrit-Reviewer: Tal Nisan tni...@redhat.com Gerrit-Reviewer: Yaniv Bronhaim ybron...@redhat.com Gerrit-Reviewer: Yeela Kaplan ykap...@redhat.com Gerrit-Reviewer: automat...@ovirt.org Gerrit-HasComments: Yes ___ vdsm-patches mailing list vdsm-patches@lists.fedorahosted.org https://lists.fedorahosted.org/mailman/listinfo/vdsm-patches
Change in vdsm[master]: oop: close ioprocesses on vdsmd stop
Dima Kuznetsov has posted comments on this change. Change subject: oop: close ioprocesses on vdsmd stop .. Patch Set 1: Code-Review+1 (1 comment) https://gerrit.ovirt.org/#/c/45038/1/init/systemd/vdsmd.service.in File init/systemd/vdsmd.service.in: Line 20: User=@VDSMUSER@ Line 21: Group=@VDSMGROUP@ Line 22: PermissionsStartOnly=true Line 23: TimeoutStopSec=@SERVICE_STOP_TIMEOUT@ Line 24: KillMode=process I think its worth adding a FIXME here noting we should switch to 'mixed' mode if/when el7 systemd supports it. Line 25: Line 26: [Install] -- To view, visit https://gerrit.ovirt.org/45038 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: I5a7554609e5b43d6fce3dd3c4c1817cc98372b6c Gerrit-PatchSet: 1 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Yeela Kaplan ykap...@redhat.com Gerrit-Reviewer: Dan Kenigsberg dan...@redhat.com Gerrit-Reviewer: Dima Kuznetsov dkuzn...@redhat.com Gerrit-Reviewer: Douglas Schilling Landgraf dougsl...@redhat.com Gerrit-Reviewer: Fabian Deutsch fabi...@redhat.com Gerrit-Reviewer: Piotr Kliczewski piotr.kliczew...@gmail.com Gerrit-Reviewer: Yaniv Bronhaim ybron...@redhat.com Gerrit-Reviewer: Yeela Kaplan ykap...@redhat.com Gerrit-Reviewer: automat...@ovirt.org Gerrit-HasComments: Yes ___ vdsm-patches mailing list vdsm-patches@lists.fedorahosted.org https://lists.fedorahosted.org/mailman/listinfo/vdsm-patches
Change in vdsm[master]: makefile: Run pep8/pyflakes inside virtualenv
Dima Kuznetsov has posted comments on this change. Change subject: makefile: Run pep8/pyflakes inside virtualenv .. Patch Set 1: (1 comment) https://gerrit.ovirt.org/#/c/44928/1/Makefile.am File Makefile.am: Line 121: Line 122: .PHONY: pyflakes Line 123: pyflakes: virtualenv Line 124: ( \ Line 125: source /tmp/vdsm-virtualenv/bin/activate ; \ /tmp? Oops Line 126: pip install pyflakes==$(PYFLAKES_VERSION) ; \ Line 127: find . -path './.git' -prune\ Line 128: -path './virtualenv' -prune -type f -o \ Line 129: -name '*.py' -o -name '*.py.in' | \ -- To view, visit https://gerrit.ovirt.org/44928 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: I2ac3968ee6b2c9a1c9e3cf6bc78f486823bb6574 Gerrit-PatchSet: 1 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Dima Kuznetsov dkuzn...@redhat.com Gerrit-Reviewer: Dan Kenigsberg dan...@redhat.com Gerrit-Reviewer: Dima Kuznetsov dkuzn...@redhat.com Gerrit-Reviewer: Federico Simoncelli fsimo...@redhat.com Gerrit-Reviewer: Francesco Romani from...@redhat.com Gerrit-Reviewer: Jenkins CI Gerrit-Reviewer: Yaniv Bronhaim ybron...@redhat.com Gerrit-Reviewer: Yeela Kaplan ykap...@redhat.com Gerrit-Reviewer: automat...@ovirt.org Gerrit-HasComments: Yes ___ vdsm-patches mailing list vdsm-patches@lists.fedorahosted.org https://lists.fedorahosted.org/mailman/listinfo/vdsm-patches
Change in vdsm[master]: makefile: Run pep8/pyflakes inside virtualenv
Dima Kuznetsov has uploaded a new change for review.
Change subject: makefile: Run pep8/pyflakes inside virtualenv
..
makefile: Run pep8/pyflakes inside virtualenv
Since developers often don't use the same distribution, we cannot rely
on consistent version of pep8/pyflakes of developer/CI machines. This
patch introduces use of virtualenv so a specific version of the above
programs can be used.
Change-Id: I2ac3968ee6b2c9a1c9e3cf6bc78f486823bb6574
Bug-Url: https://bugzilla.redhat.com/show_bug.cgi?id=1182088
Signed-off-by: Dima Kuznetsov dkuzn...@redhat.com
---
M .gitignore
M Makefile.am
M vdsm.spec.in
3 files changed, 35 insertions(+), 15 deletions(-)
git pull ssh://gerrit.ovirt.org:29418/vdsm refs/changes/28/44928/1
diff --git a/.gitignore b/.gitignore
index 60bd094..ce47c06 100644
--- a/.gitignore
+++ b/.gitignore
@@ -70,3 +70,4 @@
vdsm/rpc/vdsm-api.html
vdsm_hooks/openstacknet/sudoers
vdsm_hooks/persist-vdsm-hooks
+virtualenv/
diff --git a/Makefile.am b/Makefile.am
index 5633040..e9d63a8 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -113,30 +113,48 @@
SKIP_PYFLAKES_ERR = \./vdsm/storage/lvm\.py.*: list comprehension redefines \
'lv' from line .*
+virtualenv:
+ virtualenv virtualenv
+
+PYFLAKES_VERSION=0.9.2
+PEP8_VERSION=1.5.6
+
.PHONY: pyflakes
-pyflakes:
- python -c 'import pyflakes; print(pyflakes-%s % pyflakes.__version__)'
- find . -path './.git' -prune -type f -o \
- -name '*.py' -o -name '*.py.in' | \
- echo $(WHITELIST) | xargs $(PYFLAKES) | \
- grep -w -v $(SKIP_PYFLAKES_ERR) | \
- while read LINE; do echo $$LINE; false; done
+pyflakes: virtualenv
+ ( \
+ source /tmp/vdsm-virtualenv/bin/activate ; \
+ pip install pyflakes==$(PYFLAKES_VERSION) ; \
+ find . -path './.git' -prune\
+ -path './virtualenv' -prune -type f -o \
+ -name '*.py' -o -name '*.py.in' | \
+ echo $(WHITELIST) | xargs pyflakes | \
+ grep -w -v $(SKIP_PYFLAKES_ERR) | \
+ while read LINE; do echo $$LINE; false; done \
+ )
.PHONY: pep8
-pep8:
- $(PEP8) --version
- for x in $(PEP8_BLACKLIST); do \
- exclude=$${exclude},$${x} ; \
- done ; \
- $(PEP8) --exclude=$${exclude} --filename '*.py,*.py.in' . \
- $(WHITELIST)
+pep8: virtualenv
+ ( \
+ source virtualenv/bin/activate ;\
+ pip install pep8==$(PEP8_VERSION) ; \
+ for x in $(PEP8_BLACKLIST); do \
+ exclude=$${exclude},$${x} ; \
+ done ; \
+ pep8 --version ;\
+ pep8\
+ --exclude=$${exclude} \
+ --exclude='virtualenv/*'\
+ --filename '*.py,*.py.in' \
+ . ; \
+ )
+
.PHONY: python3
python3:
if [ -x $(PYTHON3) ]; then \
PYTHONDONTWRITEBYTECODE=1 $(PYTHON3) -m compileall \
$(WHITELIST) \
- `find . -name '*.py' -o -name '*.py.in'`; \
+ `find . -path './virtualenv' -prune -name '*.py' -o -name
'*.py.in'`; \
else \
echo Warning: skipping python3 syntax check; \
fi
diff --git a/vdsm.spec.in b/vdsm.spec.in
index 72e7df6..9410f02 100644
--- a/vdsm.spec.in
+++ b/vdsm.spec.in
@@ -75,6 +75,7 @@
BuildRequires: python-netaddr
BuildRequires: python-nose
BuildRequires: python-six
+BuildRequires: python-virtualenv
BuildRequires: rpm-build
# BuildRequires needed by the tests during the build
--
To view, visit https://gerrit.ovirt.org/44928
To unsubscribe, visit https://gerrit.ovirt.org/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I2ac3968ee6b2c9a1c9e3cf6bc78f486823bb6574
Gerrit-PatchSet: 1
Gerrit-Project: vdsm
Gerrit-Branch: master
Gerrit-Owner: Dima Kuznetsov dkuzn...@redhat.com
___
vdsm-patches mailing list
vdsm-patches@lists.fedorahosted.org
https://lists.fedorahosted.org/mailman/listinfo/vdsm-patches
Change in vdsm[master]: supervdsm: Move supervdsm module into lib
Dima Kuznetsov has posted comments on this change. Change subject: supervdsm: Move supervdsm module into lib .. Patch Set 2: Verified+1 Verified by running the UTs and running the system tests. Both vdsmd and supervdsmd started successfully -- To view, visit https://gerrit.ovirt.org/44597 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: I741309af4b5510d9221da12680637c5dd4568e9d Gerrit-PatchSet: 2 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Dima Kuznetsov dkuzn...@redhat.com Gerrit-Reviewer: Dan Kenigsberg dan...@redhat.com Gerrit-Reviewer: Dima Kuznetsov dkuzn...@redhat.com Gerrit-Reviewer: Jenkins CI Gerrit-Reviewer: Piotr Kliczewski piotr.kliczew...@gmail.com Gerrit-Reviewer: Yaniv Bronhaim ybron...@redhat.com Gerrit-Reviewer: Yeela Kaplan ykap...@redhat.com Gerrit-Reviewer: automat...@ovirt.org Gerrit-HasComments: No ___ vdsm-patches mailing list vdsm-patches@lists.fedorahosted.org https://lists.fedorahosted.org/mailman/listinfo/vdsm-patches
Change in vdsm[master]: supervdsm: Decorator for supervdsm proxied calls.
Dima Kuznetsov has posted comments on this change. Change subject: supervdsm: Decorator for supervdsm proxied calls. .. Patch Set 6: Verified+1 Verified using UTs and system tests framework -- To view, visit https://gerrit.ovirt.org/44598 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: Ibea2b07b91a7faffda16c71c6b5831f96d116c15 Gerrit-PatchSet: 6 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Dima Kuznetsov dkuzn...@redhat.com Gerrit-Reviewer: Dan Kenigsberg dan...@redhat.com Gerrit-Reviewer: Dima Kuznetsov dkuzn...@redhat.com Gerrit-Reviewer: Jenkins CI Gerrit-Reviewer: Piotr Kliczewski piotr.kliczew...@gmail.com Gerrit-Reviewer: Yaniv Bronhaim ybron...@redhat.com Gerrit-Reviewer: Yeela Kaplan ykap...@redhat.com Gerrit-Reviewer: automat...@ovirt.org Gerrit-HasComments: No ___ vdsm-patches mailing list vdsm-patches@lists.fedorahosted.org https://lists.fedorahosted.org/mailman/listinfo/vdsm-patches
Change in vdsm[master]: core: Remove substitutions from dumpStorageTable
Dima Kuznetsov has uploaded a new change for review.
Change subject: core: Remove substitutions from dumpStorageTable
..
core: Remove substitutions from dumpStorageTable
This patch removes the use of substitutions from dumpStorageTable,
The required value is available in the config and retrieved from there.
Part of the effort to minimize generated files.
Change-Id: Id041a7caefe00ae85443cc1350506d0a75932028
Bug-Url: https://bugzilla.redhat.com/show_bug.cgi?id=1098179
Signed-off-by: Dima Kuznetsov dkuzn...@redhat.com
---
M vdsm/Makefile.am
R vdsm/dumpStorageTable.py
2 files changed, 5 insertions(+), 3 deletions(-)
git pull ssh://gerrit.ovirt.org:29418/vdsm refs/changes/77/44877/1
diff --git a/vdsm/Makefile.am b/vdsm/Makefile.am
index 4c0578e..23c5b4c 100644
--- a/vdsm/Makefile.am
+++ b/vdsm/Makefile.am
@@ -30,6 +30,7 @@
clientIF.py \
debugPluginClient.py \
dmidecodeUtil.py \
+ dumpStorageTable.py \
hooking.py \
hooks.py \
hostdev.py \
@@ -55,7 +56,7 @@
nodist_vdsm_PYTHON = \
dsaversion.py \
- dumpStorageTable.py
+ $(NULL)
nodist_vdsm_SCRIPTS = \
mk_sysprep_floppy \
@@ -93,7 +94,6 @@
EXTRA_DIST = \
bonding-defaults.json \
dsaversion.py.in \
- dumpStorageTable.py.in \
libvirt_password \
limits.conf \
logger.conf.in \
diff --git a/vdsm/dumpStorageTable.py.in b/vdsm/dumpStorageTable.py
similarity index 98%
rename from vdsm/dumpStorageTable.py.in
rename to vdsm/dumpStorageTable.py
index 82920fd..18a0c8c 100644
--- a/vdsm/dumpStorageTable.py.in
+++ b/vdsm/dumpStorageTable.py
@@ -22,8 +22,10 @@
import socket
import traceback
+import vdsm.config
+
BLANK_UUID = '----'
-DC = '@VDSMREPO@'
+DC = vdsm.config.get('irc', 'repository')
MASTERSD_PATH = 'mastersd/master/vms'
CDROM_IMAGE = '----'
--
To view, visit https://gerrit.ovirt.org/44877
To unsubscribe, visit https://gerrit.ovirt.org/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Id041a7caefe00ae85443cc1350506d0a75932028
Gerrit-PatchSet: 1
Gerrit-Project: vdsm
Gerrit-Branch: master
Gerrit-Owner: Dima Kuznetsov dkuzn...@redhat.com
___
vdsm-patches mailing list
vdsm-patches@lists.fedorahosted.org
https://lists.fedorahosted.org/mailman/listinfo/vdsm-patches
Change in vdsm[master]: tests: functional - convert to run over jsonrpc
Dima Kuznetsov has posted comments on this change. Change subject: tests: functional - convert to run over jsonrpc .. Patch Set 10: Code-Review+1 -- To view, visit https://gerrit.ovirt.org/43237 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: I468e7eae74dd37b915b15e18ac4b0a830675cb47 Gerrit-PatchSet: 10 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Yeela Kaplan ykap...@redhat.com Gerrit-Reviewer: Dan Kenigsberg dan...@redhat.com Gerrit-Reviewer: Dima Kuznetsov dkuzn...@redhat.com Gerrit-Reviewer: Jenkins CI Gerrit-Reviewer: Piotr Kliczewski piotr.kliczew...@gmail.com Gerrit-Reviewer: Yaniv Bronhaim ybron...@redhat.com Gerrit-Reviewer: Yeela Kaplan ykap...@redhat.com Gerrit-Reviewer: automat...@ovirt.org Gerrit-HasComments: No ___ vdsm-patches mailing list vdsm-patches@lists.fedorahosted.org https://lists.fedorahosted.org/mailman/listinfo/vdsm-patches
Change in vdsm[master]: [WIP]tests: functional - convert to run over jsonrpc
Dima Kuznetsov has posted comments on this change. Change subject: [WIP]tests: functional - convert to run over jsonrpc .. Patch Set 8: Code-Review+1 -- To view, visit https://gerrit.ovirt.org/43237 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: I468e7eae74dd37b915b15e18ac4b0a830675cb47 Gerrit-PatchSet: 8 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Yeela Kaplan ykap...@redhat.com Gerrit-Reviewer: Dan Kenigsberg dan...@redhat.com Gerrit-Reviewer: Dima Kuznetsov dkuzn...@redhat.com Gerrit-Reviewer: Jenkins CI Gerrit-Reviewer: Piotr Kliczewski piotr.kliczew...@gmail.com Gerrit-Reviewer: Yaniv Bronhaim ybron...@redhat.com Gerrit-Reviewer: Yeela Kaplan ykap...@redhat.com Gerrit-Reviewer: automat...@ovirt.org Gerrit-HasComments: No ___ vdsm-patches mailing list vdsm-patches@lists.fedorahosted.org https://lists.fedorahosted.org/mailman/listinfo/vdsm-patches
Change in vdsm[master]: supervdsm: Remove getHardwareInfo call
Dima Kuznetsov has uploaded a new change for review.
Change subject: supervdsm: Remove getHardwareInfo call
..
supervdsm: Remove getHardwareInfo call
Replaced by hwinfo, using a proxied call into supervdsm
Change-Id: Ic2a863e47b9346e0cd49d8795feec89745de134e
Signed-off-by: Dima Kuznetsov dkuzn...@redhat.com
---
M vdsm/API.py
M vdsm/supervdsmServer
2 files changed, 2 insertions(+), 6 deletions(-)
git pull ssh://gerrit.ovirt.org:29418/vdsm refs/changes/38/44738/1
diff --git a/vdsm/API.py b/vdsm/API.py
index 2566647..80bf897 100644
--- a/vdsm/API.py
+++ b/vdsm/API.py
@@ -36,6 +36,7 @@
from vdsm import utils
from clientIF import clientIF
+from vdsm import hwinfo
from vdsm import netinfo
from vdsm import constants
from vdsm import response
@@ -1322,7 +1323,7 @@
Report host hardware information
try:
-hw = supervdsm.getProxy().getHardwareInfo()
+hw = hwinfo.get_hardware_info()
return {'status': doneCode, 'info': hw}
except:
self.log.error(failed to retrieve hardware info, exc_info=True)
diff --git a/vdsm/supervdsmServer b/vdsm/supervdsmServer
index 5dc3802..f5c0bbf 100755
--- a/vdsm/supervdsmServer
+++ b/vdsm/supervdsmServer
@@ -54,7 +54,6 @@
except ImportError:
_glusterEnabled = False
-from vdsm import hwinfo
from vdsm import utils
from vdsm import sysctl
from vdsm.supervdsm import _SuperVdsmManager
@@ -128,10 +127,6 @@
def ping(self, *args, **kwargs):
# This method exists for testing purposes
return True
-
-@logDecorator
-def getHardwareInfo(self, *args, **kwargs):
-return hwinfo.get_hardware_info()
@logDecorator
def getDevicePartedInfo(self, *args, **kwargs):
--
To view, visit https://gerrit.ovirt.org/44738
To unsubscribe, visit https://gerrit.ovirt.org/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ic2a863e47b9346e0cd49d8795feec89745de134e
Gerrit-PatchSet: 1
Gerrit-Project: vdsm
Gerrit-Branch: master
Gerrit-Owner: Dima Kuznetsov dkuzn...@redhat.com
___
vdsm-patches mailing list
vdsm-patches@lists.fedorahosted.org
https://lists.fedorahosted.org/mailman/listinfo/vdsm-patches
Change in vdsm[master]: dmidecodeUtil: move into lib
Dima Kuznetsov has uploaded a new change for review.
Change subject: dmidecodeUtil: move into lib
..
dmidecodeUtil: move into lib
Change-Id: If190e2b7b07faaacdc81e59a12ec08d2bd83f4bb
Signed-off-by: Dima Kuznetsov dkuzn...@redhat.com
---
M debian/vdsm-python.install
M debian/vdsm.install
M lib/vdsm/Makefile.am
R lib/vdsm/dmidecodeUtil.py
M vdsm.spec.in
M vdsm/Makefile.am
M vdsm/supervdsmServer
7 files changed, 4 insertions(+), 4 deletions(-)
git pull ssh://gerrit.ovirt.org:29418/vdsm refs/changes/36/44736/1
diff --git a/debian/vdsm-python.install b/debian/vdsm-python.install
index f4aea24..cb39299 100644
--- a/debian/vdsm-python.install
+++ b/debian/vdsm-python.install
@@ -7,6 +7,7 @@
./usr/lib/python2.7/dist-packages/vdsm/config.py
./usr/lib/python2.7/dist-packages/vdsm/constants.py
./usr/lib/python2.7/dist-packages/vdsm/define.py
+./usr/lib/python2.7/dist-packages/vdsm/dmidecodeUtil.py
./usr/lib/python2.7/dist-packages/vdsm/exception.py
./usr/lib/python2.7/dist-packages/vdsm/executor.py
./usr/lib/python2.7/dist-packages/vdsm/ipwrapper.py
diff --git a/debian/vdsm.install b/debian/vdsm.install
index b7cc114..0bfbcc3 100644
--- a/debian/vdsm.install
+++ b/debian/vdsm.install
@@ -39,7 +39,6 @@
./usr/share/vdsm/clientIF.py
./usr/share/vdsm/daemonAdapter
./usr/share/vdsm/debugPluginClient.py
-./usr/share/vdsm/dmidecodeUtil.py
./usr/share/vdsm/dsaversion.py
./usr/share/vdsm/dumpStorageTable.py
./usr/share/vdsm/get-conf-item
diff --git a/lib/vdsm/Makefile.am b/lib/vdsm/Makefile.am
index 02faeb8..f23076c 100644
--- a/lib/vdsm/Makefile.am
+++ b/lib/vdsm/Makefile.am
@@ -27,6 +27,7 @@
compat.py \
concurrent.py \
define.py \
+ dmidecodeUtil.py \
exception.py \
executor.py \
ipwrapper.py \
diff --git a/vdsm/dmidecodeUtil.py b/lib/vdsm/dmidecodeUtil.py
similarity index 100%
rename from vdsm/dmidecodeUtil.py
rename to lib/vdsm/dmidecodeUtil.py
diff --git a/vdsm.spec.in b/vdsm.spec.in
index 98ee569..6d7c026 100644
--- a/vdsm.spec.in
+++ b/vdsm.spec.in
@@ -794,7 +794,6 @@
%{_datadir}/%{vdsm_name}/caps.py*
%{_datadir}/%{vdsm_name}/clientIF.py*
%{_datadir}/%{vdsm_name}/daemonAdapter
-%{_datadir}/%{vdsm_name}/dmidecodeUtil.py*
%{_datadir}/%{vdsm_name}/API.py*
%{_datadir}/%{vdsm_name}/hooking.py*
%{_datadir}/%{vdsm_name}/hooks.py*
@@ -1043,6 +1042,7 @@
%{python_sitelib}/%{vdsm_name}/config.py*
%{python_sitelib}/%{vdsm_name}/constants.py*
%{python_sitelib}/%{vdsm_name}/define.py*
+%{python_sitelib}/%{vdsm_name}/dmidecodeUtil.py*
%{python_sitelib}/%{vdsm_name}/exception.py*
%{python_sitelib}/%{vdsm_name}/executor.py*
%{python_sitelib}/%{vdsm_name}/ipwrapper.py*
diff --git a/vdsm/Makefile.am b/vdsm/Makefile.am
index 89c2a87..f6ca3ac 100644
--- a/vdsm/Makefile.am
+++ b/vdsm/Makefile.am
@@ -29,7 +29,6 @@
caps.py \
clientIF.py \
debugPluginClient.py \
- dmidecodeUtil.py \
hooking.py \
hooks.py \
hostdev.py \
diff --git a/vdsm/supervdsmServer b/vdsm/supervdsmServer
index 41d5590..d5cfd58 100755
--- a/vdsm/supervdsmServer
+++ b/vdsm/supervdsmServer
@@ -133,7 +133,7 @@
@logDecorator
def getHardwareInfo(self, *args, **kwargs):
if platform.machine() in ('x86_64', 'i686'):
-from dmidecodeUtil import getHardwareInfoStructure
+from vdsm.dmidecodeUtil import getHardwareInfoStructure
return getHardwareInfoStructure()
elif platform.machine() in Architecture.POWER:
from ppc64HardwareInfo import getHardwareInfoStructure
--
To view, visit https://gerrit.ovirt.org/44736
To unsubscribe, visit https://gerrit.ovirt.org/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: If190e2b7b07faaacdc81e59a12ec08d2bd83f4bb
Gerrit-PatchSet: 1
Gerrit-Project: vdsm
Gerrit-Branch: master
Gerrit-Owner: Dima Kuznetsov dkuzn...@redhat.com
___
vdsm-patches mailing list
vdsm-patches@lists.fedorahosted.org
https://lists.fedorahosted.org/mailman/listinfo/vdsm-patches
Change in vdsm[master]: ppc64HardwareInfo: move into lib
Dima Kuznetsov has uploaded a new change for review.
Change subject: ppc64HardwareInfo: move into lib
..
ppc64HardwareInfo: move into lib
Change-Id: I4bee7f8ea4262d162bec8887ed8c98a0759a5f8c
Signed-off-by: Dima Kuznetsov dkuzn...@redhat.com
---
M debian/vdsm-python.install
M debian/vdsm.install
M lib/vdsm/Makefile.am
R lib/vdsm/ppc64HardwareInfo.py
M vdsm.spec.in
M vdsm/Makefile.am
M vdsm/supervdsmServer
7 files changed, 4 insertions(+), 4 deletions(-)
git pull ssh://gerrit.ovirt.org:29418/vdsm refs/changes/37/44737/1
diff --git a/debian/vdsm-python.install b/debian/vdsm-python.install
index cb39299..0cec230 100644
--- a/debian/vdsm-python.install
+++ b/debian/vdsm-python.install
@@ -21,6 +21,7 @@
./usr/lib/python2.7/dist-packages/vdsm/netlink/monitor.py
./usr/lib/python2.7/dist-packages/vdsm/netlink/route.py
./usr/lib/python2.7/dist-packages/vdsm/password.py
+./usr/lib/python2.7/dist-packages/vdsm/ppc64HardwareInfo.py
./usr/lib/python2.7/dist-packages/vdsm/profiling/__init__.py
./usr/lib/python2.7/dist-packages/vdsm/profiling/cpu.py
./usr/lib/python2.7/dist-packages/vdsm/profiling/errors.py
diff --git a/debian/vdsm.install b/debian/vdsm.install
index 0bfbcc3..24fb1aa 100644
--- a/debian/vdsm.install
+++ b/debian/vdsm.install
@@ -74,7 +74,6 @@
./usr/share/vdsm/network/utils.py
./usr/share/vdsm/numaUtils.py
./usr/share/vdsm/parted_utils.py
-./usr/share/vdsm/ppc64HardwareInfo.py
./usr/share/vdsm/protocoldetector.py
./usr/share/vdsm/rpc/__init__.py
./usr/share/vdsm/rpc/bindingjsonrpc.py
diff --git a/lib/vdsm/Makefile.am b/lib/vdsm/Makefile.am
index f23076c..bed64a9 100644
--- a/lib/vdsm/Makefile.am
+++ b/lib/vdsm/Makefile.am
@@ -36,6 +36,7 @@
netconfpersistence.py \
netinfo.py \
password.py \
+ ppc64HardwareInfo.py \
pthread.py \
qemuimg.py \
response.py \
diff --git a/vdsm/ppc64HardwareInfo.py b/lib/vdsm/ppc64HardwareInfo.py
similarity index 100%
rename from vdsm/ppc64HardwareInfo.py
rename to lib/vdsm/ppc64HardwareInfo.py
diff --git a/vdsm.spec.in b/vdsm.spec.in
index 6d7c026..20a74b7 100644
--- a/vdsm.spec.in
+++ b/vdsm.spec.in
@@ -802,7 +802,6 @@
%{_datadir}/%{vdsm_name}/parted_utils.py*
%{_datadir}/%{vdsm_name}/mkimage.py*
%{_datadir}/%{vdsm_name}/numaUtils.py*
-%{_datadir}/%{vdsm_name}/ppc64HardwareInfo.py*
%{_datadir}/%{vdsm_name}/protocoldetector.py*
%{_datadir}/%{vdsm_name}/supervdsmServer
%{_datadir}/%{vdsm_name}/v2v.py*
@@ -1055,6 +1054,7 @@
%{python_sitelib}/%{vdsm_name}/netlink/monitor.py*
%{python_sitelib}/%{vdsm_name}/netlink/route.py*
%{python_sitelib}/%{vdsm_name}/password.py*
+%{python_sitelib}/%{vdsm_name}/ppc64HardwareInfo.py*
%{python_sitelib}/%{vdsm_name}/profiling/__init__.py*
%{python_sitelib}/%{vdsm_name}/profiling/cpu.py*
%{python_sitelib}/%{vdsm_name}/profiling/errors.py*
diff --git a/vdsm/Makefile.am b/vdsm/Makefile.am
index f6ca3ac..8a61635 100644
--- a/vdsm/Makefile.am
+++ b/vdsm/Makefile.am
@@ -38,7 +38,6 @@
momIF.py \
numaUtils.py \
parted_utils.py \
- ppc64HardwareInfo.py \
protocoldetector.py \
v2v.py \
vdsmDebugPlugin.py \
diff --git a/vdsm/supervdsmServer b/vdsm/supervdsmServer
index d5cfd58..97dc0b8 100755
--- a/vdsm/supervdsmServer
+++ b/vdsm/supervdsmServer
@@ -136,7 +136,7 @@
from vdsm.dmidecodeUtil import getHardwareInfoStructure
return getHardwareInfoStructure()
elif platform.machine() in Architecture.POWER:
-from ppc64HardwareInfo import getHardwareInfoStructure
+from vdsm.ppc64HardwareInfo import getHardwareInfoStructure
return getHardwareInfoStructure()
else:
# not implemented over other architecture
--
To view, visit https://gerrit.ovirt.org/44737
To unsubscribe, visit https://gerrit.ovirt.org/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I4bee7f8ea4262d162bec8887ed8c98a0759a5f8c
Gerrit-PatchSet: 1
Gerrit-Project: vdsm
Gerrit-Branch: master
Gerrit-Owner: Dima Kuznetsov dkuzn...@redhat.com
___
vdsm-patches mailing list
vdsm-patches@lists.fedorahosted.org
https://lists.fedorahosted.org/mailman/listinfo/vdsm-patches
Change in vdsm[master]: supervdsm: Decorator for supervdsm proxied calls.
Dima Kuznetsov has posted comments on this change.
Change subject: supervdsm: Decorator for supervdsm proxied calls.
..
Patch Set 3:
(1 comment)
https://gerrit.ovirt.org/#/c/44598/3/vdsm/supervdsmServer
File vdsm/supervdsmServer:
Line 495:
Line 496: try:
Line 497: ret = func(*args, **kwargs)
Line 498: except:
Line 499: self.log.exception('error in %s.%s', mod_name, func_name)
Shouldn't we return any errors to the client?
We raise the exception and multiprocessing takes care of it and re-reaises it
in the client code
Line 500: raise
Line 501:
Line 502: self.log.debug('%s.%s returned with %s', mod_name, func_name,
ret)
Line 503: return ret
--
To view, visit https://gerrit.ovirt.org/44598
To unsubscribe, visit https://gerrit.ovirt.org/settings
Gerrit-MessageType: comment
Gerrit-Change-Id: Ibea2b07b91a7faffda16c71c6b5831f96d116c15
Gerrit-PatchSet: 3
Gerrit-Project: vdsm
Gerrit-Branch: master
Gerrit-Owner: Dima Kuznetsov dkuzn...@redhat.com
Gerrit-Reviewer: Dan Kenigsberg dan...@redhat.com
Gerrit-Reviewer: Dima Kuznetsov dkuzn...@redhat.com
Gerrit-Reviewer: Jenkins CI
Gerrit-Reviewer: Piotr Kliczewski piotr.kliczew...@gmail.com
Gerrit-Reviewer: Yaniv Bronhaim ybron...@redhat.com
Gerrit-Reviewer: Yeela Kaplan ykap...@redhat.com
Gerrit-Reviewer: automat...@ovirt.org
Gerrit-HasComments: Yes
___
vdsm-patches mailing list
vdsm-patches@lists.fedorahosted.org
https://lists.fedorahosted.org/mailman/listinfo/vdsm-patches
Change in vdsm[master]: supervdsm: Decorator for supervdsm proxied calls.
Dima Kuznetsov has posted comments on this change. Change subject: supervdsm: Decorator for supervdsm proxied calls. .. Patch Set 4: (1 comment) https://gerrit.ovirt.org/#/c/44598/4/tests/functional/supervdsmFuncTests.py File tests/functional/supervdsmFuncTests.py: Line 40: os.setuid(vdsm_uid) Line 41: dropPrivileges() Line 42: Line 43: Line 44: class TestSuperVdsmRemotely(TestCaseBase): Please add a test which throws exception on the server side. The test test_proxied_call_fails_on_unknown_function kind of does that, but at the moment, the only proxied call I have is hwinfo.get_hardware_info, which I see no easy way to force it to raise an exception and I'd rather not add a testing only function into vdsm lib. The behavior is exactly the same as with getProxy().anyOtherCall() Line 45: def testPingCall(self): Line 46: proxy = supervdsm.getProxy() Line 47: self.assertTrue(proxy.ping()) Line 48: -- To view, visit https://gerrit.ovirt.org/44598 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: Ibea2b07b91a7faffda16c71c6b5831f96d116c15 Gerrit-PatchSet: 4 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Dima Kuznetsov dkuzn...@redhat.com Gerrit-Reviewer: Dan Kenigsberg dan...@redhat.com Gerrit-Reviewer: Dima Kuznetsov dkuzn...@redhat.com Gerrit-Reviewer: Jenkins CI Gerrit-Reviewer: Piotr Kliczewski piotr.kliczew...@gmail.com Gerrit-Reviewer: Yaniv Bronhaim ybron...@redhat.com Gerrit-Reviewer: Yeela Kaplan ykap...@redhat.com Gerrit-Reviewer: automat...@ovirt.org Gerrit-HasComments: Yes ___ vdsm-patches mailing list vdsm-patches@lists.fedorahosted.org https://lists.fedorahosted.org/mailman/listinfo/vdsm-patches
Change in vdsm[master]: supervdsm: Decorator for supervdsm proxied calls.
Dima Kuznetsov has posted comments on this change. Change subject: supervdsm: Decorator for supervdsm proxied calls. .. Patch Set 4: (1 comment) https://gerrit.ovirt.org/#/c/44598/4/tests/functional/supervdsmFuncTests.py File tests/functional/supervdsmFuncTests.py: Line 40: os.setuid(vdsm_uid) Line 41: dropPrivileges() Line 42: Line 43: Line 44: class TestSuperVdsmRemotely(TestCaseBase): The test test_proxied_call_fails_on_unknown_function kind of does that, but Actually, I don't have hwinfo.get_hardware_info at this point, I'll add this test in a later patch Line 45: def testPingCall(self): Line 46: proxy = supervdsm.getProxy() Line 47: self.assertTrue(proxy.ping()) Line 48: -- To view, visit https://gerrit.ovirt.org/44598 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: Ibea2b07b91a7faffda16c71c6b5831f96d116c15 Gerrit-PatchSet: 4 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Dima Kuznetsov dkuzn...@redhat.com Gerrit-Reviewer: Dan Kenigsberg dan...@redhat.com Gerrit-Reviewer: Dima Kuznetsov dkuzn...@redhat.com Gerrit-Reviewer: Jenkins CI Gerrit-Reviewer: Piotr Kliczewski piotr.kliczew...@gmail.com Gerrit-Reviewer: Yaniv Bronhaim ybron...@redhat.com Gerrit-Reviewer: Yeela Kaplan ykap...@redhat.com Gerrit-Reviewer: automat...@ovirt.org Gerrit-HasComments: Yes ___ vdsm-patches mailing list vdsm-patches@lists.fedorahosted.org https://lists.fedorahosted.org/mailman/listinfo/vdsm-patches
Change in vdsm[master]: supervdsm: Decorator for supervdsm proxied calls.
Dima Kuznetsov has posted comments on this change. Change subject: supervdsm: Decorator for supervdsm proxied calls. .. Patch Set 4: (1 comment) https://gerrit.ovirt.org/#/c/44598/4/tests/functional/supervdsmFuncTests.py File tests/functional/supervdsmFuncTests.py: Line 53: self.assertIn(o, _test_list) Line 54: Line 55: def test_proxied_call_fails_on_unknown_function(self): Line 56: with self.assertRaises(ImportError): Line 57: foo() Import error? maybe better to raise homemade exception - such as NotExistSV I don't like homemade exceptions, I prefer using the ones provided by python. I think this can be a runtime error as well. Line 58: Line 59: def test_proxied_call_non_decorated_function(self): Line 60: with self.assertRaises(RuntimeError): Line 61: supervdsm.proxied_call(utils.tobool)(None) -- To view, visit https://gerrit.ovirt.org/44598 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: Ibea2b07b91a7faffda16c71c6b5831f96d116c15 Gerrit-PatchSet: 4 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Dima Kuznetsov dkuzn...@redhat.com Gerrit-Reviewer: Dan Kenigsberg dan...@redhat.com Gerrit-Reviewer: Dima Kuznetsov dkuzn...@redhat.com Gerrit-Reviewer: Jenkins CI Gerrit-Reviewer: Piotr Kliczewski piotr.kliczew...@gmail.com Gerrit-Reviewer: Yaniv Bronhaim ybron...@redhat.com Gerrit-Reviewer: Yeela Kaplan ykap...@redhat.com Gerrit-Reviewer: automat...@ovirt.org Gerrit-HasComments: Yes ___ vdsm-patches mailing list vdsm-patches@lists.fedorahosted.org https://lists.fedorahosted.org/mailman/listinfo/vdsm-patches
Change in vdsm[master]: supervdsm: Decorators for supervdsm proxy calls.
Dima Kuznetsov has posted comments on this change. Change subject: supervdsm: Decorators for supervdsm proxy calls. .. Patch Set 2: Take a look at this patch: https://gerrit.ovirt.org/#/c/44599/ -- To view, visit https://gerrit.ovirt.org/44598 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: Ibea2b07b91a7faffda16c71c6b5831f96d116c15 Gerrit-PatchSet: 2 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Dima Kuznetsov dkuzn...@redhat.com Gerrit-Reviewer: Dan Kenigsberg dan...@redhat.com Gerrit-Reviewer: Dima Kuznetsov dkuzn...@redhat.com Gerrit-Reviewer: Jenkins CI Gerrit-Reviewer: Piotr Kliczewski piotr.kliczew...@gmail.com Gerrit-Reviewer: Yaniv Bronhaim ybron...@redhat.com Gerrit-Reviewer: Yeela Kaplan ykap...@redhat.com Gerrit-Reviewer: automat...@ovirt.org Gerrit-HasComments: No ___ vdsm-patches mailing list vdsm-patches@lists.fedorahosted.org https://lists.fedorahosted.org/mailman/listinfo/vdsm-patches
Change in vdsm[master]: supervdsm: Decorators for supervdsm proxy calls.
Dima Kuznetsov has posted comments on this change. Change subject: supervdsm: Decorators for supervdsm proxy calls. .. Patch Set 2: The patches above this one demonstrate one such use. The case I'm trying to make is that supervdsm server contains a lot of unrelated to each other code, and I think it is better to have the logic dealing with a specific area in a specific module (that deals with this area). So I propose a decorator that upon invocation checks if it should be dispatched through supervdsm, and on the other end, supervdsm callback should call this function directly. To take it a bit further, we can pass not just the function name but also a module name and automatically import it and eliminate the need for specific callback in the supervdsm server code. -- To view, visit https://gerrit.ovirt.org/44598 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: Ibea2b07b91a7faffda16c71c6b5831f96d116c15 Gerrit-PatchSet: 2 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Dima Kuznetsov dkuzn...@redhat.com Gerrit-Reviewer: Dan Kenigsberg dan...@redhat.com Gerrit-Reviewer: Dima Kuznetsov dkuzn...@redhat.com Gerrit-Reviewer: Jenkins CI Gerrit-Reviewer: Piotr Kliczewski piotr.kliczew...@gmail.com Gerrit-Reviewer: Yaniv Bronhaim ybron...@redhat.com Gerrit-Reviewer: Yeela Kaplan ykap...@redhat.com Gerrit-Reviewer: automat...@ovirt.org Gerrit-HasComments: No ___ vdsm-patches mailing list vdsm-patches@lists.fedorahosted.org https://lists.fedorahosted.org/mailman/listinfo/vdsm-patches
Change in vdsm[master]: hwinfo: Move calls from utils to hwinfo
Dima Kuznetsov has uploaded a new change for review.
Change subject: hwinfo: Move calls from utils to hwinfo
..
hwinfo: Move calls from utils to hwinfo
Change-Id: I0b949b34d0dfbadc9d91cd957edde10ce437e6d4
Signed-off-by: Dima Kuznetsov dkuzn...@redhat.com
---
M lib/vdsm/tool/register.py
M lib/vdsm/tool/vdsm-id.py
M lib/vdsm/utils.py
M tests/vmTests.py
M vdsm/caps.py
M vdsm/supervdsmServer
M vdsm/virt/vm.py
7 files changed, 14 insertions(+), 75 deletions(-)
git pull ssh://gerrit.ovirt.org:29418/vdsm refs/changes/00/44600/1
diff --git a/lib/vdsm/tool/register.py b/lib/vdsm/tool/register.py
index df56671..47fcef5 100644
--- a/lib/vdsm/tool/register.py
+++ b/lib/vdsm/tool/register.py
@@ -29,9 +29,10 @@
import selinux
from . import expose
+from .. import hwinfo
from .. import utils
-from vdsm.utils import getHostUUID, tobool
+from vdsm.utils import tobool
class Register(object):
@@ -246,7 +247,7 @@
Determine host UUID and if there is no existing /etc/vdsm/vdsm.id
it will genereate UUID and save/persist in /etc/vdsm/vdsm.id
-self.uuid = getHostUUID(legacy=False)
+self.uuid = hwinfo.get_host_uuid(legacy=False)
self.url_reg += uniqueId={u}.format(u=self.uuid)
self.logger.debug(Registration via: {u}.format(u=self.url_reg))
diff --git a/lib/vdsm/tool/vdsm-id.py b/lib/vdsm/tool/vdsm-id.py
index 379b926..fd45236 100644
--- a/lib/vdsm/tool/vdsm-id.py
+++ b/lib/vdsm/tool/vdsm-id.py
@@ -18,7 +18,7 @@
#
from __future__ import absolute_import
-from ..utils import getHostUUID
+from .. import hwinfo
from . import expose, ExtraArgsError
import sys
@@ -31,7 +31,7 @@
if len(args) 1:
raise ExtraArgsError()
-hostUUID = getHostUUID(False)
+hostUUID = hwinfo.get_host_uuid(False)
if hostUUID is None:
raise EnvironmentError('Cannot retrieve host UUID')
sys.stdout.write(hostUUID)
diff --git a/lib/vdsm/utils.py b/lib/vdsm/utils.py
index d847a23..3596575 100644
--- a/lib/vdsm/utils.py
+++ b/lib/vdsm/utils.py
@@ -43,7 +43,6 @@
import six
import sys
import os
-import platform
import random
import select
import shutil
@@ -775,54 +774,6 @@
except:
return False
-
-__hostUUID = None
-
-
-def getHostUUID(legacy=False):
-global __hostUUID
-
-if legacy:
-raise NotImplementedError
-
-if __hostUUID:
-return __hostUUID
-
-__hostUUID = None
-
-try:
-if os.path.exists(constants.P_VDSM_NODE_ID):
-with open(constants.P_VDSM_NODE_ID) as f:
-__hostUUID = f.readline().replace(\n, )
-else:
-arch = platform.machine()
-if arch in ('x86_64', 'i686'):
-ret, out, err = execCmd([constants.EXT_DMIDECODE,
- -s,
- system-uuid],
-raw=True,
-sudo=True)
-out = '\n'.join(line for line in out.splitlines()
-if not line.startswith('#'))
-
-if ret == 0 and 'Not' not in out:
-# Avoid error string - 'Not Settable' or 'Not Present'
-__hostUUID = out.strip()
-else:
-logging.warning('Could not find host UUID.')
-elif arch in ('ppc', 'ppc64'):
-# eg. output IBM,03061C14A
-try:
-with open('/proc/device-tree/system-id') as f:
-systemId = f.readline()
-__hostUUID = systemId.rstrip('\0').replace(',', '')
-except IOError:
-logging.warning('Could not find host UUID.')
-
-except:
-logging.error(Error retrieving host UUID, exc_info=True)
-
-return __hostUUID
symbolerror = {}
for code, symbol in errno.errorcode.iteritems():
diff --git a/tests/vmTests.py b/tests/vmTests.py
index 30c7473..d279628 100644
--- a/tests/vmTests.py
+++ b/tests/vmTests.py
@@ -48,6 +48,7 @@
from testlib import XMLTestCase
import caps
import hooks
+from vdsm import hwinfo
from vdsm import utils
from vdsm import libvirtconnection
from monkeypatch import MonkeyPatch, MonkeyPatchScope
@@ -473,7 +474,7 @@
@MonkeyPatch(constants, 'SMBIOS_MANUFACTURER', 'oVirt')
@MonkeyPatch(constants, 'SMBIOS_OSNAME', 'oVirt Node')
@MonkeyPatch(libvirtconnection, 'get', fake.Connection)
-@MonkeyPatch(utils, 'getHostUUID',
+@MonkeyPatch(hwinfo, 'get_host_uuid',
lambda: fc25cbbe-5520-4f83-b82e-1541914753d9)
@MonkeyPatch(vm.Vm, 'send_status_event', lambda x: None)
def testBuildCmdLineX86_64(self):
@@ -483,7 +484,7 @@
@MonkeyPatch(caps, 'osversion', lambda: {
'release': '1', 'version': '18', 'name': 'Fedora'})
@MonkeyPatch(libvirtconnection, 'get',
Change in vdsm[master]: hwinfo: Add module to get info about the platform
Dima Kuznetsov has uploaded a new change for review.
Change subject: hwinfo: Add module to get info about the platform
..
hwinfo: Add module to get info about the platform
Change-Id: I1a221f3f357038a3e1c6181d1abb53f4ad09c826
Signed-off-by: Dima Kuznetsov dkuzn...@redhat.com
---
M debian/vdsm-python.install
M lib/vdsm/Makefile.am
A lib/vdsm/hwinfo.py
M vdsm.spec.in
4 files changed, 64 insertions(+), 0 deletions(-)
git pull ssh://gerrit.ovirt.org:29418/vdsm refs/changes/99/44599/1
diff --git a/debian/vdsm-python.install b/debian/vdsm-python.install
index f4aea24..8f3a182 100644
--- a/debian/vdsm-python.install
+++ b/debian/vdsm-python.install
@@ -9,6 +9,7 @@
./usr/lib/python2.7/dist-packages/vdsm/define.py
./usr/lib/python2.7/dist-packages/vdsm/exception.py
./usr/lib/python2.7/dist-packages/vdsm/executor.py
+./usr/lib/python2.7/dist-packages/vdsm/hwinfo.py
./usr/lib/python2.7/dist-packages/vdsm/ipwrapper.py
./usr/lib/python2.7/dist-packages/vdsm/jsonrpcvdscli.py
./usr/lib/python2.7/dist-packages/vdsm/libvirtconnection.py
diff --git a/lib/vdsm/Makefile.am b/lib/vdsm/Makefile.am
index 02faeb8..1cc74ab 100644
--- a/lib/vdsm/Makefile.am
+++ b/lib/vdsm/Makefile.am
@@ -29,6 +29,7 @@
define.py \
exception.py \
executor.py \
+ hwinfo.py \
ipwrapper.py \
jsonrpcvdscli.py \
libvirtconnection.py \
diff --git a/lib/vdsm/hwinfo.py b/lib/vdsm/hwinfo.py
new file mode 100644
index 000..3e97459
--- /dev/null
+++ b/lib/vdsm/hwinfo.py
@@ -0,0 +1,61 @@
+#
+# Copyright 2015 Red Hat, Inc.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+#
+# Refer to the README and COPYING files for full details of the license
+#
+import logging
+import os
+import platform
+
+from vdsm import constants
+from vdsm import supervdsm
+from vdsm import utils
+
+
+class Architecture:
+X86_64 = 'x86_64'
+PPC64 = 'ppc64'
+PPC64LE = 'ppc64le'
+POWER = (PPC64, PPC64LE)
+
+
+@utils.memoized
+@supervdsm.named_proxied_call('getHardwareInfo')
+def get_hardware_info():
+if platform.machine() in ('x86_64', 'i686'):
+from dmidecodeUtil import getHardwareInfoStructure
+return getHardwareInfoStructure()
+elif platform.machine() in Architecture.POWER:
+from ppc64HardwareInfo import getHardwareInfoStructure
+return getHardwareInfoStructure()
+else:
+# not implemented over other architecture
+return {}
+
+
+@utils.memoized
+def get_host_uuid(legacy=False):
+if legacy:
+raise NotImplementedError
+
+if os.path.exists(constants.P_VDSM_NODE_ID):
+with open(constants.P_VDSM_NODE_ID) as f:
+return f.readline().strip()
+try:
+return get_hardware_info()['systemUUID']
+except KeyError:
+logging.error(Error retrieving host UUID, exc_info=True)
diff --git a/vdsm.spec.in b/vdsm.spec.in
index 98ee569..60bb4d8 100644
--- a/vdsm.spec.in
+++ b/vdsm.spec.in
@@ -1045,6 +1045,7 @@
%{python_sitelib}/%{vdsm_name}/define.py*
%{python_sitelib}/%{vdsm_name}/exception.py*
%{python_sitelib}/%{vdsm_name}/executor.py*
+%{python_sitelib}/%{vdsm_name}/hwinfo.py*
%{python_sitelib}/%{vdsm_name}/ipwrapper.py*
%{python_sitelib}/%{vdsm_name}/jsonrpcvdscli.py*
%{python_sitelib}/%{vdsm_name}/libvirtconnection.py*
--
To view, visit https://gerrit.ovirt.org/44599
To unsubscribe, visit https://gerrit.ovirt.org/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I1a221f3f357038a3e1c6181d1abb53f4ad09c826
Gerrit-PatchSet: 1
Gerrit-Project: vdsm
Gerrit-Branch: master
Gerrit-Owner: Dima Kuznetsov dkuzn...@redhat.com
___
vdsm-patches mailing list
vdsm-patches@lists.fedorahosted.org
https://lists.fedorahosted.org/mailman/listinfo/vdsm-patches
Change in vdsm[master]: supervdsm: Move supervdsm module into lib
Dima Kuznetsov has uploaded a new change for review.
Change subject: supervdsm: Move supervdsm module into lib
..
supervdsm: Move supervdsm module into lib
This patch moves the code for supervdsm proxy into the lib of vdsm, that
way lib code will be able to utilize supervdsm when it is running.
Change-Id: I741309af4b5510d9221da12680637c5dd4568e9d
Signed-off-by: Dima Kuznetsov dkuzn...@redhat.com
---
M debian/vdsm-python.install
M debian/vdsm.install
M lib/vdsm/Makefile.am
R lib/vdsm/supervdsm.py
M vdsm.spec.in
M vdsm/API.py
M vdsm/Makefile.am
M vdsm/clientIF.py
M vdsm/gluster/api.py
M vdsm/hostdev.py
M vdsm/numaUtils.py
M vdsm/storage/blockSD.py
M vdsm/storage/devicemapper.py
M vdsm/storage/fileSD.py
M vdsm/storage/glusterVolume.py
M vdsm/storage/hba.py
M vdsm/storage/hsm.py
M vdsm/storage/iscsi.py
M vdsm/storage/multipath.py
M vdsm/storage/storageServer.py
M vdsm/supervdsmServer
M vdsm/virt/guestagent.py
M vdsm/virt/vm.py
M vdsm/virt/vmdevices/core.py
24 files changed, 23 insertions(+), 22 deletions(-)
git pull ssh://gerrit.ovirt.org:29418/vdsm refs/changes/97/44597/1
diff --git a/debian/vdsm-python.install b/debian/vdsm-python.install
index d9402c3..f4aea24 100644
--- a/debian/vdsm-python.install
+++ b/debian/vdsm-python.install
@@ -30,6 +30,7 @@
./usr/lib/python2.7/dist-packages/vdsm/response.py
./usr/lib/python2.7/dist-packages/vdsm/schedule.py
./usr/lib/python2.7/dist-packages/vdsm/sslutils.py
+./usr/lib/python2.7/dist-packages/vdsm/supervdsm.py
./usr/lib/python2.7/dist-packages/vdsm/tool/__init__.py
./usr/lib/python2.7/dist-packages/vdsm/tool/dummybr.py
./usr/lib/python2.7/dist-packages/vdsm/tool/dump_bonding_defaults.py
diff --git a/debian/vdsm.install b/debian/vdsm.install
index a26c790..b7cc114 100644
--- a/debian/vdsm.install
+++ b/debian/vdsm.install
@@ -133,7 +133,6 @@
./usr/share/vdsm/storage/threadLocal.py
./usr/share/vdsm/storage/threadPool.py
./usr/share/vdsm/storage/volume.py
-./usr/share/vdsm/supervdsm.py
./usr/share/vdsm/supervdsmServer
./usr/share/vdsm/v2v.py
./usr/share/vdsm/vdsm
diff --git a/lib/vdsm/Makefile.am b/lib/vdsm/Makefile.am
index 95e236f..02faeb8 100644
--- a/lib/vdsm/Makefile.am
+++ b/lib/vdsm/Makefile.am
@@ -40,6 +40,7 @@
response.py \
schedule.py \
sslutils.py \
+ supervdsm.py \
sysctl.py \
udevadm.py \
utils.py \
diff --git a/vdsm/supervdsm.py b/lib/vdsm/supervdsm.py
similarity index 100%
rename from vdsm/supervdsm.py
rename to lib/vdsm/supervdsm.py
diff --git a/vdsm.spec.in b/vdsm.spec.in
index 0a44346..98ee569 100644
--- a/vdsm.spec.in
+++ b/vdsm.spec.in
@@ -805,7 +805,6 @@
%{_datadir}/%{vdsm_name}/numaUtils.py*
%{_datadir}/%{vdsm_name}/ppc64HardwareInfo.py*
%{_datadir}/%{vdsm_name}/protocoldetector.py*
-%{_datadir}/%{vdsm_name}/supervdsm.py*
%{_datadir}/%{vdsm_name}/supervdsmServer
%{_datadir}/%{vdsm_name}/v2v.py*
%{_datadir}/%{vdsm_name}/vdsm
@@ -1067,6 +1066,7 @@
%{python_sitelib}/%{vdsm_name}/netconfpersistence.py*
%{python_sitelib}/%{vdsm_name}/schedule.py*
%{python_sitelib}/%{vdsm_name}/sslutils.py*
+%{python_sitelib}/%{vdsm_name}/supervdsm.py*
%{python_sitelib}/%{vdsm_name}/sysctl.py*
%{python_sitelib}/%{vdsm_name}/udevadm.py*
%{python_sitelib}/%{vdsm_name}/utils.py*
diff --git a/vdsm/API.py b/vdsm/API.py
index 8661db7..2566647 100644
--- a/vdsm/API.py
+++ b/vdsm/API.py
@@ -39,6 +39,7 @@
from vdsm import netinfo
from vdsm import constants
from vdsm import response
+from vdsm import supervdsm
import storage.misc
import storage.clusterlock
import storage.volume
@@ -57,7 +58,6 @@
from caps import PAGE_SIZE_BYTES
import v2v
-import supervdsm
haClient = None # Define here to work around pyflakes issue #13
try:
diff --git a/vdsm/Makefile.am b/vdsm/Makefile.am
index 4c0578e..89c2a87 100644
--- a/vdsm/Makefile.am
+++ b/vdsm/Makefile.am
@@ -41,7 +41,6 @@
parted_utils.py \
ppc64HardwareInfo.py \
protocoldetector.py \
- supervdsm.py \
v2v.py \
vdsmDebugPlugin.py \
$(NULL)
diff --git a/vdsm/clientIF.py b/vdsm/clientIF.py
index 44a0f96..8f0263d 100644
--- a/vdsm/clientIF.py
+++ b/vdsm/clientIF.py
@@ -41,9 +41,9 @@
from vdsm import libvirtconnection
from vdsm import constants
from vdsm import utils
+from vdsm import supervdsm
import caps
import blkid
-import supervdsm
from protocoldetector import MultiProtocolAcceptor
from virt import migration
diff --git a/vdsm/gluster/api.py b/vdsm/gluster/api.py
index 781ab77..df612a8 100644
--- a/vdsm/gluster/api.py
+++ b/vdsm/gluster/api.py
@@ -25,10 +25,10 @@
from functools import wraps
from vdsm.define import doneCode
from vdsm import constants, utils
+from vdsm import supervdsm as svdsm
from pwd import getpwnam
from storage import mount
-import supervdsm as svdsm
import exception as ge
from . import makePublic
from . import safeWrite
diff --git a/vdsm/hostdev.py b/vdsm/hostdev.py
index
Change in vdsm[master]: supervdsm: Decorators for supervdsm proxy calls.
Dima Kuznetsov has uploaded a new change for review. Change subject: supervdsm: Decorators for supervdsm proxy calls. .. supervdsm: Decorators for supervdsm proxy calls. These decorators allow automatic dispatch to supervdsm process, in this way: @supervdsm.proxied_call def some_func(): this_requires_root() Calling the above function from root context (such as supervdsm) will just execute it as regular code, but when calling from non-root context, it will try and dispatch it to supervdsm. Change-Id: Ibea2b07b91a7faffda16c71c6b5831f96d116c15 Signed-off-by: Dima Kuznetsov dkuzn...@redhat.com --- M lib/vdsm/supervdsm.py 1 file changed, 20 insertions(+), 0 deletions(-) git pull ssh://gerrit.ovirt.org:29418/vdsm refs/changes/98/44598/1 diff --git a/lib/vdsm/supervdsm.py b/lib/vdsm/supervdsm.py index 8e42af2..a552a82 100644 --- a/lib/vdsm/supervdsm.py +++ b/lib/vdsm/supervdsm.py @@ -19,6 +19,7 @@ # Refer to the README and COPYING files for full details of the license # +import functools import os from multiprocessing.managers import BaseManager, RemoteError import logging @@ -85,6 +86,9 @@ def __getattr__(self, name): return ProxyCaller(self, name) +def call(self, name, *args, **kwargs): +return getattr(self, name)(*args, **kwargs) + def getProxy(): global _g_singletonSupervdsmInstance @@ -93,3 +97,19 @@ if _g_singletonSupervdsmInstance is None: _g_singletonSupervdsmInstance = SuperVdsmProxy() return _g_singletonSupervdsmInstance + + +def named_proxied_call(name): +def decorator(func): +@functools.wraps(func) +def wrapper(*args, **kwargs): +if os.geteuid() == 0: +return func(*args, **kwargs) +else: +return getProxy().call(name, *args, **kwargs) +return wrapper +return decorator + + +def proxied_call(func): +return named_proxied_call(func.func_name) -- To view, visit https://gerrit.ovirt.org/44598 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ibea2b07b91a7faffda16c71c6b5831f96d116c15 Gerrit-PatchSet: 1 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Dima Kuznetsov dkuzn...@redhat.com ___ vdsm-patches mailing list vdsm-patches@lists.fedorahosted.org https://lists.fedorahosted.org/mailman/listinfo/vdsm-patches
Change in vdsm[master]: mount: Perform mount and umount in supervdsm
Dima Kuznetsov has posted comments on this change. Change subject: mount: Perform mount and umount in supervdsm .. Patch Set 4: (2 comments) https://gerrit.ovirt.org/#/c/43969/4/vdsm/storage/mount.py File vdsm/storage/mount.py: Line 208: return not self == other Line 209: Line 210: def __hash__(self): Line 211: return hash((self.__class__, self.fs_spec, self.fs_file)) Line 212: I think rather than having both mount and _umount, we can decorate _mount and _umount with @callThroughSupervdsmIfNonRoot. It will be more useful once we start moving more things to be done with supervdsm rather than sudo. Line 213: def mount(self, mntOpts=None, vfstype=None, timeout=None, cgroup=None): Line 214: mount = supervdsm.getProxy().mount if os.geteuid() != 0 else _mount Line 215: return mount(self.fs_spec, self.fs_file, mntOpts=mntOpts, Line 216: vfstype=vfstype, timeout=timeout, cgroup=cgroup) https://gerrit.ovirt.org/#/c/43969/4/vdsm/supervdsmServer File vdsm/supervdsmServer: Line 152: Line 153: @logDecorator Line 154: def mount(self, fs_spec, fs_file, mntOpts=None, vfstype=None, timeout=None, Line 155: cgroup=None): Line 156: return mount._mount(fs_spec, fs_file, mntOpts=mntOpts, vfstype=vfstype, I think using mount.mount is a bit prettier albeit less fast Line 157: timeout=timeout, cgroup=cgroup) Line 158: Line 159: @logDecorator Line 160: def umount(self, fs_file, force=False, lazy=False, freeloop=False, -- To view, visit https://gerrit.ovirt.org/43969 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: I38fb0eed0ba3e2c36aba8ca4ec262032cb012fc2 Gerrit-PatchSet: 4 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Nir Soffer nsof...@redhat.com Gerrit-Reviewer: Adam Litke ali...@redhat.com Gerrit-Reviewer: Allon Mureinik amure...@redhat.com Gerrit-Reviewer: Dan Kenigsberg dan...@redhat.com Gerrit-Reviewer: Dima Kuznetsov dkuzn...@redhat.com Gerrit-Reviewer: Federico Simoncelli fsimo...@redhat.com Gerrit-Reviewer: Jenkins CI Gerrit-Reviewer: Nir Soffer nsof...@redhat.com Gerrit-Reviewer: Yaniv Bronhaim ybron...@redhat.com Gerrit-Reviewer: automat...@ovirt.org Gerrit-HasComments: Yes ___ vdsm-patches mailing list vdsm-patches@lists.fedorahosted.org https://lists.fedorahosted.org/mailman/listinfo/vdsm-patches
Change in vdsm[ovirt-3.5]: spec: Enable vhostmd on non-koji Fedora builds
Dima Kuznetsov has posted comments on this change. Change subject: spec: Enable vhostmd on non-koji Fedora builds .. Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.ovirt.org/44350 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: Ie0bbca861f60d28bb23404b70888321f90ab101a Gerrit-PatchSet: 1 Gerrit-Project: vdsm Gerrit-Branch: ovirt-3.5 Gerrit-Owner: Dan Kenigsberg dan...@redhat.com Gerrit-Reviewer: Dima Kuznetsov dkuzn...@redhat.com Gerrit-Reviewer: Jenkins CI Gerrit-Reviewer: Yaniv Bronhaim ybron...@redhat.com Gerrit-HasComments: No ___ vdsm-patches mailing list vdsm-patches@lists.fedorahosted.org https://lists.fedorahosted.org/mailman/listinfo/vdsm-patches
Change in vdsm[master]: logging: remove log messages which give little or no value
Dima Kuznetsov has posted comments on this change. Change subject: logging: remove log messages which give little or no value .. Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.ovirt.org/43720 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: If5c6648f39b24adb1a5950c80a3883de0182b3b4 Gerrit-PatchSet: 1 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Piotr Kliczewski piotr.kliczew...@gmail.com Gerrit-Reviewer: Dima Kuznetsov dkuzn...@redhat.com Gerrit-Reviewer: Jenkins CI Gerrit-Reviewer: Piotr Kliczewski piotr.kliczew...@gmail.com Gerrit-Reviewer: Yaniv Bronhaim ybron...@redhat.com Gerrit-Reviewer: Yeela Kaplan ykap...@redhat.com Gerrit-Reviewer: automat...@ovirt.org Gerrit-HasComments: No ___ vdsm-patches mailing list vdsm-patches@lists.fedorahosted.org https://lists.fedorahosted.org/mailman/listinfo/vdsm-patches
Change in vdsm[master]: migration: fix parameters
Dima Kuznetsov has posted comments on this change. Change subject: migration: fix parameters .. Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.ovirt.org/44120 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: I940eeb557378d53670779607d4a1379be3ac0c09 Gerrit-PatchSet: 1 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Yeela Kaplan ykap...@redhat.com Gerrit-Reviewer: Dima Kuznetsov dkuzn...@redhat.com Gerrit-Reviewer: Jenkins CI Gerrit-Reviewer: Yeela Kaplan ykap...@redhat.com Gerrit-Reviewer: automat...@ovirt.org Gerrit-HasComments: No ___ vdsm-patches mailing list vdsm-patches@lists.fedorahosted.org https://lists.fedorahosted.org/mailman/listinfo/vdsm-patches
Change in vdsm[master]: fakevmstats: add config entry to enable/disable the hook
Dima Kuznetsov has posted comments on this change. Change subject: fakevmstats: add config entry to enable/disable the hook .. Patch Set 5: Code-Review+1 -- To view, visit https://gerrit.ovirt.org/43931 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: I6949445d8b98d5f4cd4f441362338791dfa664c1 Gerrit-PatchSet: 5 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Martin Polednik mpoled...@redhat.com Gerrit-Reviewer: Dan Kenigsberg dan...@redhat.com Gerrit-Reviewer: Dima Kuznetsov dkuzn...@redhat.com Gerrit-Reviewer: Jenkins CI Gerrit-Reviewer: Martin Polednik mpoled...@redhat.com Gerrit-Reviewer: Michal Skrivanek michal.skriva...@redhat.com Gerrit-Reviewer: Michal Skrivanek mskri...@redhat.com Gerrit-Reviewer: Vinzenz Feenstra vfeen...@redhat.com Gerrit-Reviewer: Yaniv Bronhaim ybron...@redhat.com Gerrit-Reviewer: automat...@ovirt.org Gerrit-HasComments: No ___ vdsm-patches mailing list vdsm-patches@lists.fedorahosted.org https://lists.fedorahosted.org/mailman/listinfo/vdsm-patches
Change in vdsm[master]: concurrent: Add Barrier class
Dima Kuznetsov has posted comments on this change. Change subject: concurrent: Add Barrier class .. Patch Set 7: Code-Review+1 -- To view, visit https://gerrit.ovirt.org/42927 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: I68525e18f6b3774d7e10af1226a7bc3404c68ae9 Gerrit-PatchSet: 7 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Nir Soffer nsof...@redhat.com Gerrit-Reviewer: Adam Litke ali...@redhat.com Gerrit-Reviewer: Ala Hino ah...@redhat.com Gerrit-Reviewer: Allon Mureinik amure...@redhat.com Gerrit-Reviewer: Dan Kenigsberg dan...@redhat.com Gerrit-Reviewer: Dima Kuznetsov dkuzn...@redhat.com Gerrit-Reviewer: Fabian Deutsch fabi...@redhat.com Gerrit-Reviewer: Francesco Romani from...@redhat.com Gerrit-Reviewer: Freddy Rolland froll...@redhat.com Gerrit-Reviewer: Jenkins CI Gerrit-Reviewer: Nir Soffer nsof...@redhat.com Gerrit-Reviewer: Yaniv Bronhaim ybron...@redhat.com Gerrit-Reviewer: automat...@ovirt.org Gerrit-HasComments: No ___ vdsm-patches mailing list vdsm-patches@lists.fedorahosted.org https://lists.fedorahosted.org/mailman/listinfo/vdsm-patches
Change in vdsm[master]: [WIP] spmprotect: Switch from fencing by pid to fencing usin...
Dima Kuznetsov has posted comments on this change. Change subject: [WIP] spmprotect: Switch from fencing by pid to fencing using systemctl .. Patch Set 5: (1 comment) https://gerrit.ovirt.org/#/c/43211/5/vdsm/storage/protect/spmprotect.sh.in File vdsm/storage/protect/spmprotect.sh.in: Line 73: (sleep 20 echodo $REBOOTCMD) Line 74: disown Line 75: (sleep 7 Line 76: log Trying to stop vdsm for sdUUID=$sdUUID id=$ID lease_path=$LEASE_FILE Line 77: echodo $SYSTEMCTL kill --signal=$(kill -t SIGTERM) vdsmd.service See https://github.com/systemd/systemd/blob/aab723074c368f65aaf2748d0c530ba +1 for names, the numbers themselves are not portable across architectures. Line 78: sleep 2 Line 79: echodo $SYSTEMCTL kill --signal=$(kill -t SIGKILL) vdsmd.service Line 80: ) Line 81: disown -- To view, visit https://gerrit.ovirt.org/43211 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: Ifdea618514232a1f751afae54337de787f297b9e Gerrit-PatchSet: 5 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Dima Kuznetsov dkuzn...@redhat.com Gerrit-Reviewer: Dan Kenigsberg dan...@redhat.com Gerrit-Reviewer: Dima Kuznetsov dkuzn...@redhat.com Gerrit-Reviewer: Jenkins CI Gerrit-Reviewer: Nir Soffer nsof...@redhat.com Gerrit-Reviewer: Yaniv Bronhaim ybron...@redhat.com Gerrit-Reviewer: Yeela Kaplan ykap...@redhat.com Gerrit-Reviewer: automat...@ovirt.org Gerrit-HasComments: Yes ___ vdsm-patches mailing list vdsm-patches@lists.fedorahosted.org https://lists.fedorahosted.org/mailman/listinfo/vdsm-patches
Change in vdsm[ovirt-3.5]: logging: remove log messages which give little or no value
Dima Kuznetsov has posted comments on this change. Change subject: logging: remove log messages which give little or no value .. Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.ovirt.org/43262 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: If5c6648f39b24adb1a5950c80a3883de0182b3b4 Gerrit-PatchSet: 1 Gerrit-Project: vdsm Gerrit-Branch: ovirt-3.5 Gerrit-Owner: Piotr Kliczewski piotr.kliczew...@gmail.com Gerrit-Reviewer: Dima Kuznetsov dkuzn...@redhat.com Gerrit-Reviewer: Jenkins CI Gerrit-Reviewer: Piotr Kliczewski piotr.kliczew...@gmail.com Gerrit-Reviewer: Yaniv Bronhaim ybron...@redhat.com Gerrit-Reviewer: Yeela Kaplan ykap...@redhat.com Gerrit-Reviewer: automat...@ovirt.org Gerrit-HasComments: No ___ vdsm-patches mailing list vdsm-patches@lists.fedorahosted.org https://lists.fedorahosted.org/mailman/listinfo/vdsm-patches
Change in vdsm[master]: [WIP] spmprotect: Switch from fencing by pid to fencing usin...
Dima Kuznetsov has posted comments on this change. Change subject: [WIP] spmprotect: Switch from fencing by pid to fencing using systemctl .. Patch Set 4: (1 comment) https://gerrit.ovirt.org/#/c/43211/4/vdsm/storage/protect/spmprotect.sh.in File vdsm/storage/protect/spmprotect.sh.in: Line 73: (sleep 20 echodo $REBOOTCMD) Line 74: disown Line 75: (sleep 7 Line 76: log Trying to stop vdsm for sdUUID=$sdUUID id=$ID lease_path=$LEASE_FILE Line 77: echodo $SYSTEMCTL restart vdsmd.service This is not equivalent to the original code. sysemctl restart can take 20 s I wrote it as you suggested first (rev1) but I think it is kind of a wrong approach. If we're to get rid of this code soon I won't oppose, but this code attempts to restart a service managed by systemd, and it should use facilities provided by systemd. Line 78: ) Line 79: disown Line 80: Line 81: echodo $SYSTEMCTL kill --signal=30 vdsmd.service -- To view, visit https://gerrit.ovirt.org/43211 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: Ifdea618514232a1f751afae54337de787f297b9e Gerrit-PatchSet: 4 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Dima Kuznetsov dkuzn...@redhat.com Gerrit-Reviewer: Dan Kenigsberg dan...@redhat.com Gerrit-Reviewer: Dima Kuznetsov dkuzn...@redhat.com Gerrit-Reviewer: Jenkins CI Gerrit-Reviewer: Nir Soffer nsof...@redhat.com Gerrit-Reviewer: Yaniv Bronhaim ybron...@redhat.com Gerrit-Reviewer: automat...@ovirt.org Gerrit-HasComments: Yes ___ vdsm-patches mailing list vdsm-patches@lists.fedorahosted.org https://lists.fedorahosted.org/mailman/listinfo/vdsm-patches
Change in vdsm[master]: rwlock: Add simpler RWLock
Dima Kuznetsov has posted comments on this change. Change subject: rwlock: Add simpler RWLock .. Patch Set 6: Code-Review+1 (1 comment) https://gerrit.ovirt.org/#/c/42908/6/lib/vdsm/rwlock.py File lib/vdsm/rwlock.py: Line 43: if self._writer or self._waiters: Line 44: self._wait(False) Line 45: self._readers.add(threading.current_thread()) Line 46: if self._waiters: Line 47: self._wakeup_next_waiter() +1 Line 48: Line 49: def release(self): Line 50: me = threading.current_thread() Line 51: with self._lock: -- To view, visit https://gerrit.ovirt.org/42908 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: I2466c137c89598772fb46347eb02195916883cac Gerrit-PatchSet: 6 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Nir Soffer nsof...@redhat.com Gerrit-Reviewer: Adam Litke ali...@redhat.com Gerrit-Reviewer: Ala Hino ah...@redhat.com Gerrit-Reviewer: Allon Mureinik amure...@redhat.com Gerrit-Reviewer: Dan Kenigsberg dan...@redhat.com Gerrit-Reviewer: Dima Kuznetsov dkuzn...@redhat.com Gerrit-Reviewer: Federico Simoncelli fsimo...@redhat.com Gerrit-Reviewer: Freddy Rolland froll...@redhat.com Gerrit-Reviewer: Jenkins CI Gerrit-Reviewer: Nir Soffer nsof...@redhat.com Gerrit-Reviewer: Yaniv Bronhaim ybron...@redhat.com Gerrit-Reviewer: automat...@ovirt.org Gerrit-HasComments: Yes ___ vdsm-patches mailing list vdsm-patches@lists.fedorahosted.org https://lists.fedorahosted.org/mailman/listinfo/vdsm-patches
Change in vdsm[master]: [WIP] spmprotect: Switch from fencing by pid to fencing usin...
Dima Kuznetsov has posted comments on this change.
Change subject: [WIP] spmprotect: Switch from fencing by pid to fencing using
systemctl
..
Patch Set 4:
(1 comment)
https://gerrit.ovirt.org/#/c/43211/4/vdsm/storage/protect/spmprotect.sh.in
File vdsm/storage/protect/spmprotect.sh.in:
Line 73: (sleep 20 echodo $REBOOTCMD)
Line 74: disown
Line 75: (sleep 7
Line 76: log Trying to stop vdsm for sdUUID=$sdUUID id=$ID
lease_path=$LEASE_FILE
Line 77: echodo $SYSTEMCTL restart vdsmd.service
We are not getting rid of this code soon, we must support this for few year
Well, it looks like sysvinit (used to) run {super,}vdsmd with respawn, so
basically this gets rid of the running vdsm instance and brings up a fresh one.
I'll send a version with your suggestions but I propose we think of a prettier
way to interact with systemd services.
Line 78: )
Line 79: disown
Line 80:
Line 81: echodo $SYSTEMCTL kill --signal=30 vdsmd.service
--
To view, visit https://gerrit.ovirt.org/43211
To unsubscribe, visit https://gerrit.ovirt.org/settings
Gerrit-MessageType: comment
Gerrit-Change-Id: Ifdea618514232a1f751afae54337de787f297b9e
Gerrit-PatchSet: 4
Gerrit-Project: vdsm
Gerrit-Branch: master
Gerrit-Owner: Dima Kuznetsov dkuzn...@redhat.com
Gerrit-Reviewer: Dan Kenigsberg dan...@redhat.com
Gerrit-Reviewer: Dima Kuznetsov dkuzn...@redhat.com
Gerrit-Reviewer: Jenkins CI
Gerrit-Reviewer: Nir Soffer nsof...@redhat.com
Gerrit-Reviewer: Yaniv Bronhaim ybron...@redhat.com
Gerrit-Reviewer: automat...@ovirt.org
Gerrit-HasComments: Yes
___
vdsm-patches mailing list
vdsm-patches@lists.fedorahosted.org
https://lists.fedorahosted.org/mailman/listinfo/vdsm-patches
Change in vdsm[master]: [WIP] spmprotect: Switch from fencing by pid to fencing usin...
Dima Kuznetsov has posted comments on this change. Change subject: [WIP] spmprotect: Switch from fencing by pid to fencing using systemctl .. Patch Set 4: (1 comment) https://gerrit.ovirt.org/#/c/43211/4/vdsm/storage/protect/spmprotect.sh.in File vdsm/storage/protect/spmprotect.sh.in: Line 73: (sleep 20 echodo $REBOOTCMD) Line 74: disown Line 75: (sleep 7 Line 76: log Trying to stop vdsm for sdUUID=$sdUUID id=$ID lease_path=$LEASE_FILE Line 77: echodo $SYSTEMCTL restart vdsmd.service What is wrong with systemctl kill that you suggested bellow? I think that if the semantic is just to restart vdsm, there is a more intuitive way to do it, thats all. Line 78: ) Line 79: disown Line 80: Line 81: echodo $SYSTEMCTL kill --signal=30 vdsmd.service -- To view, visit https://gerrit.ovirt.org/43211 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: Ifdea618514232a1f751afae54337de787f297b9e Gerrit-PatchSet: 4 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Dima Kuznetsov dkuzn...@redhat.com Gerrit-Reviewer: Dan Kenigsberg dan...@redhat.com Gerrit-Reviewer: Dima Kuznetsov dkuzn...@redhat.com Gerrit-Reviewer: Jenkins CI Gerrit-Reviewer: Nir Soffer nsof...@redhat.com Gerrit-Reviewer: Yaniv Bronhaim ybron...@redhat.com Gerrit-Reviewer: automat...@ovirt.org Gerrit-HasComments: Yes ___ vdsm-patches mailing list vdsm-patches@lists.fedorahosted.org https://lists.fedorahosted.org/mailman/listinfo/vdsm-patches
Change in vdsm[master]: tool: Remove upstart handling in libvirt configurator
Dima Kuznetsov has abandoned this change. Change subject: tool: Remove upstart handling in libvirt configurator .. Abandoned -- To view, visit https://gerrit.ovirt.org/40420 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: abandon Gerrit-Change-Id: Ic71430103cb04a5636b4b41371852cbf68495db7 Gerrit-PatchSet: 6 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Dima Kuznetsov dkuzn...@redhat.com Gerrit-Reviewer: Dan Kenigsberg dan...@redhat.com Gerrit-Reviewer: Jenkins CI Gerrit-Reviewer: Mooli Tayer mta...@redhat.com Gerrit-Reviewer: Yaniv Bronhaim ybron...@redhat.com Gerrit-Reviewer: Yeela Kaplan ykap...@redhat.com Gerrit-Reviewer: automat...@ovirt.org ___ vdsm-patches mailing list vdsm-patches@lists.fedorahosted.org https://lists.fedorahosted.org/mailman/listinfo/vdsm-patches
Change in vdsm[master]: [wip] spec: Drop el6 support
Dima Kuznetsov has abandoned this change. Change subject: [wip] spec: Drop el6 support .. Abandoned -- To view, visit https://gerrit.ovirt.org/40419 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: abandon Gerrit-Change-Id: I52bf73f539d9036fbc3468b4faf8a8d6556c9560 Gerrit-PatchSet: 7 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Dima Kuznetsov dkuzn...@redhat.com Gerrit-Reviewer: Allon Mureinik amure...@redhat.com Gerrit-Reviewer: Dan Kenigsberg dan...@redhat.com Gerrit-Reviewer: Dima Kuznetsov dkuzn...@redhat.com Gerrit-Reviewer: Ido Barkan ibar...@redhat.com Gerrit-Reviewer: Jenkins CI Gerrit-Reviewer: Nir Soffer nsof...@redhat.com Gerrit-Reviewer: Yaniv Bronhaim ybron...@redhat.com Gerrit-Reviewer: Yeela Kaplan ykap...@redhat.com Gerrit-Reviewer: automat...@ovirt.org ___ vdsm-patches mailing list vdsm-patches@lists.fedorahosted.org https://lists.fedorahosted.org/mailman/listinfo/vdsm-patches
Change in vdsm[master]: spmprotect: Switch from fencing by pid to fencing using syst...
Dima Kuznetsov has uploaded a new change for review.
Change subject: spmprotect: Switch from fencing by pid to fencing using
systemctl
..
spmprotect: Switch from fencing by pid to fencing using systemctl
Change-Id: Ifdea618514232a1f751afae54337de787f297b9e
Signed-off-by: Dima Kuznetsov dkuzn...@redhat.com
---
M vdsm/storage/protect/spmprotect.sh.in
1 file changed, 5 insertions(+), 6 deletions(-)
git pull ssh://gerrit.ovirt.org:29418/vdsm refs/changes/11/43211/1
diff --git a/vdsm/storage/protect/spmprotect.sh.in
b/vdsm/storage/protect/spmprotect.sh.in
index 101cac0..099e40f 100755
--- a/vdsm/storage/protect/spmprotect.sh.in
+++ b/vdsm/storage/protect/spmprotect.sh.in
@@ -25,14 +25,13 @@
LOGFILE=/var/log/vdsm/spm-lock.log
VDS_CLIENT=/usr/bin/vdsClient
LEASE_UTIL=@SAFELEASE_PATH@
+SYSTEMCTL=/bin/systemctl
KILL=/bin/kill
PKILL=/usr/bin/pkill
sdUUID=$2
CHECKVDSM=${CHECKVDSM:-/usr/bin/pgrep vdsm}
REBOOTCMD=${REBOOTCMD:-sudo /sbin/reboot -f}
RENEWDIR=/var/run/vdsm/spmprotect/$$
-VDSM_PIDFILE=/var/run/vdsm/vdsmd.pid
-VDSM_PID=`/bin/cat $VDSM_PIDFILE`
function usage() {
if [ -n $1 ]; then
@@ -75,13 +74,13 @@
disown
(sleep 7
log Trying to stop vdsm for sdUUID=$sdUUID id=$ID
lease_path=$LEASE_FILE
-echodo $KILL $VDSM_PID
+echodo $SYSTEMCTL kill --signal=15 vdsmd.service
sleep 2
-echodo $KILL -9 $VDSM_PID
+echodo $SYSTEMCTL kill --signal=9 vdsmd.service
)
disown
-echodo $KILL -USR1 $VDSM_PID
+echodo $SYSTEMCTL kill --signal=30 vdsmd.service
rm -fr $RENEWDIR
trap EXIT
@@ -206,7 +205,7 @@
dbg=-d
fi
-log Protecting spm lock for vdsm pid $VDSM_PID
+log Protecting spm lock for vdsmd
case $1 in
start)
--
To view, visit https://gerrit.ovirt.org/43211
To unsubscribe, visit https://gerrit.ovirt.org/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ifdea618514232a1f751afae54337de787f297b9e
Gerrit-PatchSet: 1
Gerrit-Project: vdsm
Gerrit-Branch: master
Gerrit-Owner: Dima Kuznetsov dkuzn...@redhat.com
___
vdsm-patches mailing list
vdsm-patches@lists.fedorahosted.org
https://lists.fedorahosted.org/mailman/listinfo/vdsm-patches
Change in vdsm[master]: supervdsm: Add zombiereaper to supervdsm
Dima Kuznetsov has posted comments on this change. Change subject: supervdsm: Add zombiereaper to supervdsm .. Patch Set 6: Verified+1 Verified by running the system tests (all kinds of storage) no zombies appeared, also reverted to make sure they do appear without this code. -- To view, visit https://gerrit.ovirt.org/39780 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: I938a1f2bc70fceab2c69bc8b3d8c0724a9da7720 Gerrit-PatchSet: 6 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Dima Kuznetsov dkuzn...@redhat.com Gerrit-Reviewer: Dan Kenigsberg dan...@redhat.com Gerrit-Reviewer: Dima Kuznetsov dkuzn...@redhat.com Gerrit-Reviewer: Jenkins CI Gerrit-Reviewer: Yaniv Bronhaim ybron...@redhat.com Gerrit-Reviewer: automat...@ovirt.org Gerrit-HasComments: No ___ vdsm-patches mailing list vdsm-patches@lists.fedorahosted.org https://lists.fedorahosted.org/mailman/listinfo/vdsm-patches
Change in vdsm[master]: Removing support in sysv and upstart
Dima Kuznetsov has posted comments on this change. Change subject: Removing support in sysv and upstart .. Patch Set 13: Code-Review+1 -- To view, visit https://gerrit.ovirt.org/40726 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: Ib9af14b3d78badc5250042508d25f294dc514a2d Gerrit-PatchSet: 13 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Yaniv Bronhaim ybron...@redhat.com Gerrit-Reviewer: Dan Kenigsberg dan...@redhat.com Gerrit-Reviewer: Dima Kuznetsov dkuzn...@redhat.com Gerrit-Reviewer: Jenkins CI Gerrit-Reviewer: Nir Soffer nsof...@redhat.com Gerrit-Reviewer: Yaniv Bronhaim ybron...@redhat.com Gerrit-Reviewer: Yeela Kaplan ykap...@redhat.com Gerrit-Reviewer: automat...@ovirt.org Gerrit-HasComments: No ___ vdsm-patches mailing list vdsm-patches@lists.fedorahosted.org https://lists.fedorahosted.org/mailman/listinfo/vdsm-patches
Change in vdsm[master]: tests: Add RWLock tests
Dima Kuznetsov has posted comments on this change. Change subject: tests: Add RWLock tests .. Patch Set 4: Code-Review+1 -- To view, visit https://gerrit.ovirt.org/42907 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: If404f0e8c68fcdb2f7643bdd6d5c1f97f230a227 Gerrit-PatchSet: 4 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Nir Soffer nsof...@redhat.com Gerrit-Reviewer: Adam Litke ali...@redhat.com Gerrit-Reviewer: Allon Mureinik amure...@redhat.com Gerrit-Reviewer: Dan Kenigsberg dan...@redhat.com Gerrit-Reviewer: Dima Kuznetsov dkuzn...@redhat.com Gerrit-Reviewer: Federico Simoncelli fsimo...@redhat.com Gerrit-Reviewer: Jenkins CI Gerrit-Reviewer: Nir Soffer nsof...@redhat.com Gerrit-Reviewer: Yaniv Bronhaim ybron...@redhat.com Gerrit-Reviewer: automat...@ovirt.org Gerrit-HasComments: No ___ vdsm-patches mailing list vdsm-patches@lists.fedorahosted.org https://lists.fedorahosted.org/mailman/listinfo/vdsm-patches
Change in vdsm[master]: rwlock: Support timed acquire
Dima Kuznetsov has posted comments on this change. Change subject: rwlock: Support timed acquire .. Patch Set 6: Code-Review+1 (1 comment) https://gerrit.ovirt.org/#/c/42909/6/lib/vdsm/rwlock.py File lib/vdsm/rwlock.py: Line 89: def __init__(self, wants_write): Line 90: self.wants_write = wants_write Line 91: self._event = threading.Event() Line 92: Line 93: def wait(self, timeout): I think timeout=None is a good idea if Waiter is intended for external consumption Line 94: if not self._event.wait(timeout): Line 95: raise Timeout(Timeout acquiring lock for %s % Line 96: writing if self.wants_write else reading) Line 97: -- To view, visit https://gerrit.ovirt.org/42909 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: Idd9b11452d74b566b8989f41244f2d0534327214 Gerrit-PatchSet: 6 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Nir Soffer nsof...@redhat.com Gerrit-Reviewer: Adam Litke ali...@redhat.com Gerrit-Reviewer: Ala Hino ah...@redhat.com Gerrit-Reviewer: Allon Mureinik amure...@redhat.com Gerrit-Reviewer: Dan Kenigsberg dan...@redhat.com Gerrit-Reviewer: Dima Kuznetsov dkuzn...@redhat.com Gerrit-Reviewer: Federico Simoncelli fsimo...@redhat.com Gerrit-Reviewer: Freddy Rolland froll...@redhat.com Gerrit-Reviewer: Jenkins CI Gerrit-Reviewer: Yaniv Bronhaim ybron...@redhat.com Gerrit-Reviewer: automat...@ovirt.org Gerrit-HasComments: Yes ___ vdsm-patches mailing list vdsm-patches@lists.fedorahosted.org https://lists.fedorahosted.org/mailman/listinfo/vdsm-patches
Change in vdsm[master]: rwlock: Add simpler RWLock
Dima Kuznetsov has posted comments on this change. Change subject: rwlock: Add simpler RWLock .. Patch Set 4: (2 comments) https://gerrit.ovirt.org/#/c/42908/4/lib/vdsm/rwlock.py File lib/vdsm/rwlock.py: Line 31: self._waiters = [] Line 32: self._readers = set() Line 33: self._writer = None Line 34: Line 35: def acquireWrite(self): Can we have pep8 method names? Line 36: with self._lock: Line 37: if self._writer or self._readers or self._waiters: Line 38: self._wait(True) Line 39: self._writer = threading.current_thread() Line 73: self._lock.acquire() Line 74: finally: Line 75: self._waiters.remove(waiter) Line 76: Line 77: def _wakeup_waiter(self): Does this wake up all queued readers after write unlock? Line 78: if self._readers and self._waiters[0].wants_write: Line 79: return Line 80: self._waiters[0].wakeup() Line 81: -- To view, visit https://gerrit.ovirt.org/42908 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: I2466c137c89598772fb46347eb02195916883cac Gerrit-PatchSet: 4 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Nir Soffer nsof...@redhat.com Gerrit-Reviewer: Adam Litke ali...@redhat.com Gerrit-Reviewer: Ala Hino ah...@redhat.com Gerrit-Reviewer: Allon Mureinik amure...@redhat.com Gerrit-Reviewer: Dan Kenigsberg dan...@redhat.com Gerrit-Reviewer: Dima Kuznetsov dkuzn...@redhat.com Gerrit-Reviewer: Federico Simoncelli fsimo...@redhat.com Gerrit-Reviewer: Freddy Rolland froll...@redhat.com Gerrit-Reviewer: Jenkins CI Gerrit-Reviewer: Nir Soffer nsof...@redhat.com Gerrit-Reviewer: Yaniv Bronhaim ybron...@redhat.com Gerrit-Reviewer: automat...@ovirt.org Gerrit-HasComments: Yes ___ vdsm-patches mailing list vdsm-patches@lists.fedorahosted.org https://lists.fedorahosted.org/mailman/listinfo/vdsm-patches
Change in vdsm[master]: concurrent: Add CountedEvent class
Dima Kuznetsov has posted comments on this change. Change subject: concurrent: Add CountedEvent class .. Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.ovirt.org/42927 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: I68525e18f6b3774d7e10af1226a7bc3404c68ae9 Gerrit-PatchSet: 1 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Nir Soffer nsof...@redhat.com Gerrit-Reviewer: Adam Litke ali...@redhat.com Gerrit-Reviewer: Ala Hino ah...@redhat.com Gerrit-Reviewer: Allon Mureinik amure...@redhat.com Gerrit-Reviewer: Dan Kenigsberg dan...@redhat.com Gerrit-Reviewer: Dima Kuznetsov dkuzn...@redhat.com Gerrit-Reviewer: Freddy Rolland froll...@redhat.com Gerrit-Reviewer: Jenkins CI Gerrit-Reviewer: Nir Soffer nsof...@redhat.com Gerrit-Reviewer: Yaniv Bronhaim ybron...@redhat.com Gerrit-Reviewer: automat...@ovirt.org Gerrit-HasComments: No ___ vdsm-patches mailing list vdsm-patches@lists.fedorahosted.org https://lists.fedorahosted.org/mailman/listinfo/vdsm-patches
Change in vdsm[master]: Introducing systemctl configurator to enable vdsm required s...
Dima Kuznetsov has posted comments on this change. Change subject: Introducing systemctl configurator to enable vdsm required services .. Patch Set 8: Code-Review+1 -- To view, visit https://gerrit.ovirt.org/42605 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: I796fefe13da9c0f5c7bc2b6cd5d7c98779a3f259 Gerrit-PatchSet: 8 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Yaniv Bronhaim ybron...@redhat.com Gerrit-Reviewer: Dan Kenigsberg dan...@redhat.com Gerrit-Reviewer: Dima Kuznetsov dkuzn...@redhat.com Gerrit-Reviewer: Jenkins CI Gerrit-Reviewer: Yaniv Bronhaim ybron...@redhat.com Gerrit-Reviewer: Yeela Kaplan ykap...@redhat.com Gerrit-Reviewer: automat...@ovirt.org Gerrit-HasComments: No ___ vdsm-patches mailing list vdsm-patches@lists.fedorahosted.org https://lists.fedorahosted.org/mailman/listinfo/vdsm-patches
Change in vdsm[master]: Removing libvirt configure fallback from spec
Dima Kuznetsov has posted comments on this change. Change subject: Removing libvirt configure fallback from spec .. Patch Set 6: Code-Review+1 -- To view, visit https://gerrit.ovirt.org/40669 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: I5f1de9f34bdad5fbb0fda9d0fd31887a6e413d6a Gerrit-PatchSet: 6 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Yaniv Bronhaim ybron...@redhat.com Gerrit-Reviewer: Dan Kenigsberg dan...@redhat.com Gerrit-Reviewer: David Caro dcaro...@redhat.com Gerrit-Reviewer: Dima Kuznetsov dkuzn...@redhat.com Gerrit-Reviewer: Jenkins CI Gerrit-Reviewer: Yaniv Bronhaim ybron...@redhat.com Gerrit-Reviewer: automat...@ovirt.org Gerrit-HasComments: No ___ vdsm-patches mailing list vdsm-patches@lists.fedorahosted.org https://lists.fedorahosted.org/mailman/listinfo/vdsm-patches
Change in vdsm[master]: Remove el6 specific code from spec
Dima Kuznetsov has posted comments on this change.
Change subject: Remove el6 specific code from spec
..
Patch Set 3: Code-Review+1
(1 comment)
Small thing, don't mind if you fix it later
https://gerrit.ovirt.org/#/c/42317/3/vdsm.spec.in
File vdsm.spec.in:
Line 55: %if ! 0%{?rhel} || ! 0%{fedora_koji_build}
Line 56: %global with_vhostmd 1
Line 57: %endif
Line 58:
Line 59: %if 0%{?fedora} || 0%{?rhel} = 7
can be || 0%{?rhel}
Line 60: %global with_systemd 1
Line 61: %endif
Line 62:
Line 63: %global _udevrulesdir /usr/lib/udev/rules.d/
--
To view, visit https://gerrit.ovirt.org/42317
To unsubscribe, visit https://gerrit.ovirt.org/settings
Gerrit-MessageType: comment
Gerrit-Change-Id: Ifef95b7c61b8bd8c86ef2642e74275da87659cb8
Gerrit-PatchSet: 3
Gerrit-Project: vdsm
Gerrit-Branch: master
Gerrit-Owner: Yaniv Bronhaim ybron...@redhat.com
Gerrit-Reviewer: Dan Kenigsberg dan...@redhat.com
Gerrit-Reviewer: Dima Kuznetsov dkuzn...@redhat.com
Gerrit-Reviewer: Jenkins CI
Gerrit-Reviewer: Yaniv Bronhaim ybron...@redhat.com
Gerrit-Reviewer: automat...@ovirt.org
Gerrit-HasComments: Yes
___
vdsm-patches mailing list
vdsm-patches@lists.fedorahosted.org
https://lists.fedorahosted.org/mailman/listinfo/vdsm-patches
Change in vdsm[master]: Remove el6 specific code from spec
Dima Kuznetsov has posted comments on this change.
Change subject: Remove el6 specific code from spec
..
Patch Set 3:
(1 comment)
https://gerrit.ovirt.org/#/c/42317/3/vdsm.spec.in
File vdsm.spec.in:
Line 55: %if ! 0%{?rhel} || ! 0%{fedora_koji_build}
Line 56: %global with_vhostmd 1
Line 57: %endif
Line 58:
Line 59: %if 0%{?fedora} || 0%{?rhel} = 7
can be || 0%{?rhel}
Nevermind, I see its removed in next commit
Line 60: %global with_systemd 1
Line 61: %endif
Line 62:
Line 63: %global _udevrulesdir /usr/lib/udev/rules.d/
--
To view, visit https://gerrit.ovirt.org/42317
To unsubscribe, visit https://gerrit.ovirt.org/settings
Gerrit-MessageType: comment
Gerrit-Change-Id: Ifef95b7c61b8bd8c86ef2642e74275da87659cb8
Gerrit-PatchSet: 3
Gerrit-Project: vdsm
Gerrit-Branch: master
Gerrit-Owner: Yaniv Bronhaim ybron...@redhat.com
Gerrit-Reviewer: Dan Kenigsberg dan...@redhat.com
Gerrit-Reviewer: Dima Kuznetsov dkuzn...@redhat.com
Gerrit-Reviewer: Jenkins CI
Gerrit-Reviewer: Yaniv Bronhaim ybron...@redhat.com
Gerrit-Reviewer: automat...@ovirt.org
Gerrit-HasComments: Yes
___
vdsm-patches mailing list
vdsm-patches@lists.fedorahosted.org
https://lists.fedorahosted.org/mailman/listinfo/vdsm-patches
Change in vdsm[master]: Introducing systemctl configurator to enable vdsm required s...
Dima Kuznetsov has posted comments on this change. Change subject: Introducing systemctl configurator to enable vdsm required services .. Patch Set 2: (1 comment) https://gerrit.ovirt.org/#/c/42605/2/lib/vdsm/tool/configurators/systemctl.py File lib/vdsm/tool/configurators/systemctl.py: Line 25: Line 26: from vdsm.tool import service Line 27: Line 28: Line 29: REQUIRED_SERVICES = ['vdsmd', 'supervdsmd', 'vdsm-network', 'mom-vdsm'] make private: I'd add the .service although it works quite well without. Line 30: Line 31: Line 32: def isconfigured(): Line 33: -- To view, visit https://gerrit.ovirt.org/42605 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: I796fefe13da9c0f5c7bc2b6cd5d7c98779a3f259 Gerrit-PatchSet: 2 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Yaniv Bronhaim ybron...@redhat.com Gerrit-Reviewer: Dan Kenigsberg dan...@redhat.com Gerrit-Reviewer: Dima Kuznetsov dkuzn...@redhat.com Gerrit-Reviewer: Jenkins CI Gerrit-Reviewer: Yeela Kaplan ykap...@redhat.com Gerrit-Reviewer: automat...@ovirt.org Gerrit-HasComments: Yes ___ vdsm-patches mailing list vdsm-patches@lists.fedorahosted.org https://lists.fedorahosted.org/mailman/listinfo/vdsm-patches
Change in vdsm[master]: Removing support in sysv and upstart
Dima Kuznetsov has posted comments on this change. Change subject: Removing support in sysv and upstart .. Patch Set 8: Code-Review+1 (1 comment) https://gerrit.ovirt.org/#/c/40726/8/vdsm/clientIF.py File vdsm/clientIF.py: Line 520: vmId, fileType = f.split(., 1) Line 521: exts = [guest.socket, monitor.socket, Line 522: stdio.dump, recovery] Line 523: if fileType in exts and vmId not in self.vmContainer: Line 524: self.log.debug(removing old file + f) +1 looks much better Line 525: utils.rmFile(constants.P_VDSM_RUN + f) Line 526: except: Line 527: pass Line 528: -- To view, visit https://gerrit.ovirt.org/40726 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: Ib9af14b3d78badc5250042508d25f294dc514a2d Gerrit-PatchSet: 8 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Yaniv Bronhaim ybron...@redhat.com Gerrit-Reviewer: Dan Kenigsberg dan...@redhat.com Gerrit-Reviewer: Dima Kuznetsov dkuzn...@redhat.com Gerrit-Reviewer: Jenkins CI Gerrit-Reviewer: Nir Soffer nsof...@redhat.com Gerrit-Reviewer: Yaniv Bronhaim ybron...@redhat.com Gerrit-Reviewer: Yeela Kaplan ykap...@redhat.com Gerrit-Reviewer: automat...@ovirt.org Gerrit-HasComments: Yes ___ vdsm-patches mailing list vdsm-patches@lists.fedorahosted.org https://lists.fedorahosted.org/mailman/listinfo/vdsm-patches
Change in vdsm[master]: Remove el6 specific code from spec
Dima Kuznetsov has posted comments on this change. Change subject: Remove el6 specific code from spec .. Patch Set 2: Code-Review+1 -- To view, visit https://gerrit.ovirt.org/42317 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: Ifef95b7c61b8bd8c86ef2642e74275da87659cb8 Gerrit-PatchSet: 2 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Yaniv Bronhaim ybron...@redhat.com Gerrit-Reviewer: Dima Kuznetsov dkuzn...@redhat.com Gerrit-Reviewer: Jenkins CI Gerrit-Reviewer: automat...@ovirt.org Gerrit-HasComments: No ___ vdsm-patches mailing list vdsm-patches@lists.fedorahosted.org https://lists.fedorahosted.org/mailman/listinfo/vdsm-patches
Change in vdsm[master]: Removing support in sysv and upstart
Dima Kuznetsov has posted comments on this change. Change subject: Removing support in sysv and upstart .. Patch Set 7: Code-Review+1 -- To view, visit https://gerrit.ovirt.org/40726 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: Ib9af14b3d78badc5250042508d25f294dc514a2d Gerrit-PatchSet: 7 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Yaniv Bronhaim ybron...@redhat.com Gerrit-Reviewer: Dan Kenigsberg dan...@redhat.com Gerrit-Reviewer: Dima Kuznetsov dkuzn...@redhat.com Gerrit-Reviewer: Jenkins CI Gerrit-Reviewer: Nir Soffer nsof...@redhat.com Gerrit-Reviewer: Yaniv Bronhaim ybron...@redhat.com Gerrit-Reviewer: Yeela Kaplan ykap...@redhat.com Gerrit-Reviewer: automat...@ovirt.org Gerrit-HasComments: No ___ vdsm-patches mailing list vdsm-patches@lists.fedorahosted.org https://lists.fedorahosted.org/mailman/listinfo/vdsm-patches
Change in vdsm[master]: Removing support in sysv and upstart
Dima Kuznetsov has posted comments on this change.
Change subject: Removing support in sysv and upstart
..
Patch Set 6:
(3 comments)
https://gerrit.ovirt.org/#/c/40726/6/vdsm.spec.in
File vdsm.spec.in:
Line 257
Line 258
Line 259
Line 260
Line 261
If we're droping fedora 20 then this can be
%if 0%{?fedora}
Line 594
Line 595
Line 596
Line 597
Line 598
can be removed
Line 839:
:
:
:
:
:
:
:
:
:
:
:
:
:
can be removed
--
To view, visit https://gerrit.ovirt.org/40726
To unsubscribe, visit https://gerrit.ovirt.org/settings
Gerrit-MessageType: comment
Gerrit-Change-Id: Ib9af14b3d78badc5250042508d25f294dc514a2d
Gerrit-PatchSet: 6
Gerrit-Project: vdsm
Gerrit-Branch: master
Gerrit-Owner: Yaniv Bronhaim ybron...@redhat.com
Gerrit-Reviewer: Dan Kenigsberg dan...@redhat.com
Gerrit-Reviewer: Dima Kuznetsov dkuzn...@redhat.com
Gerrit-Reviewer: Jenkins CI
Gerrit-Reviewer: Nir Soffer nsof...@redhat.com
Gerrit-Reviewer: Yaniv Bronhaim ybron...@redhat.com
Gerrit-Reviewer: Yeela Kaplan ykap...@redhat.com
Gerrit-Reviewer: automat...@ovirt.org
Gerrit-HasComments: Yes
___
vdsm-patches mailing list
vdsm-patches@lists.fedorahosted.org
https://lists.fedorahosted.org/mailman/listinfo/vdsm-patches
Change in vdsm[master]: daemonAdapter: remove traceback when using help option
Dima Kuznetsov has posted comments on this change. Change subject: daemonAdapter: remove traceback when using help option .. Patch Set 1: Code-Review+1 (1 comment) https://gerrit.ovirt.org/#/c/42147/1//COMMIT_MSG Commit Message: Line 3: AuthorDate: 2015-06-10 14:31:13 +0300 Line 4: Commit: Yeela Kaplan ykap...@redhat.com Line 5: CommitDate: 2015-06-10 14:33:46 +0300 Line 6: Line 7: daemonAdapter: remove traceback when using help option why does the help option raise exception at all ? argparser executes the built-in --help, which calls sys.exit(?). The except clause without type caught the SystemExit exception (which is not a subtype of Exception so it should be ok now). Line 8: Line 9: Change-Id: I7c592d73fb72112839b83794fd737967b2c92600 Line 10: Bug-Url: https://bugzilla.redhat.com/show_bug.cgi?id=1120787 -- To view, visit https://gerrit.ovirt.org/42147 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: I7c592d73fb72112839b83794fd737967b2c92600 Gerrit-PatchSet: 1 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Yeela Kaplan ykap...@redhat.com Gerrit-Reviewer: Dan Kenigsberg dan...@redhat.com Gerrit-Reviewer: Dima Kuznetsov dkuzn...@redhat.com Gerrit-Reviewer: Jenkins CI Gerrit-Reviewer: Yaniv Bronhaim ybron...@redhat.com Gerrit-Reviewer: automat...@ovirt.org Gerrit-HasComments: Yes ___ vdsm-patches mailing list vdsm-patches@lists.fedorahosted.org https://lists.fedorahosted.org/mailman/listinfo/vdsm-patches
Change in vdsm[master]: spec: require kernel version to avoid sudo hanging
Dima Kuznetsov has posted comments on this change. Change subject: spec: require kernel version to avoid sudo hanging .. Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.ovirt.org/42219 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: Ic3933c8582ebc471c0d1ea834550633487272ae7 Gerrit-PatchSet: 1 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Yeela Kaplan ykap...@redhat.com Gerrit-Reviewer: Dan Kenigsberg dan...@redhat.com Gerrit-Reviewer: Dima Kuznetsov dkuzn...@redhat.com Gerrit-Reviewer: Jenkins CI Gerrit-Reviewer: Yaniv Bronhaim ybron...@redhat.com Gerrit-Reviewer: automat...@ovirt.org Gerrit-HasComments: No ___ vdsm-patches mailing list vdsm-patches@lists.fedorahosted.org https://lists.fedorahosted.org/mailman/listinfo/vdsm-patches
Change in vdsm[ovirt-3.5]: ssl: Force client to use TLSv1 when using secure connection.
Dima Kuznetsov has abandoned this change. Change subject: ssl: Force client to use TLSv1 when using secure connection. .. Abandoned Not needed, TLSv1 is negitiated on el6. -- To view, visit https://gerrit.ovirt.org/39944 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: abandon Gerrit-Change-Id: If25a6472b0f54076d423cbc3c98bedad2683adce Gerrit-PatchSet: 3 Gerrit-Project: vdsm Gerrit-Branch: ovirt-3.5 Gerrit-Owner: Dima Kuznetsov dkuzn...@redhat.com Gerrit-Reviewer: Alon Bar-Lev alo...@redhat.com Gerrit-Reviewer: Dan Kenigsberg dan...@redhat.com Gerrit-Reviewer: Yaniv Bronhaim ybron...@redhat.com Gerrit-Reviewer: automat...@ovirt.org ___ vdsm-patches mailing list vdsm-patches@lists.fedorahosted.org https://lists.fedorahosted.org/mailman/listinfo/vdsm-patches
Change in vdsm[master]: packaging: Move libvirt_password out of PKI
Dima Kuznetsov has abandoned this change. Change subject: packaging: Move libvirt_password out of PKI .. Abandoned -- To view, visit https://gerrit.ovirt.org/37049 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: abandon Gerrit-Change-Id: Ia7b5f81e4320834711e52e39f092c6e90796a485 Gerrit-PatchSet: 3 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Dima Kuznetsov dkuzn...@redhat.com Gerrit-Reviewer: Dan Kenigsberg dan...@redhat.com Gerrit-Reviewer: Jenkins CI Gerrit-Reviewer: Yaniv Bronhaim ybron...@redhat.com Gerrit-Reviewer: automat...@ovirt.org ___ vdsm-patches mailing list vdsm-patches@lists.fedorahosted.org https://lists.fedorahosted.org/mailman/listinfo/vdsm-patches
Change in vdsm[master]: Removing support in sysv and upstart
Dima Kuznetsov has posted comments on this change. Change subject: Removing support in sysv and upstart .. Patch Set 4: (2 comments) https://gerrit.ovirt.org/#/c/40726/4/vdsm.spec.in File vdsm.spec.in: Line 798 Line 799 Line 800 Line 801 Line 802 wrong block taken https://gerrit.ovirt.org/#/c/40726/4/vdsm/clientIF.py File vdsm/clientIF.py: Line 503: stdio.dump, recovery]: Line 504: if vmId in self.vmContainer: Line 505: continue Line 506: else: Line 507: continue any chance we can make this conditional nicer? it is really confusing.. I am thinking something among the lines of: if fileType not in EXTS: continue if vmId in self.vmContainer: continue Line 508: self.log.debug(removing old file + f) Line 509: utils.rmFile(constants.P_VDSM_RUN + f) Line 510: except: Line 511: pass -- To view, visit https://gerrit.ovirt.org/40726 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: Ib9af14b3d78badc5250042508d25f294dc514a2d Gerrit-PatchSet: 4 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Yaniv Bronhaim ybron...@redhat.com Gerrit-Reviewer: Dan Kenigsberg dan...@redhat.com Gerrit-Reviewer: Dima Kuznetsov dkuzn...@redhat.com Gerrit-Reviewer: Jenkins CI Gerrit-Reviewer: Nir Soffer nsof...@redhat.com Gerrit-Reviewer: Yaniv Bronhaim ybron...@redhat.com Gerrit-Reviewer: automat...@ovirt.org Gerrit-HasComments: Yes ___ vdsm-patches mailing list vdsm-patches@lists.fedorahosted.org https://lists.fedorahosted.org/mailman/listinfo/vdsm-patches
Change in vdsm[master]: Separate MOM to an external process
Dima Kuznetsov has posted comments on this change. Change subject: Separate MOM to an external process .. Patch Set 8: (2 comments) https://gerrit.ovirt.org/#/c/41602/8/init/systemd/mom-vdsm.service.in File init/systemd/mom-vdsm.service.in: Line 6: Line 7: [Service] Line 8: Type=simple Line 9: LimitCORE=infinity Line 10: ExecStart=/usr/sbin/momd -c /etc/vdsm/mom.conf consider to use the daemonAdapter that being used for vdsmd and supervdsmd systemd lets you control nice with the Nice= parameter in the unit file, and the out/err go to journalctl. I think it is better to use the standard systemd facilities rather than rely on deamonAdapter. Line 11: Restart=on-failure Line 12: RestartSec=10 Line 13: User=@VDSMUSER@ Line 14: Group=@VDSMGROUP@ Line 10: ExecStart=/usr/sbin/momd -c /etc/vdsm/mom.conf Line 11: Restart=on-failure Line 12: RestartSec=10 Line 13: User=@VDSMUSER@ Line 14: Group=@VDSMGROUP@ why does it run as vdsm user? it contains all its sudoer permissions.. bett +1 Line 15: TimeoutStopSec=@SERVICE_STOP_TIMEOUT@ Line 16: Line 17: [Install] -- To view, visit https://gerrit.ovirt.org/41602 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: I99b81d21080834b7031824dab0a26f45e7eac7af Gerrit-PatchSet: 8 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Martin Sivák msi...@redhat.com Gerrit-Reviewer: Adam Litke ali...@redhat.com Gerrit-Reviewer: Dan Kenigsberg dan...@redhat.com Gerrit-Reviewer: Dima Kuznetsov dkuzn...@redhat.com Gerrit-Reviewer: Francesco Romani from...@redhat.com Gerrit-Reviewer: Jenkins CI Gerrit-Reviewer: Martin Sivák msi...@redhat.com Gerrit-Reviewer: Yaniv Bronhaim ybron...@redhat.com Gerrit-Reviewer: automat...@ovirt.org Gerrit-HasComments: Yes ___ vdsm-patches mailing list vdsm-patches@lists.fedorahosted.org https://lists.fedorahosted.org/mailman/listinfo/vdsm-patches
Change in vdsm[master]: tests: Separate tests with similar fixtures
Dima Kuznetsov has posted comments on this change. Change subject: tests: Separate tests with similar fixtures .. Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.ovirt.org/41364 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: Id84236c1cb7ac065cec42ea08958efd8112ecbd8 Gerrit-PatchSet: 1 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Nir Soffer nsof...@redhat.com Gerrit-Reviewer: Antoni Segura Puimedon toni+ov...@midokura.com Gerrit-Reviewer: Dan Kenigsberg dan...@redhat.com Gerrit-Reviewer: Dima Kuznetsov dkuzn...@redhat.com Gerrit-Reviewer: Francesco Romani from...@redhat.com Gerrit-Reviewer: Jenkins CI Gerrit-Reviewer: Nir Soffer nsof...@redhat.com Gerrit-Reviewer: Yaniv Bronhaim ybron...@redhat.com Gerrit-Reviewer: automat...@ovirt.org Gerrit-Reviewer: mooli tayer mta...@redhat.com Gerrit-HasComments: No ___ vdsm-patches mailing list vdsm-patches@lists.fedorahosted.org https://lists.fedorahosted.org/mailman/listinfo/vdsm-patches
Change in vdsm[ovirt-3.5]: vdsm-tool: is-configured: on el6, we must disable sysv's lib...
Dima Kuznetsov has posted comments on this change.
Change subject: vdsm-tool: is-configured: on el6, we must disable sysv's
libvirtd job
..
Patch Set 6: Code-Review-1
(1 comment)
https://gerrit.ovirt.org/#/c/41144/6/lib/vdsm/tool/configurators/libvirt.py
File lib/vdsm/tool/configurators/libvirt.py:
Line 103: # exist (el7, fedora, debian), all is well.
Line 104: if hasattr(service, '_chkconfigList'):
Line 105: if service._chkconfigList('libvirtd'):
Line 106: ret = NOT_CONFIGURED
Line 107:
Please don't access private service _methods.
Either wrap with public ones that don't require hasattr checks before access or
make this one public.
Line 108: if ret == NOT_SURE:
Line 109: sys.stdout.write(libvirt is already configured for
vdsm\n)
Line 110: else:
Line 111: sys.stdout.write(libvirt is not configured for vdsm
yet\n)
--
To view, visit https://gerrit.ovirt.org/41144
To unsubscribe, visit https://gerrit.ovirt.org/settings
Gerrit-MessageType: comment
Gerrit-Change-Id: I6326a34cc9e4bee82a427f2543354438205cd11d
Gerrit-PatchSet: 6
Gerrit-Project: vdsm
Gerrit-Branch: ovirt-3.5
Gerrit-Owner: Yaniv Bronhaim ybron...@redhat.com
Gerrit-Reviewer: Dan Kenigsberg dan...@redhat.com
Gerrit-Reviewer: Dima Kuznetsov dkuzn...@redhat.com
Gerrit-Reviewer: Jenkins CI
Gerrit-Reviewer: Mooli Tayer mta...@redhat.com
Gerrit-Reviewer: Yaniv Bronhaim ybron...@redhat.com
Gerrit-Reviewer: automat...@ovirt.org
Gerrit-HasComments: Yes
___
vdsm-patches mailing list
vdsm-patches@lists.fedorahosted.org
https://lists.fedorahosted.org/mailman/listinfo/vdsm-patches
Change in vdsm[ovirt-3.5]: vdsm-tool: is-configured: on el6, we must disable sysv's lib...
Dima Kuznetsov has posted comments on this change. Change subject: vdsm-tool: is-configured: on el6, we must disable sysv's libvirtd job .. Patch Set 8: Code-Review+1 -- To view, visit https://gerrit.ovirt.org/41144 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: I6326a34cc9e4bee82a427f2543354438205cd11d Gerrit-PatchSet: 8 Gerrit-Project: vdsm Gerrit-Branch: ovirt-3.5 Gerrit-Owner: Yaniv Bronhaim ybron...@redhat.com Gerrit-Reviewer: Dan Kenigsberg dan...@redhat.com Gerrit-Reviewer: Dima Kuznetsov dkuzn...@redhat.com Gerrit-Reviewer: Jenkins CI Gerrit-Reviewer: Mooli Tayer mta...@redhat.com Gerrit-Reviewer: Yaniv Bronhaim ybron...@redhat.com Gerrit-Reviewer: automat...@ovirt.org Gerrit-HasComments: No ___ vdsm-patches mailing list vdsm-patches@lists.fedorahosted.org https://lists.fedorahosted.org/mailman/listinfo/vdsm-patches
Change in vdsm[master]: modify safelease executable path
Dima Kuznetsov has posted comments on this change. Change subject: modify safelease executable path .. Patch Set 13: Code-Review+1 -- To view, visit https://gerrit.ovirt.org/41024 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: Ief298fe08e3b737c5c9f404675a15da4b026ca21 Gerrit-PatchSet: 13 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Yaniv Bronhaim ybron...@redhat.com Gerrit-Reviewer: Allon Mureinik amure...@redhat.com Gerrit-Reviewer: Dan Kenigsberg dan...@redhat.com Gerrit-Reviewer: Dima Kuznetsov dkuzn...@redhat.com Gerrit-Reviewer: Federico Simoncelli fsimo...@redhat.com Gerrit-Reviewer: Jenkins CI Gerrit-Reviewer: Liron Aravot lara...@redhat.com Gerrit-Reviewer: Nir Soffer nsof...@redhat.com Gerrit-Reviewer: Yaniv Bronhaim ybron...@redhat.com Gerrit-Reviewer: automat...@ovirt.org Gerrit-HasComments: No ___ vdsm-patches mailing list vdsm-patches@lists.fedorahosted.org https://lists.fedorahosted.org/mailman/listinfo/vdsm-patches
Change in vdsm[master]: modify safelease executable path
Dima Kuznetsov has posted comments on this change. Change subject: modify safelease executable path .. Patch Set 3: Why aren't we shipping it as vdsm-safelease then? -- To view, visit https://gerrit.ovirt.org/41024 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: Ief298fe08e3b737c5c9f404675a15da4b026ca21 Gerrit-PatchSet: 3 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Yaniv Bronhaim ybron...@redhat.com Gerrit-Reviewer: Dan Kenigsberg dan...@redhat.com Gerrit-Reviewer: Dima Kuznetsov dkuzn...@redhat.com Gerrit-Reviewer: Jenkins CI Gerrit-Reviewer: Yaniv Bronhaim ybron...@redhat.com Gerrit-Reviewer: automat...@ovirt.org Gerrit-HasComments: No ___ vdsm-patches mailing list vdsm-patches@lists.fedorahosted.org https://lists.fedorahosted.org/mailman/listinfo/vdsm-patches
Change in vdsm[master]: modify safelease executable path
Dima Kuznetsov has posted comments on this change. Change subject: modify safelease executable path .. Patch Set 3: Code-Review-1 We should not hardcode libexec paths if we plan to ship packages outside fedora derived distros. My Ubuntu Trusty server does not have such path (and I think Debians neither).. It also makes much sense to move safelease into the $PATH bow. When it was packaged as part of VDSM, and only VDSM used it, it made sense to put it into libexec as it was an executable internal to the other code, but not since it became independently packaged utility, you wouldn't expect anyone who installs it to run it with absolute path from a much less standard location. -- To view, visit https://gerrit.ovirt.org/41024 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: Ief298fe08e3b737c5c9f404675a15da4b026ca21 Gerrit-PatchSet: 3 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Yaniv Bronhaim ybron...@redhat.com Gerrit-Reviewer: Dan Kenigsberg dan...@redhat.com Gerrit-Reviewer: Dima Kuznetsov dkuzn...@redhat.com Gerrit-Reviewer: Jenkins CI Gerrit-Reviewer: Yaniv Bronhaim ybron...@redhat.com Gerrit-Reviewer: automat...@ovirt.org Gerrit-HasComments: No ___ vdsm-patches mailing list vdsm-patches@lists.fedorahosted.org https://lists.fedorahosted.org/mailman/listinfo/vdsm-patches
Change in vdsm[master]: modify safelease executable path
Dima Kuznetsov has posted comments on this change. Change subject: modify safelease executable path .. Patch Set 4: Code-Review+1 If paths are something we're leaving out for packaging then I'm OK with this. -- To view, visit https://gerrit.ovirt.org/41024 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: Ief298fe08e3b737c5c9f404675a15da4b026ca21 Gerrit-PatchSet: 4 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Yaniv Bronhaim ybron...@redhat.com Gerrit-Reviewer: Dan Kenigsberg dan...@redhat.com Gerrit-Reviewer: Dima Kuznetsov dkuzn...@redhat.com Gerrit-Reviewer: Jenkins CI Gerrit-Reviewer: Yaniv Bronhaim ybron...@redhat.com Gerrit-Reviewer: automat...@ovirt.org Gerrit-HasComments: No ___ vdsm-patches mailing list vdsm-patches@lists.fedorahosted.org https://lists.fedorahosted.org/mailman/listinfo/vdsm-patches
Change in vdsm[master]: modify safelease executable path
Dima Kuznetsov has posted comments on this change. Change subject: modify safelease executable path .. Patch Set 9: Verified+1 Verified using system testing framework job: http://jenkins.ovirt.org/job/ovirt_integration-test-poc_created/1224/ All tests (finally) passed -- To view, visit https://gerrit.ovirt.org/41024 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: Ief298fe08e3b737c5c9f404675a15da4b026ca21 Gerrit-PatchSet: 9 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Yaniv Bronhaim ybron...@redhat.com Gerrit-Reviewer: Dan Kenigsberg dan...@redhat.com Gerrit-Reviewer: Dima Kuznetsov dkuzn...@redhat.com Gerrit-Reviewer: Jenkins CI Gerrit-Reviewer: Yaniv Bronhaim ybron...@redhat.com Gerrit-Reviewer: automat...@ovirt.org Gerrit-HasComments: No ___ vdsm-patches mailing list vdsm-patches@lists.fedorahosted.org https://lists.fedorahosted.org/mailman/listinfo/vdsm-patches
Change in vdsm[master]: utils: Add systemd_run command modifier
Dima Kuznetsov has posted comments on this change. Change subject: utils: Add systemd_run command modifier .. Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.ovirt.org/40239 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: Ic35bdae752228b6716c25f0b9975fc500897a592 Gerrit-PatchSet: 1 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Nir Soffer nsof...@redhat.com Gerrit-Reviewer: Allon Mureinik amure...@redhat.com Gerrit-Reviewer: Alon Bar-Lev alo...@redhat.com Gerrit-Reviewer: Dan Kenigsberg dan...@redhat.com Gerrit-Reviewer: Dima Kuznetsov dkuzn...@redhat.com Gerrit-Reviewer: Federico Simoncelli fsimo...@redhat.com Gerrit-Reviewer: Ido Barkan ibar...@redhat.com Gerrit-Reviewer: Jenkins CI Gerrit-Reviewer: Nir Soffer nsof...@redhat.com Gerrit-Reviewer: Sandro Bonazzola sbona...@redhat.com Gerrit-Reviewer: Yaniv Bronhaim ybron...@redhat.com Gerrit-Reviewer: automat...@ovirt.org Gerrit-HasComments: No ___ vdsm-patches mailing list vdsm-patches@lists.fedorahosted.org https://lists.fedorahosted.org/mailman/listinfo/vdsm-patches
Change in vdsm[master]: spec: Drop el6 support
Dima Kuznetsov has posted comments on this change. Change subject: spec: Drop el6 support .. Patch Set 3: (1 comment) https://gerrit.ovirt.org/#/c/40419/3/vdsm.spec.in File vdsm.spec.in: Line 836: # fallback to vdsmd reconfigure api - This change may be removed Line 837: # when vdsm won't support any downgrade\upgrade to versions that Line 838: # don't include vdsm-tool configure api (vdsm = 3.3) Line 839: if [ -f /usr/lib/systemd/systemd-vdsmd ]; then Line 840: /usr/lib/systemd/systemd-vdsmd reconfigure /dev/null 21 || : not sure about spec file syntax, is it hard to define variables? Shouldn't be, will change Line 841: fi Line 842: fi Line 843: fi Line 844: -- To view, visit https://gerrit.ovirt.org/40419 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: I52bf73f539d9036fbc3468b4faf8a8d6556c9560 Gerrit-PatchSet: 3 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Dima Kuznetsov dkuzn...@redhat.com Gerrit-Reviewer: Dan Kenigsberg dan...@redhat.com Gerrit-Reviewer: Dima Kuznetsov dkuzn...@redhat.com Gerrit-Reviewer: Ido Barkan ibar...@redhat.com Gerrit-Reviewer: Jenkins CI Gerrit-Reviewer: Yaniv Bronhaim ybron...@redhat.com Gerrit-Reviewer: Yeela Kaplan ykap...@redhat.com Gerrit-Reviewer: automat...@ovirt.org Gerrit-HasComments: Yes ___ vdsm-patches mailing list vdsm-patches@lists.fedorahosted.org https://lists.fedorahosted.org/mailman/listinfo/vdsm-patches
Change in vdsm[master]: spec: Drop el6 support
Dima Kuznetsov has uploaded a new change for review.
Change subject: spec: Drop el6 support
..
spec: Drop el6 support
Since we no longer need to package for el6, we can significantly reduce
the size of our spec file. This patch removes all the conditionals
dealing with el6, and drops all of the code dealing with sysvinit
as systemd is now available in both el7 and the supported fedoras.
Change-Id: I52bf73f539d9036fbc3468b4faf8a8d6556c9560
Signed-off-by: Dima Kuznetsov dkuzn...@redhat.com
---
D init/sysvinit/Makefile.am
D init/sysvinit/respawn
D init/sysvinit/supervdsmd.init.in
D init/sysvinit/vdsmd.init.in
D init/upstart/Makefile.am
D init/upstart/supervdsmd.upstart.in
D init/upstart/vdsm-tmpfiles.upstart.in
D init/upstart/vdsmd.upstart.in
M vdsm.spec.in
9 files changed, 4 insertions(+), 862 deletions(-)
git pull ssh://gerrit.ovirt.org:29418/vdsm refs/changes/19/40419/1
diff --git a/init/sysvinit/Makefile.am b/init/sysvinit/Makefile.am
deleted file mode 100644
index 7beba50..000
--- a/init/sysvinit/Makefile.am
+++ /dev/null
@@ -1,44 +0,0 @@
-#
-# Copyright 2008-2012 Red Hat, Inc.
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2 of the License, or
-# (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
-#
-# Refer to the README and COPYING files for full details of the license
-#
-
-include $(top_srcdir)/build-aux/Makefile.subs
-
-nodist_noinst_DATA = \
- supervdsmd.init \
- vdsmd.init \
- $(NULL)
-
-dist_vdsm_SCRIPTS = \
- respawn \
- $(NULL)
-
-CLEANFILES = \
- config.log \
- $(nodist_noinst_DATA) \
- $(NULL)
-
-EXTRA_DIST = \
- supervdsmd.init.in \
- vdsmd.init.in \
- $(NULL)
-
-all-local: \
- $(nodist_noinst_DATA) \
- $(NULL)
diff --git a/init/sysvinit/respawn b/init/sysvinit/respawn
deleted file mode 100755
index d13effc..000
--- a/init/sysvinit/respawn
+++ /dev/null
@@ -1,101 +0,0 @@
-#!/bin/bash -e
-
-# Copyright 2010 Red Hat, Inc. and/or its affiliates.
-# Released under GPL v2
-#
-# Author: Dan Kenigsberg dan...@redhat.com
-#
-# Please contact me if something similar, but more standard, is available.
-
-MINLIFETIME=2
-MAX_THRASH_INTERVAL=30
-POST_FAIL_INTERVAL=900
-
-usage() {
-echo usage:
-echo $0 [options] slave [args]
-echo --masterpid pidfile
-echo --slavepid pidfile
-echo --daemon
-echo --minlifetime seconds
-echo --thrash seconds
-echo
-echo make slave run, and respawn it on exit
-exit 1
-}
-
-while [ $1 != ${1##-} ];
-do
- case $1 in
---minlifetime)
-MINLIFETIME=$2
-shift 2
-;;
---thrash)
-MAX_THRASH_INTERVAL=$2
-shift 2
-;;
---masterpid)
-masterpidfile=$2
-shift 2
-;;
---slavepid)
-slavepidfile=$2
-shift 2
-;;
---daemon)
-daemonize=1
-shift
- ;;
---)
-shift
-break
-;;
-*) usage
-;;
- esac
-done
-
-if [ -z $* ];
-then
-usage
-fi
-
-loop() {
-local d0 d1
-local thrash_start
-
-# must use BASHPID since $$ is not updated by
-[ ! -z $masterpidfile ] echo $BASHPID $masterpidfile
-d0=`date +%s`
-while true
-do
-$@
-[ ! -z $slavepidfile ] echo $! $slavepidfile
-wait $! || :
-d1=`date +%s`
-if [ $[d1-d0] -lt $MINLIFETIME ];
-then
-if [[ -n $thrash_start ]] \
- [[ $[d1-thrash_start] -gt $MAX_THRASH_INTERVAL ]]; then
-logger -t respawn -- slave '$*' died too quickly for more
than $MAX_THRASH_INTERVAL seconds, master sleeping for $POST_FAIL_INTERVAL
seconds
-thrash_start=
-sleep $POST_FAIL_INTERVAL
-else
-logger -t respawn -- slave '$*' died too quickly, respawning
slave
-[[ -z $thrash_start ]] thrash_start=$d1
-fi
-else
-logger -t respawn -- slave '$*' died, respawning slave
-thrash_start=
-fi
-d0=$d1
-done
-}
-
-if [ -z $daemonize ];
-then
-loop $@
-else
-loop $@ /dev/null 2/dev/null
-fi
diff --git a/init/sysvinit/supervdsmd.init.in b/init/sysvinit/supervdsmd.init.in
deleted file mode 100755
index f3369c2..000
---
Change in vdsm[master]: tool: Remove upstart handling in libvirt configurator
Dima Kuznetsov has uploaded a new change for review.
Change subject: tool: Remove upstart handling in libvirt configurator
..
tool: Remove upstart handling in libvirt configurator
libvirt configurator used to check if upstart is available and configure
libvirtd using initctl.
Since systemd is now the system manager on Debian Jessie, RHEL7 and
Ubuntu Vivid, we no longer have to support sysvinit/upstart.
Change-Id: Ic71430103cb04a5636b4b41371852cbf68495db7
Signed-off-by: Dima Kuznetsov dkuzn...@redhat.com
---
M lib/vdsm/tool/configurators/libvirt.py
1 file changed, 0 insertions(+), 61 deletions(-)
git pull ssh://gerrit.ovirt.org:29418/vdsm refs/changes/20/40420/1
diff --git a/lib/vdsm/tool/configurators/libvirt.py
b/lib/vdsm/tool/configurators/libvirt.py
index e182231..5b14cea 100644
--- a/lib/vdsm/tool/configurators/libvirt.py
+++ b/lib/vdsm/tool/configurators/libvirt.py
@@ -17,11 +17,8 @@
# Refer to the README and COPYING files for full details of the license
#
import errno
-import filecmp
import os
import uuid
-import rpm
-import shutil
import sys
from vdsm.config import config
@@ -39,7 +36,6 @@
ConfigFile,
ParserWrapper,
)
-from .. import service
from .. validate_ovirt_certs import validate_ovirt_certs
from ... import utils
from ... import constants
@@ -58,8 +54,6 @@
def configure():
-_sysvToUpstart()
-
if utils.isOvirtNode():
if not os.path.exists(constants.P_VDSM_CERT):
raise InvalidRun(
@@ -117,61 +111,6 @@
cfile['path'] for cfile in FILES.values()
if cfile['persisted']
]
-
-
-def _sysvToUpstart():
-
-On RHEL 6, libvirtd can be started by either SysV init or Upstart.
-We prefer upstart because it respawns libvirtd if libvirtd
-crashed.
-
-def iterateLibvirtFiles():
-ts = rpm.TransactionSet()
-for name in ['libvirt', 'libvirt-daemon']:
-for matches in ts.dbMatch('name', name):
-for filename in matches[rpm.RPMTAG_FILENAMES]:
-yield filename
-
-def reloadConfiguration():
-rc, out, err = utils.execCmd((INITCTL,
- reload-configuration))
-if rc != 0:
-sys.stdout.write(out)
-sys.stderr.write(err)
-raise InvalidRun(
-Failed to reload upstart configuration.)
-
-INITCTL = '/sbin/initctl'
-LIBVIRTD_UPSTART = 'libvirtd.upstart'
-TARGET = os.path.join(constants.SYSCONF_PATH, init/libvirtd.conf)
-
-if os.path.isfile(INITCTL) and os.access(INITCTL, os.X_OK):
-# libvirtd package does not provide libvirtd.upstart,
-# this could happen in Ubuntu or other distro,
-# so continue to use system default init mechanism
-packaged = ''
-for fname in iterateLibvirtFiles():
-if os.path.basename(fname) == LIBVIRTD_UPSTART:
-packaged = fname
-break
-
-if os.path.isfile(packaged):
-if not os.path.isfile(TARGET):
-service.service_stop('libvirtd')
-if (not os.path.isfile(TARGET) or
-not filecmp.cmp(packaged, TARGET)):
-oldmod = None
-if os.path.isfile(TARGET):
-oldmod = os.stat(TARGET).st_mode
-
-utils.unpersist(TARGET)
-shutil.copyfile(packaged, TARGET)
-utils.persist(TARGET)
-
-if (oldmod is not None and
-oldmod != os.stat(TARGET).st_mode):
-os.chmod(TARGET, oldmod)
-reloadConfiguration()
def _isSslConflict():
--
To view, visit https://gerrit.ovirt.org/40420
To unsubscribe, visit https://gerrit.ovirt.org/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ic71430103cb04a5636b4b41371852cbf68495db7
Gerrit-PatchSet: 1
Gerrit-Project: vdsm
Gerrit-Branch: master
Gerrit-Owner: Dima Kuznetsov dkuzn...@redhat.com
___
vdsm-patches mailing list
vdsm-patches@lists.fedorahosted.org
https://lists.fedorahosted.org/mailman/listinfo/vdsm-patches
Change in vdsm[master]: jsonrpc: fix call to super ctor
Dima Kuznetsov has posted comments on this change. Change subject: jsonrpc: fix call to super ctor .. Patch Set 4: (1 comment) https://gerrit.ovirt.org/#/c/39781/4/lib/yajsonrpc/__init__.py File lib/yajsonrpc/__init__.py: Line 29: _STATE_ONESHOT = 4 Line 30: Line 31: Line 32: class JsonRpcError(RuntimeError): Line 33: def __init__(self, code, msg): I think we should avoid overriding __init__ altogather and implement this in __str__ instead: def __str__(self): return '%s: [%d] %s' % (self.__class__.__name__, self.args[0], self.args[1]) Line 34: super(JsonRpcError, self).__init__( Line 35: [%d] %s % (code, msg) Line 36: ) Line 37: -- To view, visit https://gerrit.ovirt.org/39781 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: Ic2900524c80e4b29487d2d6e10b6cf4eab77306c Gerrit-PatchSet: 4 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Yeela Kaplan ykap...@redhat.com Gerrit-Reviewer: Dima Kuznetsov dkuzn...@redhat.com Gerrit-Reviewer: Francesco Romani from...@redhat.com Gerrit-Reviewer: Nir Soffer nsof...@redhat.com Gerrit-Reviewer: Yaniv Bronheim ybron...@redhat.com Gerrit-Reviewer: Yeela Kaplan ykap...@redhat.com Gerrit-Reviewer: automat...@ovirt.org Gerrit-Reviewer: oVirt Jenkins CI Server Gerrit-HasComments: Yes ___ vdsm-patches mailing list vdsm-patches@lists.fedorahosted.org https://lists.fedorahosted.org/mailman/listinfo/vdsm-patches
Change in vdsm[master]: supervdsm: Add zombiereaper to supervdsm
Dima Kuznetsov has posted comments on this change. Change subject: supervdsm: Add zombiereaper to supervdsm .. Patch Set 2: I am not sure we should bump the requirements just yet, as those packages are not available for CentOS6/7 (AFAIA): For fedora 20 we have 2.7.5-16.fc20 For CentOS 6.6 we have 2.6.6-52.el6 For CentOS 7.1 we have 2.7.5-16.el7 -- To view, visit https://gerrit.ovirt.org/39780 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: I938a1f2bc70fceab2c69bc8b3d8c0724a9da7720 Gerrit-PatchSet: 2 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Dima Kuznetsov dkuzn...@redhat.com Gerrit-Reviewer: Dan Kenigsberg dan...@redhat.com Gerrit-Reviewer: Dima Kuznetsov dkuzn...@redhat.com Gerrit-Reviewer: Yaniv Bronhaim ybron...@redhat.com Gerrit-Reviewer: automat...@ovirt.org Gerrit-Reviewer: oVirt Jenkins CI Server Gerrit-HasComments: No ___ vdsm-patches mailing list vdsm-patches@lists.fedorahosted.org https://lists.fedorahosted.org/mailman/listinfo/vdsm-patches
Change in vdsm[master]: protocoldetector: Fix busy read loop [2/3]
Dima Kuznetsov has posted comments on this change. Change subject: protocoldetector: Fix busy read loop [2/3] .. Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.ovirt.org/39997 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: Ia5a04b471846a85e2af63402c96dfd31dfe03644 Gerrit-PatchSet: 1 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Nir Soffer nsof...@redhat.com Gerrit-Reviewer: Allon Mureinik amure...@redhat.com Gerrit-Reviewer: Dan Kenigsberg dan...@redhat.com Gerrit-Reviewer: Dima Kuznetsov dkuzn...@redhat.com Gerrit-Reviewer: Nir Soffer nsof...@redhat.com Gerrit-Reviewer: Piotr Kliczewski piotr.kliczew...@gmail.com Gerrit-Reviewer: Yaniv Bronhaim ybron...@redhat.com Gerrit-Reviewer: automat...@ovirt.org Gerrit-Reviewer: oVirt Jenkins CI Server Gerrit-HasComments: No ___ vdsm-patches mailing list vdsm-patches@lists.fedorahosted.org https://lists.fedorahosted.org/mailman/listinfo/vdsm-patches
Change in vdsm[master]: protocoldetector: Fix busy poll loop [1/3]
Dima Kuznetsov has posted comments on this change. Change subject: protocoldetector: Fix busy poll loop [1/3] .. Patch Set 2: Code-Review+1 -- To view, visit https://gerrit.ovirt.org/39996 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: Id18d87d10db63f216699bd60ee82fd3ff08e7624 Gerrit-PatchSet: 2 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Nir Soffer nsof...@redhat.com Gerrit-Reviewer: Allon Mureinik amure...@redhat.com Gerrit-Reviewer: Dan Kenigsberg dan...@redhat.com Gerrit-Reviewer: Dima Kuznetsov dkuzn...@redhat.com Gerrit-Reviewer: Nir Soffer nsof...@redhat.com Gerrit-Reviewer: Piotr Kliczewski piotr.kliczew...@gmail.com Gerrit-Reviewer: Yaniv Bronhaim ybron...@redhat.com Gerrit-Reviewer: automat...@ovirt.org Gerrit-Reviewer: oVirt Jenkins CI Server Gerrit-HasComments: No ___ vdsm-patches mailing list vdsm-patches@lists.fedorahosted.org https://lists.fedorahosted.org/mailman/listinfo/vdsm-patches
Change in vdsm[master]: protocoldetector: Fix next_check_interval
Dima Kuznetsov has posted comments on this change. Change subject: protocoldetector: Fix next_check_interval .. Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.ovirt.org/39994 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: If7f71657df4baea22ade66dbda0a679aa4cb6832 Gerrit-PatchSet: 1 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Nir Soffer nsof...@redhat.com Gerrit-Reviewer: Allon Mureinik amure...@redhat.com Gerrit-Reviewer: Dan Kenigsberg dan...@redhat.com Gerrit-Reviewer: Dima Kuznetsov dkuzn...@redhat.com Gerrit-Reviewer: Nir Soffer nsof...@redhat.com Gerrit-Reviewer: Piotr Kliczewski piotr.kliczew...@gmail.com Gerrit-Reviewer: Yaniv Bronhaim ybron...@redhat.com Gerrit-Reviewer: automat...@ovirt.org Gerrit-Reviewer: oVirt Jenkins CI Server Gerrit-HasComments: No ___ vdsm-patches mailing list vdsm-patches@lists.fedorahosted.org https://lists.fedorahosted.org/mailman/listinfo/vdsm-patches
Change in vdsm[master]: jsonrpc: fix call to super ctor
Dima Kuznetsov has posted comments on this change. Change subject: jsonrpc: fix call to super ctor .. Patch Set 2: Code-Review+1 -- To view, visit https://gerrit.ovirt.org/39781 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: Ic2900524c80e4b29487d2d6e10b6cf4eab77306c Gerrit-PatchSet: 2 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Yeela Kaplan ykap...@redhat.com Gerrit-Reviewer: Dima Kuznetsov dkuzn...@redhat.com Gerrit-Reviewer: Francesco Romani from...@redhat.com Gerrit-Reviewer: Yeela Kaplan ykap...@redhat.com Gerrit-Reviewer: automat...@ovirt.org Gerrit-Reviewer: oVirt Jenkins CI Server Gerrit-HasComments: No ___ vdsm-patches mailing list vdsm-patches@lists.fedorahosted.org https://lists.fedorahosted.org/mailman/listinfo/vdsm-patches
Change in vdsm[master]: betterAsyncore: remove method binding
Dima Kuznetsov has posted comments on this change. Change subject: betterAsyncore: remove method binding .. Patch Set 2: Code-Review+1 -- To view, visit https://gerrit.ovirt.org/39889 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: Ib9dc50b633db2c8bd005baae6a350bd8d74b60f9 Gerrit-PatchSet: 2 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Piotr Kliczewski piotr.kliczew...@gmail.com Gerrit-Reviewer: Dima Kuznetsov dkuzn...@redhat.com Gerrit-Reviewer: Francesco Romani from...@redhat.com Gerrit-Reviewer: Nir Soffer nsof...@redhat.com Gerrit-Reviewer: Piotr Kliczewski piotr.kliczew...@gmail.com Gerrit-Reviewer: Yaniv Bronhaim ybron...@redhat.com Gerrit-Reviewer: Yeela Kaplan ykap...@redhat.com Gerrit-Reviewer: automat...@ovirt.org Gerrit-Reviewer: oVirt Jenkins CI Server Gerrit-HasComments: No ___ vdsm-patches mailing list vdsm-patches@lists.fedorahosted.org https://lists.fedorahosted.org/mailman/listinfo/vdsm-patches
Change in vdsm[ovirt-3.5]: ssl: Force client to use TLSv1 when using secure connection.
Dima Kuznetsov has uploaded a new change for review. Change subject: ssl: Force client to use TLSv1 when using secure connection. .. ssl: Force client to use TLSv1 when using secure connection. wrap_socket() selects protocol=SSLv23 when no protocol parameter is passed. This parameter means different things on python2.6 vs 2.7. On python 2.7 it means the connection will use the highest of SSLv2, SSLv3, TLSv1 what is supported by both parties. On python 2.6 TLSv1 is not part of protocols ssl module will negotiate so we'll end up with SSLv3 at best, which is no longer considered secure. Change-Id: If25a6472b0f54076d423cbc3c98bedad2683adce Signed-off-by: Dima Kuznetsov dkuzn...@redhat.com --- M lib/vdsm/SecureXMLRPCServer.py 1 file changed, 2 insertions(+), 1 deletion(-) git pull ssh://gerrit.ovirt.org:29418/vdsm refs/changes/44/39944/1 diff --git a/lib/vdsm/SecureXMLRPCServer.py b/lib/vdsm/SecureXMLRPCServer.py index cbcbaca..83322ab 100644 --- a/lib/vdsm/SecureXMLRPCServer.py +++ b/lib/vdsm/SecureXMLRPCServer.py @@ -96,7 +96,8 @@ # DK added: pass ca_cert to sslsocket self.sock = ssl.wrap_socket(sock, self.key_file, self.cert_file, ca_certs=self.ca_certs, server_side=False, -cert_reqs=self.cert_reqs) +cert_reqs=self.cert_reqs, +protocol=ssl.PROTOCOL_TLSv1) class VerifyingSafeTransport(xmlrpclib.SafeTransport): -- To view, visit https://gerrit.ovirt.org/39944 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: If25a6472b0f54076d423cbc3c98bedad2683adce Gerrit-PatchSet: 1 Gerrit-Project: vdsm Gerrit-Branch: ovirt-3.5 Gerrit-Owner: Dima Kuznetsov dkuzn...@redhat.com ___ vdsm-patches mailing list vdsm-patches@lists.fedorahosted.org https://lists.fedorahosted.org/mailman/listinfo/vdsm-patches
Change in vdsm[master]: unbreak crossImportsTests
Dima Kuznetsov has posted comments on this change. Change subject: unbreak crossImportsTests .. Patch Set 1: Code-Review+1 Looks good. We're not using python_sitearch anymore so it should be OK. -- To view, visit https://gerrit.ovirt.org/39784 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: Ic879e605a3328d0d69f397d79b28bb2508ec44b9 Gerrit-PatchSet: 1 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Ido Barkan ibar...@redhat.com Gerrit-Reviewer: Dan Kenigsberg dan...@redhat.com Gerrit-Reviewer: Dima Kuznetsov dkuzn...@redhat.com Gerrit-Reviewer: Ido Barkan ibar...@redhat.com Gerrit-Reviewer: Yaniv Bronhaim ybron...@redhat.com Gerrit-Reviewer: automat...@ovirt.org Gerrit-Reviewer: oVirt Jenkins CI Server Gerrit-HasComments: No ___ vdsm-patches mailing list vdsm-patches@lists.fedorahosted.org https://lists.fedorahosted.org/mailman/listinfo/vdsm-patches
Change in vdsm[master]: jsonrpc: raise JsonRpcError with meaningful message
Dima Kuznetsov has posted comments on this change. Change subject: jsonrpc: raise JsonRpcError with meaningful message .. Patch Set 1: Code-Review-1 (1 comment) https://gerrit.ovirt.org/#/c/39781/1/lib/yajsonrpc/__init__.py File lib/yajsonrpc/__init__.py: Line 33: def __init__(self, code, msg): Line 34: super(JsonRpcError, self).__init__(msg) Line 35: self.code = code Line 36: self.message = msg Line 37: super(RuntimeError, self).__init__( This should be removed, base constructor should not be invoked twice Line 38: [%d] %s % (self.code, self.message) Line 39: ) Line 40: Line 41: -- To view, visit https://gerrit.ovirt.org/39781 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: Ic2900524c80e4b29487d2d6e10b6cf4eab77306c Gerrit-PatchSet: 1 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Yeela Kaplan ykap...@redhat.com Gerrit-Reviewer: Dima Kuznetsov dkuzn...@redhat.com Gerrit-Reviewer: automat...@ovirt.org Gerrit-Reviewer: oVirt Jenkins CI Server Gerrit-HasComments: Yes ___ vdsm-patches mailing list vdsm-patches@lists.fedorahosted.org https://lists.fedorahosted.org/mailman/listinfo/vdsm-patches
Change in vdsm[master]: shell_helper: remove unneeded build statements
Dima Kuznetsov has posted comments on this change. Change subject: shell_helper: remove unneeded build statements .. Patch Set 2: Code-Review+1 -- To view, visit https://gerrit.ovirt.org/39779 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: I7953c9eefe5e2fb8dfd01450ff52368a83a9c77d Gerrit-PatchSet: 2 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Ido Barkan ibar...@redhat.com Gerrit-Reviewer: Dima Kuznetsov dkuzn...@redhat.com Gerrit-Reviewer: Ido Barkan ibar...@redhat.com Gerrit-Reviewer: automat...@ovirt.org Gerrit-Reviewer: oVirt Jenkins CI Server Gerrit-HasComments: No ___ vdsm-patches mailing list vdsm-patches@lists.fedorahosted.org https://lists.fedorahosted.org/mailman/listinfo/vdsm-patches
Change in vdsm[master]: supervdsm: Add zombiereaper to supervdsm
Hello Dan Kenigsberg,
I'd like you to do a code review. Please visit
https://gerrit.ovirt.org/39780
to review the following change.
Change subject: supervdsm: Add zombiereaper to supervdsm
..
supervdsm: Add zombiereaper to supervdsm
Supervdsm uses multiprocessing.Process to impersonate other users and
check access. To avoid waiting on the subprocesses, we add all
subprocesses that were not waited upon to zombiereaper.
Change-Id: I938a1f2bc70fceab2c69bc8b3d8c0724a9da7720
Bug-url: https://bugzilla.redhat.com/show_bug.cgi?id=841486
Signed-off-by: Dima Kuznetsov dkuzn...@redhat.com
Reviewed-on: http://gerrit.ovirt.org/28915
Reviewed-by: Dan Kenigsberg dan...@redhat.com
Signed-off-by: Dima Kuznetsov dkuzn...@redhat.com
---
M vdsm/supervdsmServer
1 file changed, 27 insertions(+), 14 deletions(-)
git pull ssh://gerrit.ovirt.org:29418/vdsm refs/changes/80/39780/1
diff --git a/vdsm/supervdsmServer b/vdsm/supervdsmServer
index 3cdbf71..b8b6ff7 100755
--- a/vdsm/supervdsmServer
+++ b/vdsm/supervdsmServer
@@ -32,6 +32,7 @@
import logging
import logging.config
from vdsm.infra import sigutils
+from vdsm.infra import zombiereaper
import numaUtils
@@ -236,23 +237,34 @@
proc = Process(target=child, args=(hisPipe,))
proc.start()
-if not pipe.poll(RUN_AS_TIMEOUT):
-try:
-os.kill(proc.pid, signal.SIGKILL)
-except OSError as e:
-# If it didn't fail because process is already dead
-if e.errno != errno.ESRCH:
-raise
+needReaping = True
+try:
+if not pipe.poll(RUN_AS_TIMEOUT):
+try:
-raise Timeout()
+os.kill(proc.pid, signal.SIGKILL)
+except OSError as e:
+# Don't add to zombiereaper of PID no longer exists
+if e.errno == errno.ESRCH:
+needReaping = False
+else:
+raise
-res, err = pipe.recv()
-pipe.send(Bye)
-proc.terminate()
-if err is not None:
-raise err
+raise Timeout()
-return res
+res, err = pipe.recv()
+pipe.send(Bye)
+proc.terminate()
+
+if err is not None:
+raise err
+
+return res
+
+finally:
+# Add to zombiereaper if process has not been waited upon
+if proc.exitcode is None and needReaping:
+zombiereaper.autoReapPID(proc.pid)
@logDecorator
def validateAccess(self, user, groups, *args, **kwargs):
@@ -465,6 +477,7 @@
if not config.getboolean('vars', 'core_dump_enable'):
resource.setrlimit(resource.RLIMIT_CORE, (0, 0))
sigutils.register()
+zombiereaper.registerSignalHandler()
def bind(func):
def wrapper(_SuperVdsm, *args, **kwargs):
--
To view, visit https://gerrit.ovirt.org/39780
To unsubscribe, visit https://gerrit.ovirt.org/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I938a1f2bc70fceab2c69bc8b3d8c0724a9da7720
Gerrit-PatchSet: 1
Gerrit-Project: vdsm
Gerrit-Branch: master
Gerrit-Owner: Dima Kuznetsov dkuzn...@redhat.com
Gerrit-Reviewer: Dan Kenigsberg dan...@redhat.com
___
vdsm-patches mailing list
vdsm-patches@lists.fedorahosted.org
https://lists.fedorahosted.org/mailman/listinfo/vdsm-patches
Change in vdsm[master]: supervdsm: Add zombiereaper to supervdsm
Dima Kuznetsov has posted comments on this change. Change subject: supervdsm: Add zombiereaper to supervdsm .. Patch Set 1: Same as previously merged version, except with needReaping variable, that helps avoiding adding a non-existent PID to zombiereaper (if os.kill yields ESRCH) -- To view, visit https://gerrit.ovirt.org/39780 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: I938a1f2bc70fceab2c69bc8b3d8c0724a9da7720 Gerrit-PatchSet: 1 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Dima Kuznetsov dkuzn...@redhat.com Gerrit-Reviewer: Dan Kenigsberg dan...@redhat.com Gerrit-Reviewer: Dima Kuznetsov dkuzn...@redhat.com Gerrit-Reviewer: Yaniv Bronhaim ybron...@redhat.com Gerrit-Reviewer: automat...@ovirt.org Gerrit-Reviewer: oVirt Jenkins CI Server Gerrit-HasComments: No ___ vdsm-patches mailing list vdsm-patches@lists.fedorahosted.org https://lists.fedorahosted.org/mailman/listinfo/vdsm-patches
Change in vdsm[master]: shell_helper: remove unneeded build statements
Dima Kuznetsov has posted comments on this change. Change subject: shell_helper: remove unneeded build statements .. Patch Set 2: (1 comment) https://gerrit.ovirt.org/#/c/39779/2/contrib/shell_helper File contrib/shell_helper: Line 83 Line 84 Line 85 Line 86 Line 87 Maybe it is worth dropping the NOSE_EXCLUDE too? building RPMs without running the unit tests is not always a good idea... -- To view, visit https://gerrit.ovirt.org/39779 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: I7953c9eefe5e2fb8dfd01450ff52368a83a9c77d Gerrit-PatchSet: 2 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Ido Barkan ibar...@redhat.com Gerrit-Reviewer: Dima Kuznetsov dkuzn...@redhat.com Gerrit-Reviewer: automat...@ovirt.org Gerrit-Reviewer: oVirt Jenkins CI Server Gerrit-HasComments: Yes ___ vdsm-patches mailing list vdsm-patches@lists.fedorahosted.org https://lists.fedorahosted.org/mailman/listinfo/vdsm-patches
Change in vdsm[master]: client: Add warning prompt on dangerous commands
Dima Kuznetsov has abandoned this change. Change subject: client: Add warning prompt on dangerous commands .. Abandoned Closed as wontfix -- To view, visit https://gerrit.ovirt.org/28174 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: abandon Gerrit-Change-Id: Idea34ad7c3d5b66993bcb56b61e7edb0549ef9fb Gerrit-PatchSet: 2 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Dima Kuznetsov dkuzn...@redhat.com Gerrit-Reviewer: Dima Kuznetsov dkuzn...@redhat.com Gerrit-Reviewer: Nir Soffer nsof...@redhat.com Gerrit-Reviewer: Oved Ourfali oourf...@redhat.com Gerrit-Reviewer: Saggi Mizrahi smizr...@redhat.com Gerrit-Reviewer: Yaniv Bronhaim ybron...@redhat.com Gerrit-Reviewer: automat...@ovirt.org Gerrit-Reviewer: mooli tayer mta...@redhat.com Gerrit-Reviewer: oVirt Jenkins CI Server ___ vdsm-patches mailing list vdsm-patches@lists.fedorahosted.org https://lists.fedorahosted.org/mailman/listinfo/vdsm-patches
Change in vdsm[master]: Adding Vdsm cron job check for available packages update
Dima Kuznetsov has posted comments on this change. Change subject: Adding Vdsm cron job check for available packages update .. Patch Set 10: Code-Review+1 -- To view, visit https://gerrit.ovirt.org/38401 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: I1f6b83e1c18c05142da095b0b537fa6d9aecb59e Gerrit-PatchSet: 10 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Yaniv Bronhaim ybron...@redhat.com Gerrit-Reviewer: Barak Azulay bazu...@redhat.com Gerrit-Reviewer: Dan Kenigsberg dan...@redhat.com Gerrit-Reviewer: Dima Kuznetsov dkuzn...@redhat.com Gerrit-Reviewer: Moti Asayag masa...@redhat.com Gerrit-Reviewer: Oved Ourfali oourf...@redhat.com Gerrit-Reviewer: Yaniv Bronhaim ybron...@redhat.com Gerrit-Reviewer: Yeela Kaplan ykap...@redhat.com Gerrit-Reviewer: automat...@ovirt.org Gerrit-Reviewer: oVirt Jenkins CI Server Gerrit-HasComments: No ___ vdsm-patches mailing list vdsm-patches@lists.fedorahosted.org https://lists.fedorahosted.org/mailman/listinfo/vdsm-patches
Change in vdsm[master]: Introducing getAvailableUpdates API
Dima Kuznetsov has posted comments on this change. Change subject: Introducing getAvailableUpdates API .. Patch Set 8: Code-Review+1 -- To view, visit https://gerrit.ovirt.org/38559 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: I9d47d5395519fff4378ab7dd88b30c4766467427 Gerrit-PatchSet: 8 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Yaniv Bronhaim ybron...@redhat.com Gerrit-Reviewer: Barak Azulay bazu...@redhat.com Gerrit-Reviewer: Dima Kuznetsov dkuzn...@redhat.com Gerrit-Reviewer: Moti Asayag masa...@redhat.com Gerrit-Reviewer: Oved Ourfali oourf...@redhat.com Gerrit-Reviewer: automat...@ovirt.org Gerrit-Reviewer: oVirt Jenkins CI Server Gerrit-HasComments: No ___ vdsm-patches mailing list vdsm-patches@lists.fedorahosted.org https://lists.fedorahosted.org/mailman/listinfo/vdsm-patches
Change in vdsm[master]: stomp: Make sure the \0 is a last char in the buffer
Dima Kuznetsov has posted comments on this change. Change subject: stomp: Make sure the \0 is a last char in the buffer .. Patch Set 11: Code-Review+1 -- To view, visit https://gerrit.ovirt.org/35938 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: Ie0d8eaae161f3ec6c77726f4f9da044ab7c629d4 Gerrit-PatchSet: 11 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Saggi Mizrahi smizr...@redhat.com Gerrit-Reviewer: Dima Kuznetsov dkuzn...@redhat.com Gerrit-Reviewer: Francesco Romani from...@redhat.com Gerrit-Reviewer: Piotr Kliczewski piotr.kliczew...@gmail.com Gerrit-Reviewer: Yaniv Bronhaim ybron...@redhat.com Gerrit-Reviewer: automat...@ovirt.org Gerrit-Reviewer: oVirt Jenkins CI Server Gerrit-HasComments: No ___ vdsm-patches mailing list vdsm-patches@lists.fedorahosted.org https://lists.fedorahosted.org/mailman/listinfo/vdsm-patches
Change in vdsm[master]: stomp: Remove redundant code
Dima Kuznetsov has posted comments on this change. Change subject: stomp: Remove redundant code .. Patch Set 11: Code-Review+1 -- To view, visit https://gerrit.ovirt.org/35939 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: I7b9fb4b4b4c5286733f8f4435ec6dcea04f96233 Gerrit-PatchSet: 11 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Saggi Mizrahi smizr...@redhat.com Gerrit-Reviewer: Dima Kuznetsov dkuzn...@redhat.com Gerrit-Reviewer: Francesco Romani from...@redhat.com Gerrit-Reviewer: Piotr Kliczewski piotr.kliczew...@gmail.com Gerrit-Reviewer: Yaniv Bronhaim ybron...@redhat.com Gerrit-Reviewer: automat...@ovirt.org Gerrit-Reviewer: oVirt Jenkins CI Server Gerrit-HasComments: No ___ vdsm-patches mailing list vdsm-patches@lists.fedorahosted.org https://lists.fedorahosted.org/mailman/listinfo/vdsm-patches
Change in vdsm[master]: spec: configure multipath on upgrade
Dima Kuznetsov has posted comments on this change. Change subject: spec: configure multipath on upgrade .. Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.ovirt.org/39064 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: I57bb4ea9c4ffa06f72240d1903e2ca8804084513 Gerrit-PatchSet: 1 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Yeela Kaplan ykap...@redhat.com Gerrit-Reviewer: Dan Kenigsberg dan...@redhat.com Gerrit-Reviewer: Dima Kuznetsov dkuzn...@redhat.com Gerrit-Reviewer: Yaniv Bronhaim ybron...@redhat.com Gerrit-Reviewer: Yeela Kaplan ykap...@redhat.com Gerrit-Reviewer: automat...@ovirt.org Gerrit-Reviewer: mooli tayer mta...@redhat.com Gerrit-Reviewer: oVirt Jenkins CI Server Gerrit-HasComments: No ___ vdsm-patches mailing list vdsm-patches@lists.fedorahosted.org https://lists.fedorahosted.org/mailman/listinfo/vdsm-patches
Change in vdsm[master]: Introducing getAvailableUpdates API
Dima Kuznetsov has posted comments on this change.
Change subject: Introducing getAvailableUpdates API
..
Patch Set 5:
(1 comment)
https://gerrit.ovirt.org/#/c/38559/5/vdsm/API.py
File vdsm/API.py:
Line 1309: info['updates'] = []
Line 1310: with open(constants.P_VDSM_LIB + 'updates.list', 'r') as
f:
Line 1311: for line in f:
Line 1312: pkg = {}
Line 1313: line = line.split('#')
Any reason for serializing manually? Why not some JSON/other format that will
just yield this dictionary?
Line 1314: pkg['name'] = line[0]
Line 1315: pkg['version'] = line[1]
Line 1316: pkg['prev_version'] = line[2]
Line 1317: pkg['repo'] = line[3]
--
To view, visit https://gerrit.ovirt.org/38559
To unsubscribe, visit https://gerrit.ovirt.org/settings
Gerrit-MessageType: comment
Gerrit-Change-Id: I9d47d5395519fff4378ab7dd88b30c4766467427
Gerrit-PatchSet: 5
Gerrit-Project: vdsm
Gerrit-Branch: master
Gerrit-Owner: Yaniv Bronhaim ybron...@redhat.com
Gerrit-Reviewer: Barak Azulay bazu...@redhat.com
Gerrit-Reviewer: Dima Kuznetsov dkuzn...@redhat.com
Gerrit-Reviewer: Moti Asayag masa...@redhat.com
Gerrit-Reviewer: Oved Ourfali oourf...@redhat.com
Gerrit-Reviewer: automat...@ovirt.org
Gerrit-Reviewer: oVirt Jenkins CI Server
Gerrit-HasComments: Yes
___
vdsm-patches mailing list
vdsm-patches@lists.fedorahosted.org
https://lists.fedorahosted.org/mailman/listinfo/vdsm-patches
Change in vdsm[master]: Adding Vdsm cron job check for available packages update
Dima Kuznetsov has posted comments on this change.
Change subject: Adding Vdsm cron job check for available packages update
..
Patch Set 8:
(3 comments)
https://gerrit.ovirt.org/#/c/38401/8/vdsm/updater-tool
File vdsm/updater-tool:
Line 46: try:
Line 47: import dnf
Line 48: dnfSupport = True
Line 49: except ImportError:
Line 50: dnfSupport = False
If you're uploading another version please keep imports above code
Line 51:
Line 52:
Line 53: # UpdaterTool refresh installed packages cache and return list of
available
Line 54: # updates. pkgProvider can be yum, apt-get, dnf and set on creation
Line 107: return self.provider.cleanExpireCache() and \
Line 108: self.provider.cleanRpmDB()
Line 109:
Line 110: if dnfSupport:
Line 111: # WIP
??
Line 112: class DnfProvider(dnf.Base):
Line 113: def __init__(self):
Line 114: dnf.Base.__init__(self)
Line 115:
Line 166: (pkgList or 'all available packages'))
Line 167: if args.provider == 'yum' and yumSupport:
Line 168: updater = UpdaterTool(YumProvider)
Line 169: elif args.provider == 'dnf' and dnfSupport:
Line 170: updater = UpdaterTool(DnfProvider)
Posted a comment about this above but I didn't see you replied for or against
Line 171: else:
Line 172: outputPrint('Failed to initialize provider for %s' %
args.provider)
Line 173: sys.exit(1)
Line 174:
--
To view, visit https://gerrit.ovirt.org/38401
To unsubscribe, visit https://gerrit.ovirt.org/settings
Gerrit-MessageType: comment
Gerrit-Change-Id: I1f6b83e1c18c05142da095b0b537fa6d9aecb59e
Gerrit-PatchSet: 8
Gerrit-Project: vdsm
Gerrit-Branch: master
Gerrit-Owner: Yaniv Bronhaim ybron...@redhat.com
Gerrit-Reviewer: Barak Azulay bazu...@redhat.com
Gerrit-Reviewer: Dan Kenigsberg dan...@redhat.com
Gerrit-Reviewer: Dima Kuznetsov dkuzn...@redhat.com
Gerrit-Reviewer: Moti Asayag masa...@redhat.com
Gerrit-Reviewer: Oved Ourfali oourf...@redhat.com
Gerrit-Reviewer: Yeela Kaplan ykap...@redhat.com
Gerrit-Reviewer: automat...@ovirt.org
Gerrit-Reviewer: oVirt Jenkins CI Server
Gerrit-HasComments: Yes
___
vdsm-patches mailing list
vdsm-patches@lists.fedorahosted.org
https://lists.fedorahosted.org/mailman/listinfo/vdsm-patches
