Change in vdsm[ovirt-3.5]: gluster: Modification of logic for volume capacity calculation.
by dnarayan＠redhat.com
Hello Dan Kenigsberg, Sahina Bose,
I'd like you to do a code review. Please visit
http://gerrit.ovirt.org/31604
to review the following change.
Change subject: gluster: Modification of logic for volume capacity calculation.
......................................................................
gluster: Modification of logic for volume capacity calculation.
This patch modifies the logic for gluster volume capacity
computation. Earlier the volume capacity was calculated
wrt non root user. Now logic is modified to calculate
volume capacity wrt root user.
Change-Id: I044e37699d60d1eed2f95eb65189d949c5e4b594
Bug-Url: https://bugzilla.redhat.com/show_bug.cgi?id=1129619
Signed-off-by: ndarshan <dnarayan(a)redhat.com>
Reviewed-on: http://gerrit.ovirt.org/31451
Reviewed-by: Sahina Bose <sabose(a)redhat.com>
Reviewed-by: Dan Kenigsberg <danken(a)redhat.com>
---
M vdsm/gluster/api.py
1 file changed, 2 insertions(+), 2 deletions(-)
git pull ssh://gerrit.ovirt.org:29418/vdsm refs/changes/04/31604/1
diff --git a/vdsm/gluster/api.py b/vdsm/gluster/api.py
index 0e6c850..b9a08e5 100644
--- a/vdsm/gluster/api.py
+++ b/vdsm/gluster/api.py
@@ -205,8 +205,8 @@
replicaCount)
def _computeVolumeStats(self, data):
- total = (data.f_blocks - (data.f_bfree - data.f_bavail)) * data.f_bsize
- free = data.f_bavail * data.f_bsize
+ total = data.f_blocks * data.f_bsize
+ free = data.f_bfree * data.f_bsize
used = total - free
return {'sizeTotal': str(total),
'sizeFree': str(free),
--
To view, visit http://gerrit.ovirt.org/31604
To unsubscribe, visit http://gerrit.ovirt.org/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I044e37699d60d1eed2f95eb65189d949c5e4b594
Gerrit-PatchSet: 1
Gerrit-Project: vdsm
Gerrit-Branch: ovirt-3.5
Gerrit-Owner: Darshan N <dnarayan(a)redhat.com>
Gerrit-Reviewer: Dan Kenigsberg <danken(a)redhat.com>
Gerrit-Reviewer: Sahina Bose <sabose(a)redhat.com>
9 years, 7 months
Change in vdsm[ovirt-3.5]: Force flag not optional for detach storage domain
by Dan Kenigsberg
Dan Kenigsberg has submitted this change and it was merged.
Change subject: Force flag not optional for detach storage domain
......................................................................
Force flag not optional for detach storage domain
Default value of force flag for detach sd not set but it should be
optional according to schema.
Bug-Url: https://bugzilla.redhat.com/1134290
Change-Id: Ia0b7b34464ec83bbf408df61c0193cd17e193e00
Signed-off-by: pkliczewski <piotr.kliczewski(a)gmail.com>
Reviewed-on: http://gerrit.ovirt.org/32219
Reviewed-by: Oved Ourfali <oourfali(a)redhat.com>
Reviewed-by: Allon Mureinik <amureini(a)redhat.com>
Reviewed-by: Dan Kenigsberg <danken(a)redhat.com>
---
M vdsm/API.py
1 file changed, 1 insertion(+), 1 deletion(-)
Approvals:
Piotr Kliczewski: Verified
Allon Mureinik: Looks good to me, but someone else must approve
Dan Kenigsberg: Looks good to me, approved
Oved Ourfali: Looks good to me, but someone else must approve
--
To view, visit http://gerrit.ovirt.org/32219
To unsubscribe, visit http://gerrit.ovirt.org/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Ia0b7b34464ec83bbf408df61c0193cd17e193e00
Gerrit-PatchSet: 2
Gerrit-Project: vdsm
Gerrit-Branch: ovirt-3.5
Gerrit-Owner: Piotr Kliczewski <piotr.kliczewski(a)gmail.com>
Gerrit-Reviewer: Allon Mureinik <amureini(a)redhat.com>
Gerrit-Reviewer: Barak Azulay <bazulay(a)redhat.com>
Gerrit-Reviewer: Dan Kenigsberg <danken(a)redhat.com>
Gerrit-Reviewer: Oved Ourfali <oourfali(a)redhat.com>
Gerrit-Reviewer: Piotr Kliczewski <piotr.kliczewski(a)gmail.com>
Gerrit-Reviewer: Saggi Mizrahi <smizrahi(a)redhat.com>
Gerrit-Reviewer: Yaniv Bronhaim <ybronhei(a)redhat.com>
Gerrit-Reviewer: automation(a)ovirt.org
9 years, 7 months
Change in vdsm[ovirt-3.5]: Force flag not optional for detach storage domain
by Dan Kenigsberg
Dan Kenigsberg has posted comments on this change.
Change subject: Force flag not optional for detach storage domain
......................................................................
Patch Set 1: Code-Review+2
Yaniv is on a different time zone, taking this patch myself.
--
To view, visit http://gerrit.ovirt.org/32219
To unsubscribe, visit http://gerrit.ovirt.org/settings
Gerrit-MessageType: comment
Gerrit-Change-Id: Ia0b7b34464ec83bbf408df61c0193cd17e193e00
Gerrit-PatchSet: 1
Gerrit-Project: vdsm
Gerrit-Branch: ovirt-3.5
Gerrit-Owner: Piotr Kliczewski <piotr.kliczewski(a)gmail.com>
Gerrit-Reviewer: Allon Mureinik <amureini(a)redhat.com>
Gerrit-Reviewer: Barak Azulay <bazulay(a)redhat.com>
Gerrit-Reviewer: Dan Kenigsberg <danken(a)redhat.com>
Gerrit-Reviewer: Oved Ourfali <oourfali(a)redhat.com>
Gerrit-Reviewer: Piotr Kliczewski <piotr.kliczewski(a)gmail.com>
Gerrit-Reviewer: Saggi Mizrahi <smizrahi(a)redhat.com>
Gerrit-Reviewer: Yaniv Bronhaim <ybronhei(a)redhat.com>
Gerrit-Reviewer: automation(a)ovirt.org
Gerrit-HasComments: No
9 years, 7 months
Change in vdsm[ovirt-3.5]: Force flag not optional for detach storage domain
by Allon Mureinik
Allon Mureinik has posted comments on this change.
Change subject: Force flag not optional for detach storage domain
......................................................................
Patch Set 1: Code-Review+1
--
To view, visit http://gerrit.ovirt.org/32219
To unsubscribe, visit http://gerrit.ovirt.org/settings
Gerrit-MessageType: comment
Gerrit-Change-Id: Ia0b7b34464ec83bbf408df61c0193cd17e193e00
Gerrit-PatchSet: 1
Gerrit-Project: vdsm
Gerrit-Branch: ovirt-3.5
Gerrit-Owner: Piotr Kliczewski <piotr.kliczewski(a)gmail.com>
Gerrit-Reviewer: Allon Mureinik <amureini(a)redhat.com>
Gerrit-Reviewer: Barak Azulay <bazulay(a)redhat.com>
Gerrit-Reviewer: Dan Kenigsberg <danken(a)redhat.com>
Gerrit-Reviewer: Oved Ourfali <oourfali(a)redhat.com>
Gerrit-Reviewer: Piotr Kliczewski <piotr.kliczewski(a)gmail.com>
Gerrit-Reviewer: Saggi Mizrahi <smizrahi(a)redhat.com>
Gerrit-Reviewer: Yaniv Bronhaim <ybronhei(a)redhat.com>
Gerrit-Reviewer: automation(a)ovirt.org
Gerrit-HasComments: No
9 years, 7 months
Change in vdsm[ovirt-3.5]: spec: Only build x86_64 and ppc64 architectures
by Vinzenz Feenstra
Vinzenz Feenstra has uploaded a new change for review.
Change subject: spec: Only build x86_64 and ppc64 architectures
......................................................................
spec: Only build x86_64 and ppc64 architectures
We're not supporting any other architectures than x86_64 and ppc64
at the moment. This patch restricts the rpm builds to those
architectures.
Change-Id: Iab30dd4eba6fd068e9605312bfc1c90b03b01564
Signed-off-by: Vinzenz Feenstra <vfeenstr(a)redhat.com>
Reviewed-on: http://gerrit.ovirt.org/32125
Reviewed-by: Dan Kenigsberg <danken(a)redhat.com>
Tested-by: Michal Skrivanek <michal.skrivanek(a)redhat.com>
(cherry picked from commit 565bb6cba89af6278e3d4e5ae03884d36a2d803e)
---
M vdsm.spec.in
1 file changed, 1 insertion(+), 0 deletions(-)
git pull ssh://gerrit.ovirt.org:29418/vdsm refs/changes/52/32152/1
diff --git a/vdsm.spec.in b/vdsm.spec.in
index ecac369..a25389e 100644
--- a/vdsm.spec.in
+++ b/vdsm.spec.in
@@ -61,6 +61,7 @@
Source0: %{vdsm_name}-%{version}.tar.gz
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+ExclusiveArch: x86_64 ppc64
BuildRequires: gcc
BuildRequires: python
BuildRequires: python-devel
--
To view, visit http://gerrit.ovirt.org/32152
To unsubscribe, visit http://gerrit.ovirt.org/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Iab30dd4eba6fd068e9605312bfc1c90b03b01564
Gerrit-PatchSet: 1
Gerrit-Project: vdsm
Gerrit-Branch: ovirt-3.5
Gerrit-Owner: Vinzenz Feenstra <vfeenstr(a)redhat.com>
9 years, 7 months
Change in vdsm[ovirt-3.5]: Force flag not optional for detach storage domain
by Oved Ourfali
Oved Ourfali has posted comments on this change.
Change subject: Force flag not optional for detach storage domain
......................................................................
Patch Set 1: Code-Review+1
--
To view, visit http://gerrit.ovirt.org/32219
To unsubscribe, visit http://gerrit.ovirt.org/settings
Gerrit-MessageType: comment
Gerrit-Change-Id: Ia0b7b34464ec83bbf408df61c0193cd17e193e00
Gerrit-PatchSet: 1
Gerrit-Project: vdsm
Gerrit-Branch: ovirt-3.5
Gerrit-Owner: Piotr Kliczewski <piotr.kliczewski(a)gmail.com>
Gerrit-Reviewer: Allon Mureinik <amureini(a)redhat.com>
Gerrit-Reviewer: Barak Azulay <bazulay(a)redhat.com>
Gerrit-Reviewer: Dan Kenigsberg <danken(a)redhat.com>
Gerrit-Reviewer: Oved Ourfali <oourfali(a)redhat.com>
Gerrit-Reviewer: Piotr Kliczewski <piotr.kliczewski(a)gmail.com>
Gerrit-Reviewer: Saggi Mizrahi <smizrahi(a)redhat.com>
Gerrit-Reviewer: automation(a)ovirt.org
Gerrit-HasComments: No
9 years, 7 months
Change in vdsm[ovirt-3.5]: el6_tests: fix toolTests to use VdsmTestCase so that assertI...
by mtayer＠redhat.com
Hello Yaniv Bronhaim, Antoni Segura Puimedon, Dan Kenigsberg,
I'd like you to do a code review. Please visit
http://gerrit.ovirt.org/32103
to review the following change.
Change subject: el6_tests: fix toolTests to use VdsmTestCase so that assertIn is available
......................................................................
el6_tests: fix toolTests to use VdsmTestCase so that assertIn is available
Change-Id: Ibb564320db9db1b3349c7fbb87bc63a8a044c6b2
Bug-Url: https://bugzilla.redhat.com/show_bug.cgi?id=1132677
Signed-off-by: Antoni S. Puimedon <asegurap(a)redhat.com>
Reviewed-on: http://gerrit.ovirt.org/31968
Reviewed-by: Yaniv Bronhaim <ybronhei(a)redhat.com>
Reviewed-by: Dan Kenigsberg <danken(a)redhat.com>
---
M tests/toolTests.py
1 file changed, 2 insertions(+), 1 deletion(-)
git pull ssh://gerrit.ovirt.org:29418/vdsm refs/changes/03/32103/1
diff --git a/tests/toolTests.py b/tests/toolTests.py
index 53ddeba..8e20c71 100644
--- a/tests/toolTests.py
+++ b/tests/toolTests.py
@@ -28,6 +28,7 @@
from vdsm.tool import upgrade
from vdsm import utils
import monkeypatch
+from testlib import VdsmTestCase
from unittest import TestCase
import tempfile
import os
@@ -52,7 +53,7 @@
return self._dependencies
-class ConfiguratorTests(TestCase):
+class ConfiguratorTests(VdsmTestCase):
@monkeypatch.MonkeyPatch(
configurator,
--
To view, visit http://gerrit.ovirt.org/32103
To unsubscribe, visit http://gerrit.ovirt.org/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ibb564320db9db1b3349c7fbb87bc63a8a044c6b2
Gerrit-PatchSet: 1
Gerrit-Project: vdsm
Gerrit-Branch: ovirt-3.5
Gerrit-Owner: mooli tayer <mtayer(a)redhat.com>
Gerrit-Reviewer: Antoni Segura Puimedon <asegurap(a)redhat.com>
Gerrit-Reviewer: Dan Kenigsberg <danken(a)redhat.com>
Gerrit-Reviewer: Yaniv Bronhaim <ybronhei(a)redhat.com>
9 years, 7 months
Change in vdsm[ovirt-3.5]: tests: Fix Python 2.6 compatibility
by mtayer＠redhat.com
Hello Nir Soffer, Dan Kenigsberg,
I'd like you to do a code review. Please visit
http://gerrit.ovirt.org/32102
to review the following change.
Change subject: tests: Fix Python 2.6 compatibility
......................................................................
tests: Fix Python 2.6 compatibility
Recent tests use set comprehension which is available only in Python
2.7, failing builds on EL machines.
Change-Id: Idf684f2dbee3a024d90d7d9fd7378636fad2ea8d
Bug-Url: https://bugzilla.redhat.com/show_bug.cgi?id=1132677
Signed-off-by: Nir Soffer <nsoffer(a)redhat.com>
Reviewed-on: http://gerrit.ovirt.org/31785
Reviewed-by: Dan Kenigsberg <danken(a)redhat.com>
---
M tests/toolTests.py
1 file changed, 7 insertions(+), 7 deletions(-)
git pull ssh://gerrit.ovirt.org:29418/vdsm refs/changes/02/32102/1
diff --git a/tests/toolTests.py b/tests/toolTests.py
index f80c97e..53ddeba 100644
--- a/tests/toolTests.py
+++ b/tests/toolTests.py
@@ -58,8 +58,8 @@
configurator,
'_getConfigurers',
lambda: {
- 'a': MockModuleConfigurator('a', set('b')),
- 'b': MockModuleConfigurator('b', set('a'))
+ 'a': MockModuleConfigurator('a', set(['b'])),
+ 'b': MockModuleConfigurator('b', set(['a']))
}
)
def testDependencyCircle(self):
@@ -73,10 +73,10 @@
configurator,
'_getConfigurers',
lambda: {
- 'a': MockModuleConfigurator('a', {'b', 'd'}),
- 'b': MockModuleConfigurator('b', {'c'}),
- 'c': MockModuleConfigurator('c', {'e', 'd'}),
- 'd': MockModuleConfigurator('d', {'e', 'e'}),
+ 'a': MockModuleConfigurator('a', set(['b', 'd'])),
+ 'b': MockModuleConfigurator('b', set(['c'])),
+ 'c': MockModuleConfigurator('c', set(['e', 'd'])),
+ 'd': MockModuleConfigurator('d', set(['e', 'e'])),
'e': MockModuleConfigurator('e', set()),
'f': MockModuleConfigurator('f', set()),
@@ -107,7 +107,7 @@
configurator,
'_getConfigurers',
lambda: {
- 'a': MockModuleConfigurator('a', {'b', 'c'}),
+ 'a': MockModuleConfigurator('a', set(['b', 'c'])),
'b': MockModuleConfigurator('b', set()),
'c': MockModuleConfigurator('c', set())
}
--
To view, visit http://gerrit.ovirt.org/32102
To unsubscribe, visit http://gerrit.ovirt.org/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Idf684f2dbee3a024d90d7d9fd7378636fad2ea8d
Gerrit-PatchSet: 1
Gerrit-Project: vdsm
Gerrit-Branch: ovirt-3.5
Gerrit-Owner: mooli tayer <mtayer(a)redhat.com>
Gerrit-Reviewer: Dan Kenigsberg <danken(a)redhat.com>
Gerrit-Reviewer: Nir Soffer <nsoffer(a)redhat.com>
9 years, 7 months
Change in vdsm[ovirt-3.5]: configfile: sort dict items inserted to config files for con...
by mtayer＠redhat.com
Hello Nir Soffer, Ondřej Svoboda, Dima Kuznetsov, Dan Kenigsberg, Francesco Romani,
I'd like you to do a code review. Please visit
http://gerrit.ovirt.org/32062
to review the following change.
Change subject: configfile: sort dict items inserted to config files for consistency.
......................................................................
configfile: sort dict items inserted to config files for consistency.
See comment one at bug.
Change-Id: I7705b046d993cc08eac6b09a6ebba34bd8986620
Bug-Url: https://bugzilla.redhat.com/show_bug.cgi?id=1127877
Signed-off-by: Mooli Tayer <mtayer(a)redhat.com>
Reviewed-on: http://gerrit.ovirt.org/31289
Reviewed-by: Nir Soffer <nsoffer(a)redhat.com>
Reviewed-by: Ondřej Svoboda <osvoboda(a)redhat.com>
Reviewed-by: Francesco Romani <fromani(a)redhat.com>
Reviewed-by: Dima Kuznetsov <dkuznets(a)redhat.com>
Reviewed-by: Dan Kenigsberg <danken(a)redhat.com>
---
M lib/vdsm/tool/configurators/configfile.py
M tests/toolTests.py
2 files changed, 20 insertions(+), 1 deletion(-)
git pull ssh://gerrit.ovirt.org:29418/vdsm refs/changes/62/32062/1
diff --git a/lib/vdsm/tool/configurators/configfile.py b/lib/vdsm/tool/configurators/configfile.py
index d297a5c..62b99b1 100644
--- a/lib/vdsm/tool/configurators/configfile.py
+++ b/lib/vdsm/tool/configurators/configfile.py
@@ -159,7 +159,7 @@
def _writeEntries(self, f, oldentries):
f.write(self._start())
- for key, val in self._entries.iteritems():
+ for key, val in sorted(self._entries.items()):
if key not in oldentries:
f.write("{k}={v}\n".format(k=key, v=val))
f.write(self._end())
diff --git a/tests/toolTests.py b/tests/toolTests.py
index 88e249f..f80c97e 100644
--- a/tests/toolTests.py
+++ b/tests/toolTests.py
@@ -350,6 +350,25 @@
"key3=val3\n"
"# end conf-3.4.4\n")
+ def testSort(self):
+ self._writeConf("")
+ with ConfigFile(self.tname,
+ version='3.4.4',
+ sectionStart="# start conf",
+ sectionEnd="# end conf") as conf:
+ conf.addEntry("key3", "val")
+ conf.addEntry("key2", "val")
+ conf.addEntry("key1", "val")
+ conf.addEntry("key4", "val")
+
+ with open(self.tname, 'r') as f:
+ self.assertEqual(f.read(), "# start conf-3.4.4\n"
+ "key1=val\n"
+ "key2=val\n"
+ "key3=val\n"
+ "key4=val\n"
+ "# end conf-3.4.4\n")
+
def testPrefixAndPrepend(self):
self._writeConf("/var/log/libvirt/libvirtd.log {\n"
" weekly\n"
--
To view, visit http://gerrit.ovirt.org/32062
To unsubscribe, visit http://gerrit.ovirt.org/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I7705b046d993cc08eac6b09a6ebba34bd8986620
Gerrit-PatchSet: 1
Gerrit-Project: vdsm
Gerrit-Branch: ovirt-3.5
Gerrit-Owner: mooli tayer <mtayer(a)redhat.com>
Gerrit-Reviewer: Dan Kenigsberg <danken(a)redhat.com>
Gerrit-Reviewer: Dima Kuznetsov <dkuznets(a)redhat.com>
Gerrit-Reviewer: Francesco Romani <fromani(a)redhat.com>
Gerrit-Reviewer: Nir Soffer <nsoffer(a)redhat.com>
Gerrit-Reviewer: Ondřej Svoboda <osvoboda(a)redhat.com>
9 years, 7 months
Change in vdsm[ovirt-3.5]: tool: Fix TypeError when configuration check fails
by mtayer＠redhat.com
Hello Nir Soffer, Yaniv Bronhaim, Dan Kenigsberg,
I'd like you to do a code review. Please visit
http://gerrit.ovirt.org/32061
to review the following change.
Change subject: tool: Fix TypeError when configuration check fails
......................................................................
tool: Fix TypeError when configuration check fails
When is-configured and validate-config failed for some modules, we got a
TypeError trying to join a list of configurator objects, instead of list
of strings.
TypeError: sequence item 0: expected string, Sanlock found
Change-Id: Ic2fde1ddbbb9584429a4c190d38a2817e5a6dfb1
Bug-Url: https://bugzilla.redhat.com/show_bug.cgi?id=1132677
Signed-off-by: Nir Soffer <nsoffer(a)redhat.com>
Reviewed-on: http://gerrit.ovirt.org/31782
Reviewed-by: Yaniv Bronhaim <ybronhei(a)redhat.com>
Reviewed-by: mooli tayer <mtayer(a)redhat.com>
Reviewed-by: Dan Kenigsberg <danken(a)redhat.com>
---
M lib/vdsm/tool/configurator.py
1 file changed, 3 insertions(+), 2 deletions(-)
git pull ssh://gerrit.ovirt.org:29418/vdsm refs/changes/61/32061/1
diff --git a/lib/vdsm/tool/configurator.py b/lib/vdsm/tool/configurator.py
index b799fde..83e7d41 100644
--- a/lib/vdsm/tool/configurator.py
+++ b/lib/vdsm/tool/configurator.py
@@ -97,7 +97,8 @@
ret = True
args = _parse_args(*args)
- m = [c for c in args.modules if c.isconfigured() == NOT_CONFIGURED]
+ m = [c.getName() for c in args.modules
+ if c.isconfigured() == NOT_CONFIGURED]
if m:
sys.stdout.write(
@@ -131,7 +132,7 @@
ret = True
args = _parse_args(*args)
- m = [c for c in args.modules if not c.validate()]
+ m = [c.getName() for c in args.modules if not c.validate()]
if m:
sys.stdout.write(
--
To view, visit http://gerrit.ovirt.org/32061
To unsubscribe, visit http://gerrit.ovirt.org/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ic2fde1ddbbb9584429a4c190d38a2817e5a6dfb1
Gerrit-PatchSet: 1
Gerrit-Project: vdsm
Gerrit-Branch: ovirt-3.5
Gerrit-Owner: mooli tayer <mtayer(a)redhat.com>
Gerrit-Reviewer: Dan Kenigsberg <danken(a)redhat.com>
Gerrit-Reviewer: Nir Soffer <nsoffer(a)redhat.com>
Gerrit-Reviewer: Yaniv Bronhaim <ybronhei(a)redhat.com>
9 years, 7 months