Change in vdsm[master]: Fix gluster files installation after upgrade
by Code Review
From Yaniv Bronhaim <ybronhei(a)redhat.com>:
Yaniv Bronhaim has uploaded a new change for review.
Change subject: Fix gluster files installation after upgrade
......................................................................
Fix gluster files installation after upgrade
In https://gerrit.ovirt.org/#/c/57530/15/vdsm.spec.in we changed vdsm
package files to install the files under site-packages. This conflicts
with the declaration in vdsm-python files which attemp to install the
same gluster folder and part of the files. This patch moves all the
installation of vdsm gluster lib files to vdsm-python which includes
basically all vdsm lib folder so this is the right location for
lib/gluster in vdsm spec.
Change-Id: I1303651c165b05c092e587b3df15a54776ff2f9d
Signed-off-by: Yaniv Bronhaim <ybronhei(a)redhat.com>
---
M vdsm.spec.in
1 file changed, 1 insertion(+), 3 deletions(-)
git pull ssh://gerrit.ovirt.org:29418/vdsm refs/changes/77/67777/1
diff --git a/vdsm.spec.in b/vdsm.spec.in
index 6de55ec..0e38d77 100644
--- a/vdsm.spec.in
+++ b/vdsm.spec.in
@@ -1050,9 +1050,6 @@
%{_datadir}/%{vdsm_name}/get-conf-item
%{_datadir}/%{vdsm_name}/set-conf-item
-%dir %{python_sitelib}/%{vdsm_name}/gluster
-%{python_sitelib}/%{vdsm_name}/gluster/__init__.py*
-%{python_sitelib}/%{vdsm_name}/gluster/cli.py*
%{python_sitelib}/sos/plugins/vdsm.py*
%{_udevrulesdir}/12-vdsm-lvm.rules
/etc/security/limits.d/99-vdsm.conf
@@ -1131,6 +1128,7 @@
# gluster.exception is used in many places like Bridge.py. So it is required
# even without vdsm-gluster package
%{python_sitelib}/%{vdsm_name}/gluster/__init__.py*
+%{python_sitelib}/%{vdsm_name}/gluster/cli.py*
%{python_sitelib}/%{vdsm_name}/gluster/exception.py*
%{python_sitelib}/%{vdsm_name}/health.py*
%{python_sitelib}/%{vdsm_name}/hooks.py*
--
To view, visit https://gerrit.ovirt.org/67777
To unsubscribe, visit https://gerrit.ovirt.org/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I1303651c165b05c092e587b3df15a54776ff2f9d
Gerrit-PatchSet: 1
Gerrit-Project: vdsm
Gerrit-Branch: master
Gerrit-Owner: Yaniv Bronhaim <ybronhei(a)redhat.com>
7 years, 6 months
Change in vdsm[master]: py3: storage_resourcemanager_test: take _thread from six
by Code Review
From Dan Kenigsberg <danken(a)redhat.com>:
Dan Kenigsberg has uploaded a new change for review.
Change subject: py3: storage_resourcemanager_test: take _thread from six
......................................................................
py3: storage_resourcemanager_test: take _thread from six
The module is yet far from passing under Python 3.
Change-Id: I15ff0562759d7666fd605d0617b9a32fae08d4aa
Signed-off-by: Dan Kenigsberg <danken(a)redhat.com>
---
M tests/storage_resourcemanager_test.py
1 file changed, 1 insertion(+), 1 deletion(-)
git pull ssh://gerrit.ovirt.org:29418/vdsm refs/changes/79/67779/1
diff --git a/tests/storage_resourcemanager_test.py b/tests/storage_resourcemanager_test.py
index 21e83d7..5f0ca04 100644
--- a/tests/storage_resourcemanager_test.py
+++ b/tests/storage_resourcemanager_test.py
@@ -21,7 +21,7 @@
from weakref import proxy
from random import Random
import threading
-from thread import error as ThreadError
+from six.moves._thread import error as ThreadError
from StringIO import StringIO
import types
from resource import getrlimit, RLIMIT_NPROC
--
To view, visit https://gerrit.ovirt.org/67779
To unsubscribe, visit https://gerrit.ovirt.org/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I15ff0562759d7666fd605d0617b9a32fae08d4aa
Gerrit-PatchSet: 1
Gerrit-Project: vdsm
Gerrit-Branch: master
Gerrit-Owner: Dan Kenigsberg <danken(a)redhat.com>
7 years, 6 months
Change in vdsm[master]: docker: configuration: factor in a method
by Code Review
From Dan Kenigsberg <danken(a)redhat.com>:
Dan Kenigsberg has submitted this change and it was merged.
Change subject: docker: configuration: factor in a method
......................................................................
docker: configuration: factor in a method
To make the code tidier with no changes in behaviour.
Change-Id: I0e92339f2fd1142165a7efbe0bb5f3d4dba650e5
Signed-off-by: Francesco Romani <fromani(a)redhat.com>
---
M lib/vdsm/virt/containers/docker.py
1 file changed, 18 insertions(+), 11 deletions(-)
Approvals:
Dan Kenigsberg: Looks good to me, approved; Passed CI tests
Francesco Romani: Verified
Milan Zamazal: Looks good to me, but someone else must approve
Objections:
Jenkins CI: Failed CI tests
--
To view, visit https://gerrit.ovirt.org/67506
To unsubscribe, visit https://gerrit.ovirt.org/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I0e92339f2fd1142165a7efbe0bb5f3d4dba650e5
Gerrit-PatchSet: 6
Gerrit-Project: vdsm
Gerrit-Branch: master
Gerrit-Owner: Francesco Romani <fromani(a)redhat.com>
Gerrit-Reviewer: Dan Kenigsberg <danken(a)redhat.com>
Gerrit-Reviewer: Francesco Romani <fromani(a)redhat.com>
Gerrit-Reviewer: Jenkins CI
Gerrit-Reviewer: Martin Polednik <mpolednik(a)redhat.com>
Gerrit-Reviewer: Milan Zamazal <mzamazal(a)redhat.com>
Gerrit-Reviewer: gerrit-hooks <automation(a)ovirt.org>
7 years, 6 months
Change in vdsm[master]: docker: configuration: factor in a method
by Code Review
From Dan Kenigsberg <danken(a)redhat.com>:
Dan Kenigsberg has posted comments on this change.
Change subject: docker: configuration: factor in a method
......................................................................
Patch Set 6: Continuous-Integration+1
unrelated failure
07:23:41 FAIL: testWaitTimeout (storage_misc_test.AsyncProcTests)
07:23:41 ----------------------------------------------------------------------
07:23:41 Traceback (most recent call last):
07:23:41 File "/home/jenkins/workspace/vdsm_master_check-patch-fc24-x86_64/vdsm/tests/storage_misc_test.py", line 298, in testWaitTimeout
07:23:41 self.assertTrue(duration < (ttl + 1))
07:23:41 AssertionError: False is not true
--
To view, visit https://gerrit.ovirt.org/67506
To unsubscribe, visit https://gerrit.ovirt.org/settings
Gerrit-MessageType: comment
Gerrit-Change-Id: I0e92339f2fd1142165a7efbe0bb5f3d4dba650e5
Gerrit-PatchSet: 6
Gerrit-Project: vdsm
Gerrit-Branch: master
Gerrit-Owner: Francesco Romani <fromani(a)redhat.com>
Gerrit-Reviewer: Dan Kenigsberg <danken(a)redhat.com>
Gerrit-Reviewer: Francesco Romani <fromani(a)redhat.com>
Gerrit-Reviewer: Jenkins CI
Gerrit-Reviewer: Martin Polednik <mpolednik(a)redhat.com>
Gerrit-Reviewer: Milan Zamazal <mzamazal(a)redhat.com>
Gerrit-Reviewer: gerrit-hooks <automation(a)ovirt.org>
Gerrit-HasComments: No
7 years, 6 months
Change in vdsm[master]: py3: make fileUtilsTests pass on Python 3
by Code Review
From Dan Kenigsberg <danken(a)redhat.com>:
Dan Kenigsberg has uploaded a new change for review.
Change subject: py3: make fileUtilsTests pass on Python 3
......................................................................
py3: make fileUtilsTests pass on Python 3
This patch takes StringTypes from six.
Change-Id: I294f83312fa2f73e2ba3560e17f264a3a4af0898
Signed-off-by: Dan Kenigsberg <danken(a)redhat.com>
---
M lib/vdsm/storage/fileUtils.py
M tests/Makefile.am
2 files changed, 2 insertions(+), 4 deletions(-)
git pull ssh://gerrit.ovirt.org:29418/vdsm refs/changes/49/67649/1
diff --git a/lib/vdsm/storage/fileUtils.py b/lib/vdsm/storage/fileUtils.py
index f447f8c..2e84d5f 100644
--- a/lib/vdsm/storage/fileUtils.py
+++ b/lib/vdsm/storage/fileUtils.py
@@ -33,7 +33,6 @@
import stat
import subprocess
import sys
-import types
import six
@@ -214,7 +213,7 @@
def resolveUid(user):
- if isinstance(user, types.StringTypes):
+ if isinstance(user, six.string_types):
uid = pwd.getpwnam(user).pw_uid
else:
uid = int(user)
@@ -222,7 +221,7 @@
def resolveGid(group):
- if isinstance(group, types.StringTypes):
+ if isinstance(group, six.string_types):
gid = grp.getgrnam(group).gr_gid
else:
gid = int(group)
diff --git a/tests/Makefile.am b/tests/Makefile.am
index e82e3aa..f3f7da2 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -210,7 +210,6 @@
storage_blockvolume_test.py \
storage_fakelib_test.py \
storage_filesd_test.py \
- storage_fileutil_test.py \
storage_filevolume_test.py \
storage_guarded_test.py \
storage_hsm_test.py \
--
To view, visit https://gerrit.ovirt.org/67649
To unsubscribe, visit https://gerrit.ovirt.org/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I294f83312fa2f73e2ba3560e17f264a3a4af0898
Gerrit-PatchSet: 1
Gerrit-Project: vdsm
Gerrit-Branch: master
Gerrit-Owner: Dan Kenigsberg <danken(a)redhat.com>
7 years, 6 months
Change in vdsm[master]: docker: configuration: factor in a method
by Code Review
From Dan Kenigsberg <danken(a)redhat.com>:
Dan Kenigsberg has posted comments on this change.
Change subject: docker: configuration: factor in a method
......................................................................
Patch Set 5: Code-Review+2
raising
--
To view, visit https://gerrit.ovirt.org/67506
To unsubscribe, visit https://gerrit.ovirt.org/settings
Gerrit-MessageType: comment
Gerrit-Change-Id: I0e92339f2fd1142165a7efbe0bb5f3d4dba650e5
Gerrit-PatchSet: 5
Gerrit-Project: vdsm
Gerrit-Branch: master
Gerrit-Owner: Francesco Romani <fromani(a)redhat.com>
Gerrit-Reviewer: Dan Kenigsberg <danken(a)redhat.com>
Gerrit-Reviewer: Francesco Romani <fromani(a)redhat.com>
Gerrit-Reviewer: Jenkins CI
Gerrit-Reviewer: Martin Polednik <mpolednik(a)redhat.com>
Gerrit-Reviewer: Milan Zamazal <mzamazal(a)redhat.com>
Gerrit-Reviewer: gerrit-hooks <automation(a)ovirt.org>
Gerrit-HasComments: No
7 years, 6 months
Change in vdsm[master]: Add ovirt-hosted-engine-ha package to key packages
by Code Review
From Dan Kenigsberg <danken(a)redhat.com>:
Dan Kenigsberg has submitted this change and it was merged.
Change subject: Add ovirt-hosted-engine-ha package to key packages
......................................................................
Add ovirt-hosted-engine-ha package to key packages
Add the ovirt-hosted-engine-ha package to the list of key packages
whose installation status is reported in capabilities.
Bug-Url: https://bugzilla.redhat.com/1392957
Change-Id: I7d033e1f063150066a8239cb9b87a453a8c379d5
Signed-off-by: Phillip Bailey <phbailey(a)redhat.com>
---
M lib/vdsm/osinfo.py
1 file changed, 1 insertion(+), 0 deletions(-)
Approvals:
Jenkins CI: Passed CI tests
Dan Kenigsberg: Looks good to me, approved
Phillip Bailey: Verified
--
To view, visit https://gerrit.ovirt.org/67704
To unsubscribe, visit https://gerrit.ovirt.org/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I7d033e1f063150066a8239cb9b87a453a8c379d5
Gerrit-PatchSet: 4
Gerrit-Project: vdsm
Gerrit-Branch: master
Gerrit-Owner: Phillip Bailey <phbailey(a)redhat.com>
Gerrit-Reviewer: Andrej Krejcir <akrejcir(a)redhat.com>
Gerrit-Reviewer: Dan Kenigsberg <danken(a)redhat.com>
Gerrit-Reviewer: Francesco Romani <fromani(a)redhat.com>
Gerrit-Reviewer: Jenkins CI
Gerrit-Reviewer: Jenny Tokar <jtokar(a)redhat.com>
Gerrit-Reviewer: Martin Sivák <msivak(a)redhat.com>
Gerrit-Reviewer: Nir Soffer <nsoffer(a)redhat.com>
Gerrit-Reviewer: Phillip Bailey <phbailey(a)redhat.com>
Gerrit-Reviewer: Roman Mohr <rmohr(a)redhat.com>
Gerrit-Reviewer: Roy Golan <rgolan(a)redhat.com>
Gerrit-Reviewer: Yanir Quinn <yquinn(a)redhat.com>
Gerrit-Reviewer: gerrit-hooks <automation(a)ovirt.org>
7 years, 6 months
Change in vdsm[master]: Add ovirt-hosted-engine-ha package to key packages
by Code Review
From Dan Kenigsberg <danken(a)redhat.com>:
Dan Kenigsberg has posted comments on this change.
Change subject: Add ovirt-hosted-engine-ha package to key packages
......................................................................
Patch Set 3: Code-Review+2
--
To view, visit https://gerrit.ovirt.org/67704
To unsubscribe, visit https://gerrit.ovirt.org/settings
Gerrit-MessageType: comment
Gerrit-Change-Id: I7d033e1f063150066a8239cb9b87a453a8c379d5
Gerrit-PatchSet: 3
Gerrit-Project: vdsm
Gerrit-Branch: master
Gerrit-Owner: Phillip Bailey <phbailey(a)redhat.com>
Gerrit-Reviewer: Andrej Krejcir <akrejcir(a)redhat.com>
Gerrit-Reviewer: Dan Kenigsberg <danken(a)redhat.com>
Gerrit-Reviewer: Francesco Romani <fromani(a)redhat.com>
Gerrit-Reviewer: Jenkins CI
Gerrit-Reviewer: Jenny Tokar <jtokar(a)redhat.com>
Gerrit-Reviewer: Martin Sivák <msivak(a)redhat.com>
Gerrit-Reviewer: Nir Soffer <nsoffer(a)redhat.com>
Gerrit-Reviewer: Phillip Bailey <phbailey(a)redhat.com>
Gerrit-Reviewer: Roman Mohr <rmohr(a)redhat.com>
Gerrit-Reviewer: Roy Golan <rgolan(a)redhat.com>
Gerrit-Reviewer: Yanir Quinn <yquinn(a)redhat.com>
Gerrit-Reviewer: gerrit-hooks <automation(a)ovirt.org>
Gerrit-HasComments: No
7 years, 6 months
Change in vdsm[master]: configfile: remove unpersist/persist calls
by Code Review
From Dan Kenigsberg <danken(a)redhat.com>:
Dan Kenigsberg has submitted this change and it was merged.
Change subject: configfile: remove unpersist/persist calls
......................................................................
configfile: remove unpersist/persist calls
persist/unpersist calls are only needed in oVirt Node Vintage.
Currently, oVirt Node Next doesn't require such approach.
Change-Id: I5dc3d09f940e7cfe7b69eb3ada2a2ae09291b535
Signed-off-by: Douglas Schilling Landgraf <dougsland(a)redhat.com>
---
M lib/vdsm/tool/configfile.py
1 file changed, 0 insertions(+), 2 deletions(-)
Approvals:
Douglas Schilling Landgraf: Verified
Nir Soffer: Looks good to me, but someone else must approve
Jenkins CI: Passed CI tests
Dan Kenigsberg: Looks good to me, approved
--
To view, visit https://gerrit.ovirt.org/67719
To unsubscribe, visit https://gerrit.ovirt.org/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I5dc3d09f940e7cfe7b69eb3ada2a2ae09291b535
Gerrit-PatchSet: 3
Gerrit-Project: vdsm
Gerrit-Branch: master
Gerrit-Owner: Douglas Schilling Landgraf <dougsland(a)redhat.com>
Gerrit-Reviewer: Dan Kenigsberg <danken(a)redhat.com>
Gerrit-Reviewer: Douglas Schilling Landgraf <dougsland(a)redhat.com>
Gerrit-Reviewer: Jenkins CI
Gerrit-Reviewer: Nir Soffer <nsoffer(a)redhat.com>
Gerrit-Reviewer: gerrit-hooks <automation(a)ovirt.org>
7 years, 6 months
Change in vdsm[master]: Move caps module to vdsm.host.caps
by Code Review
From Dan Kenigsberg <danken(a)redhat.com>:
Dan Kenigsberg has submitted this change and it was merged.
Change subject: Move caps module to vdsm.host.caps
......................................................................
Move caps module to vdsm.host.caps
This patch moves caps under lib.vdsm
Change-Id: I1dfc6d4a873c3ab9ae811b84fca0f7b0a75ff69a
Signed-off-by: Yaniv Bronhaim <ybronhei(a)redhat.com>
---
R lib/vdsm/host/caps.py
M tests/capsTests.py
M vdsm.spec.in
M vdsm/API.py
M vdsm/Makefile.am
M vdsm/virt/vm.py
6 files changed, 6 insertions(+), 9 deletions(-)
Approvals:
Jenkins CI: Passed CI tests
Dan Kenigsberg: Verified; Looks good to me, approved
--
To view, visit https://gerrit.ovirt.org/57533
To unsubscribe, visit https://gerrit.ovirt.org/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I1dfc6d4a873c3ab9ae811b84fca0f7b0a75ff69a
Gerrit-PatchSet: 7
Gerrit-Project: vdsm
Gerrit-Branch: master
Gerrit-Owner: Yaniv Bronhaim <ybronhei(a)redhat.com>
Gerrit-Reviewer: Dan Kenigsberg <danken(a)redhat.com>
Gerrit-Reviewer: Jenkins CI
Gerrit-Reviewer: Nir Soffer <nsoffer(a)redhat.com>
Gerrit-Reviewer: Piotr Kliczewski <piotr.kliczewski(a)gmail.com>
Gerrit-Reviewer: Yaniv Bronhaim <ybronhei(a)redhat.com>
Gerrit-Reviewer: gerrit-hooks <automation(a)ovirt.org>
7 years, 6 months