Change in vdsm[ovirt-3.5]: net: fix defaultRoute mismatch during restoration.
automat...@ovirt.org has posted comments on this change. Change subject: net: fix defaultRoute mismatch during restoration. .. Patch Set 1: Verified-1 * Update tracker::IGNORE, no Bug-Url found * Check Bug-Url::ERROR, At least one bug-url is required for the stable branch * warn_if_not_merged_to_previous_branch: OK -- To view, visit https://gerrit.ovirt.org/44613 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: If8e4d19329b230d620bc4545a0d0355f482b5bef Gerrit-PatchSet: 1 Gerrit-Project: vdsm Gerrit-Branch: ovirt-3.5 Gerrit-Owner: Ido Barkan 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]: net: fix defaultRoute mismatch during restoration.
Ido Barkan has uploaded a new change for review.
Change subject: net: fix defaultRoute mismatch during restoration.
..
net: fix defaultRoute mismatch during restoration.
On rhev-h 3.5, when a host registers itself to the engine, the
management network is configured by vdsm-reg and VDSM internal
logic makes sure that this network will have DEFROUTE=yes in it's
ifcfg file. Since VDSM logic happens during _addNetwork and after
the parameters that will eventually get persisted are set, we end
up with a network that is the default route but is not persisted
that way.
This tricks the selective restoration that think that this network
was somehow changed since it is different than it's persistence. It
results in a restoration of the management network although it was
never changed.
This fix makes sure that if a management network is persisted, it
will always considered as defaultRoute.
Since VDSM 3.6, vdsm registration along with internal logic are
gone, and all defaultRoute logic lies in engine. Hence this patch
should only be part of 3.5.
Label: ovirt-3.5-only
Change-Id: If8e4d19329b230d620bc4545a0d0355f482b5bef
Signed-off-by: Ido Barkan
---
M lib/vdsm/netconfpersistence.py
1 file changed, 13 insertions(+), 1 deletion(-)
git pull ssh://gerrit.ovirt.org:29418/vdsm refs/changes/13/44613/1
diff --git a/lib/vdsm/netconfpersistence.py b/lib/vdsm/netconfpersistence.py
index f5916f6..ce25891 100644
--- a/lib/vdsm/netconfpersistence.py
+++ b/lib/vdsm/netconfpersistence.py
@@ -318,6 +318,7 @@
self._normalize_bonding_nics(config_copy)
self._normalize_address(config_copy)
self._normalize_ifcfg_keys(config_copy)
+self._normalize_default_route(config_copy)
return config_copy
@@ -386,7 +387,18 @@
net_attr['netmask'] = self._netinfo.prefix2netmask(int(prefix))
if 'ipv6addr' in net_attr:
net_attr['ipv6addr'] = [net_attr['ipv6addr']]
-if 'defaultRoute' not in net_attr:
+
+def _normalize_default_route(self, config_copy):
+# make sure that management networks have a defaultRoute parameter.
+# engine will usually do this, but engine registration in rhev-h can
+# skip this and then (on vdsm3.5) it is done internally by VDSM.
+for net, net_attr in config_copy.networks.iteritems():
+default_route = net_attr.get('defaultRoute')
+if default_route is not None:
+net_attr['defaultRoute'] = default_route
+elif net in ('ovirtmgmt', 'rhevm'):
+net_attr['defaultRoute'] = True
+else:
net_attr['defaultRoute'] = False
def _normalize_ifcfg_keys(self, config_copy):
--
To view, visit https://gerrit.ovirt.org/44613
To unsubscribe, visit https://gerrit.ovirt.org/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: If8e4d19329b230d620bc4545a0d0355f482b5bef
Gerrit-PatchSet: 1
Gerrit-Project: vdsm
Gerrit-Branch: ovirt-3.5
Gerrit-Owner: Ido Barkan
___
vdsm-patches mailing list
vdsm-patches@lists.fedorahosted.org
https://lists.fedorahosted.org/mailman/listinfo/vdsm-patches
Change in vdsm[master]: gluster: Report glusterfs-cli package details
Ala Hino has posted comments on this change.
Change subject: gluster: Report glusterfs-cli package details
..
Patch Set 2:
(2 comments)
https://gerrit.ovirt.org/#/c/44581/2/vdsm/caps.py
File vdsm/caps.py:
Line 789
Line 790
Line 791
Line 792
Line 793
> gluster-cli should also appear here for debian support.
Done
Line 762: 'spice-server': ('spice-server',),
Line 763: 'libvirt': ('libvirt', 'libvirt-daemon-kvm'),
Line 764: 'mom': ('mom',),
Line 765: 'librbd1': ('librbd1',),
Line 766: 'glusterfs-cli': ('glusterfs-cli',),
> This needs to be here if we don't have vdsm-gluster installed, but it isn't
Not sure I completely understand this comment.
In the engine, I am going to check only this to decide whether gluster is
installed or not.
Again, maybe I am missing the point.
Line 767: }
Line 768:
Line 769: if _glusterEnabled:
Line 770: KEY_PACKAGES.update(GLUSTER_RPM_PACKAGES)
--
To view, visit https://gerrit.ovirt.org/44581
To unsubscribe, visit https://gerrit.ovirt.org/settings
Gerrit-MessageType: comment
Gerrit-Change-Id: Id66bb578e56bdf5dc70759f62c1a1b68cd91d586
Gerrit-PatchSet: 2
Gerrit-Project: vdsm
Gerrit-Branch: master
Gerrit-Owner: Ala Hino
Gerrit-Reviewer: Ala Hino
Gerrit-Reviewer: Allon Mureinik
Gerrit-Reviewer: Jenkins CI
Gerrit-Reviewer: Nir Soffer
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]: gluster: Report glusterfs-cli package details
automat...@ovirt.org has posted comments on this change. Change subject: gluster: Report glusterfs-cli package details .. Patch Set 3: * Update tracker::#1183318::OK * Check Bug-Url::OK * Check Public Bug::#1183318::OK, public bug * Check Product::#1183318::OK, Correct product oVirt * Check TR::SKIP, not in a monitored branch (ovirt-3.5 ovirt-3.4 ovirt-3.3 ovirt-3.2) * Check merged to previous::IGNORE, Not in stable branch (['ovirt-3.5', 'ovirt-3.4', 'ovirt-3.3']) -- To view, visit https://gerrit.ovirt.org/44581 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: Id66bb578e56bdf5dc70759f62c1a1b68cd91d586 Gerrit-PatchSet: 3 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Ala Hino Gerrit-Reviewer: Ala Hino Gerrit-Reviewer: Allon Mureinik Gerrit-Reviewer: Jenkins CI Gerrit-Reviewer: Nir Soffer 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: Introduce indirection tests for storage refactoring
Adam Litke has posted comments on this change.
Change subject: tests: Introduce indirection tests for storage refactoring
..
Patch Set 1:
(2 comments)
https://gerrit.ovirt.org/#/c/44098/1/tests/sdm_indirection_tests.py
File tests/sdm_indirection_tests.py:
Line 115: return FakeBlockStorageDomain()
Line 116: elif domType == 'file':
Line 117: return FakeFileStorageDomain()
Line 118: else:
Line 119: raise ValueError("%s is not a valid domain type" %
domType)
> You can simplify this by having base class implementing the tests:
Great idea! See current version of the patch for the results.
Line 120:
Line 121: def _check(self, domType, fn, args, result):
Line 122: dom = self._get_domain(domType)
Line 123: getattr(dom, fn)(*args)
Line 160: ['getMDPath'],
Line 161: ['getMetaParam', 1],
Line 162: ])
Line 163: def test_domain_funcs(self, fn, nargs=0):
Line 164: for domType in 'file', 'block':
> This should go into the permutations, so failure of block domain with some
Done
Line 165: self.check_call(domType, fn, nargs)
Line 166:
Line 167: @permutations([
Line 168: ['getVAllocSize', 2]
--
To view, visit https://gerrit.ovirt.org/44098
To unsubscribe, visit https://gerrit.ovirt.org/settings
Gerrit-MessageType: comment
Gerrit-Change-Id: I336b543aa7ba019c91104e860a28bb40acc268b9
Gerrit-PatchSet: 1
Gerrit-Project: vdsm
Gerrit-Branch: master
Gerrit-Owner: Adam Litke
Gerrit-Reviewer: Adam Litke
Gerrit-Reviewer: Jenkins CI
Gerrit-Reviewer: Nir Soffer
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]: sudoers: remove unused iscsid policies
automat...@ovirt.org has posted comments on this change. Change subject: sudoers: remove unused iscsid policies .. Patch Set 3: * Update tracker::IGNORE, no Bug-Url found * Check Bug-Url::WARN, no bug url found, make sure header matches 'Bug-Url: ' and is a valid url. * Check merged to previous::IGNORE, Not in stable branch (['ovirt-3.5', 'ovirt-3.4', 'ovirt-3.3']) -- To view, visit https://gerrit.ovirt.org/44504 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: I61442dd6d581a3f701cf8c49e082f9316f22a4ba Gerrit-PatchSet: 3 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Yeela Kaplan Gerrit-Reviewer: Dan Kenigsberg Gerrit-Reviewer: Jenkins CI Gerrit-Reviewer: Yaniv Bronhaim 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: Add module to get info about the platform
automat...@ovirt.org has posted comments on this change. Change subject: hwinfo: Add module to get info about the platform .. Patch Set 2: * Update tracker::IGNORE, no Bug-Url found * Check Bug-Url::WARN, no bug url found, make sure header matches 'Bug-Url: ' and is a valid url. * Check merged to previous::IGNORE, Not in stable branch (['ovirt-3.5', 'ovirt-3.4', 'ovirt-3.3']) -- To view, visit https://gerrit.ovirt.org/44599 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: I1a221f3f357038a3e1c6181d1abb53f4ad09c826 Gerrit-PatchSet: 2 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Dima Kuznetsov Gerrit-Reviewer: Dan Kenigsberg Gerrit-Reviewer: Jenkins CI Gerrit-Reviewer: Yaniv Bronhaim Gerrit-Reviewer: Yeela Kaplan 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: Move supervdsm module into lib
automat...@ovirt.org has posted comments on this change. Change subject: supervdsm: Move supervdsm module into lib .. Patch Set 2: * Update tracker::IGNORE, no Bug-Url found * Check Bug-Url::WARN, no bug url found, make sure header matches 'Bug-Url: ' and is a valid url. * Check merged to previous::IGNORE, Not in stable branch (['ovirt-3.5', 'ovirt-3.4', 'ovirt-3.3']) -- 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 Gerrit-Reviewer: Dan Kenigsberg Gerrit-Reviewer: Jenkins CI Gerrit-Reviewer: Yaniv Bronhaim Gerrit-Reviewer: Yeela Kaplan 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.
automat...@ovirt.org has posted comments on this change. Change subject: supervdsm: Decorators for supervdsm proxy calls. .. Patch Set 2: * Update tracker::IGNORE, no Bug-Url found * Check Bug-Url::WARN, no bug url found, make sure header matches 'Bug-Url: ' and is a valid url. * Check merged to previous::IGNORE, Not in stable branch (['ovirt-3.5', 'ovirt-3.4', 'ovirt-3.3']) -- 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 Gerrit-Reviewer: Dan Kenigsberg Gerrit-Reviewer: Jenkins CI Gerrit-Reviewer: Yaniv Bronhaim Gerrit-Reviewer: Yeela Kaplan 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
automat...@ovirt.org has posted comments on this change. Change subject: hwinfo: Move calls from utils to hwinfo .. Patch Set 2: * Update tracker::IGNORE, no Bug-Url found * Check Bug-Url::WARN, no bug url found, make sure header matches 'Bug-Url: ' and is a valid url. * Check merged to previous::IGNORE, Not in stable branch (['ovirt-3.5', 'ovirt-3.4', 'ovirt-3.3']) -- To view, visit https://gerrit.ovirt.org/44600 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: I0b949b34d0dfbadc9d91cd957edde10ce437e6d4 Gerrit-PatchSet: 2 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Dima Kuznetsov Gerrit-Reviewer: Dan Kenigsberg Gerrit-Reviewer: Jenkins CI Gerrit-Reviewer: Yaniv Bronhaim Gerrit-Reviewer: Yeela Kaplan 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
automat...@ovirt.org has posted comments on this change. Change subject: hwinfo: Move calls from utils to hwinfo .. Patch Set 1: * Update tracker::IGNORE, no Bug-Url found * Check Bug-Url::WARN, no bug url found, make sure header matches 'Bug-Url: ' and is a valid url. * Check merged to previous::IGNORE, Not in stable branch (['ovirt-3.5', 'ovirt-3.4', 'ovirt-3.3']) -- To view, visit https://gerrit.ovirt.org/44600 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: I0b949b34d0dfbadc9d91cd957edde10ce437e6d4 Gerrit-PatchSet: 1 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Dima Kuznetsov 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: Move supervdsm module into lib
automat...@ovirt.org has posted comments on this change. Change subject: supervdsm: Move supervdsm module into lib .. Patch Set 1: * Update tracker::IGNORE, no Bug-Url found * Check Bug-Url::WARN, no bug url found, make sure header matches 'Bug-Url: ' and is a valid url. * Check merged to previous::IGNORE, Not in stable branch (['ovirt-3.5', 'ovirt-3.4', 'ovirt-3.3']) -- 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: 1 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Dima Kuznetsov 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: Add module to get info about the platform
automat...@ovirt.org has posted comments on this change. Change subject: hwinfo: Add module to get info about the platform .. Patch Set 1: * Update tracker::IGNORE, no Bug-Url found * Check Bug-Url::WARN, no bug url found, make sure header matches 'Bug-Url: ' and is a valid url. * Check merged to previous::IGNORE, Not in stable branch (['ovirt-3.5', 'ovirt-3.4', 'ovirt-3.3']) -- To view, visit https://gerrit.ovirt.org/44599 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: I1a221f3f357038a3e1c6181d1abb53f4ad09c826 Gerrit-PatchSet: 1 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Dima Kuznetsov 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: 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
---
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 01e22fe..133a06d 100644
---
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
---
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', fake.Connec
Change in vdsm[master]: supervdsm: Decorators for supervdsm proxy calls.
automat...@ovirt.org has posted comments on this change. Change subject: supervdsm: Decorators for supervdsm proxy calls. .. Patch Set 1: * Update tracker::IGNORE, no Bug-Url found * Check Bug-Url::WARN, no bug url found, make sure header matches 'Bug-Url: ' and is a valid url. * Check merged to previous::IGNORE, Not in stable branch (['ovirt-3.5', 'ovirt-3.4', 'ovirt-3.3']) -- 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: 1 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Dima Kuznetsov 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: 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
---
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
___
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 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 --- 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 ___ vdsm-patches mailing list vdsm-patches@lists.fedorahosted.org https://lists.fedorahosted.org/mailman/listinfo/vdsm-patches
Change in vdsm[master]: gluster: Report glusterfs-cli package details
Nir Soffer has posted comments on this change. Change subject: gluster: Report glusterfs-cli package details .. Patch Set 2: (1 comment) https://gerrit.ovirt.org/#/c/44581/2/vdsm/caps.py File vdsm/caps.py: Line 789 Line 790 Line 791 Line 792 Line 793 gluster-cli should also appear here for debian support. -- To view, visit https://gerrit.ovirt.org/44581 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: Id66bb578e56bdf5dc70759f62c1a1b68cd91d586 Gerrit-PatchSet: 2 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Ala Hino Gerrit-Reviewer: Ala Hino Gerrit-Reviewer: Allon Mureinik Gerrit-Reviewer: Jenkins CI Gerrit-Reviewer: Nir Soffer 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]: mount: Perform mount and umount in supervdsm
Nir Soffer 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 a Not clear how are you going to avoid the method and the function. supervdsm must call a module function, and the mount/umount methods belong to the Mount object. We can replace explicit check for geteuid with some decorator/helper though. Feel free to send another patch adding this utility. 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 Not sure what do you mean, but we certainly do not care about speed here. Show me a profile of real world usage with this function on the top of the profile and we can talk about optimization. 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 Gerrit-Reviewer: Adam Litke Gerrit-Reviewer: Allon Mureinik Gerrit-Reviewer: Dan Kenigsberg Gerrit-Reviewer: Dima Kuznetsov Gerrit-Reviewer: Federico Simoncelli Gerrit-Reviewer: Jenkins CI Gerrit-Reviewer: Nir Soffer Gerrit-Reviewer: Yaniv Bronhaim 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]: net: create bond properly during start_devices
Ido Barkan has uploaded a new change for review.
Change subject: net: create bond properly during start_devices
..
net: create bond properly during start_devices
This methof, that is used during networks rollback, calls ifup on
all ifcfg files it knows of however, to ifup a bond, one needs to
manually create it first, by writing '+bondingName' into
/sys/class/net/bonding_masters . Ifcfg configurators already does
so when creating bonds. Skipping this step causes ifup to fail and
complain: 'Device bond11 does not seem to be present, delaying
initialization.'
This also fixes
testSetupNetworksEmergencyDevicesCleanupBondOverwrite which is
almost never run because it is a slow test.
Change-Id: Ic48f3e8b51e4e7e8668902a785c7c271ada03df6
Signed-off-by: Ido Barkan
---
M vdsm/network/configurators/ifcfg.py
1 file changed, 18 insertions(+), 1 deletion(-)
git pull ssh://gerrit.ovirt.org:29418/vdsm refs/changes/87/44587/1
diff --git a/vdsm/network/configurators/ifcfg.py
b/vdsm/network/configurators/ifcfg.py
index e1cb96d..84d6df7 100644
--- a/vdsm/network/configurators/ifcfg.py
+++ b/vdsm/network/configurators/ifcfg.py
@@ -464,7 +464,7 @@
self.restoreAtomicNetworkBackup()
self.restoreAtomicBackup()
-start_devices(self._backups.iterkeys())
+start_devices(self._backups.keys())
@classmethod
def clearBackups(cls):
@@ -704,12 +704,29 @@
def start_devices(device_ifcfgs):
for dev in _sort_device_ifcfgs(device_ifcfgs):
try:
+if _ifcfg_defines_bonding(dev, device_ifcfgs):
+with open(netinfo.BONDING_MASTERS, 'w') as bondingMasters:
+bondingMasters.write('+%s\n' % dev)
_exec_ifup(dev)
except ConfigNetworkError:
logging.error('Failed to ifup device %s during rollback.', dev,
exc_info=True)
+def _ifcfg_defines_bonding(device_name, all_device_ifcfgs):
+for ifcfg in all_device_ifcfgs:
+if ifcfg.endswith('ifcfg-%s' % device_name):
+try:
+with open(ifcfg) as f:
+return bool(re.search('^BONDING_OPTS=', f.read(),
+ re.MULTILINE))
+except IOError as e:
+if e.errno == os.errno.ENOENT:
+continue
+else:
+raise
+
+
def _sort_device_ifcfgs(device_ifcfgs):
devices = {'Bridge': [],
'Vlan': [],
--
To view, visit https://gerrit.ovirt.org/44587
To unsubscribe, visit https://gerrit.ovirt.org/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ic48f3e8b51e4e7e8668902a785c7c271ada03df6
Gerrit-PatchSet: 1
Gerrit-Project: vdsm
Gerrit-Branch: master
Gerrit-Owner: Ido Barkan
___
vdsm-patches mailing list
vdsm-patches@lists.fedorahosted.org
https://lists.fedorahosted.org/mailman/listinfo/vdsm-patches
Change in vdsm[master]: net: create bond properly during start_devices
automat...@ovirt.org has posted comments on this change. Change subject: net: create bond properly during start_devices .. Patch Set 1: * Update tracker::IGNORE, no Bug-Url found * Check Bug-Url::WARN, no bug url found, make sure header matches 'Bug-Url: ' and is a valid url. * Check merged to previous::IGNORE, Not in stable branch (['ovirt-3.5', 'ovirt-3.4', 'ovirt-3.3']) -- To view, visit https://gerrit.ovirt.org/44587 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: Ic48f3e8b51e4e7e8668902a785c7c271ada03df6 Gerrit-PatchSet: 1 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Ido Barkan 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]: gluster: Report glusterfs-cli package details
Allon Mureinik has posted comments on this change.
Change subject: gluster: Report glusterfs-cli package details
..
Patch Set 2: Code-Review+1
(1 comment)
https://gerrit.ovirt.org/#/c/44581/2/vdsm/caps.py
File vdsm/caps.py:
Line 762: 'spice-server': ('spice-server',),
Line 763: 'libvirt': ('libvirt', 'libvirt-daemon-kvm'),
Line 764: 'mom': ('mom',),
Line 765: 'librbd1': ('librbd1',),
Line 766: 'glusterfs-cli': ('glusterfs-cli',),
This needs to be here if we don't have vdsm-gluster installed, but it isn't
obvious at fist glance.
Perhaps it's worth while adding a comment to clarify this.
Line 767: }
Line 768:
Line 769: if _glusterEnabled:
Line 770: KEY_PACKAGES.update(GLUSTER_RPM_PACKAGES)
--
To view, visit https://gerrit.ovirt.org/44581
To unsubscribe, visit https://gerrit.ovirt.org/settings
Gerrit-MessageType: comment
Gerrit-Change-Id: Id66bb578e56bdf5dc70759f62c1a1b68cd91d586
Gerrit-PatchSet: 2
Gerrit-Project: vdsm
Gerrit-Branch: master
Gerrit-Owner: Ala Hino
Gerrit-Reviewer: Ala Hino
Gerrit-Reviewer: Allon Mureinik
Gerrit-Reviewer: Jenkins CI
Gerrit-Reviewer: Nir Soffer
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]: gluster: Report glusterfs-cli package details
automat...@ovirt.org has posted comments on this change. Change subject: gluster: Report glusterfs-cli package details .. Patch Set 2: * Update tracker::#1183318::OK * Check Bug-Url::OK * Check Public Bug::#1183318::OK, public bug * Check Product::#1183318::OK, Correct product oVirt * Check TR::SKIP, not in a monitored branch (ovirt-3.5 ovirt-3.4 ovirt-3.3 ovirt-3.2) * Check merged to previous::IGNORE, Not in stable branch (['ovirt-3.5', 'ovirt-3.4', 'ovirt-3.3']) -- To view, visit https://gerrit.ovirt.org/44581 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: Id66bb578e56bdf5dc70759f62c1a1b68cd91d586 Gerrit-PatchSet: 2 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Ala Hino Gerrit-Reviewer: Ala Hino Gerrit-Reviewer: Allon Mureinik Gerrit-Reviewer: Jenkins CI Gerrit-Reviewer: Nir Soffer 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: (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 Gerrit-Reviewer: Adam Litke Gerrit-Reviewer: Allon Mureinik Gerrit-Reviewer: Dan Kenigsberg Gerrit-Reviewer: Dima Kuznetsov Gerrit-Reviewer: Federico Simoncelli Gerrit-Reviewer: Jenkins CI Gerrit-Reviewer: Nir Soffer Gerrit-Reviewer: Yaniv Bronhaim 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
