Change in vdsm[master]: vdsm: fix RTC offset
by peet@redhat.com
Peter V. Saveliev has uploaded a new change for review.
Change subject: vdsm: fix RTC offset
......................................................................
vdsm: fix RTC offset
Upon RTC update (hwclock --systohc) on the guest side, libvirt sends the event
with RTC offset from the qemu start -rtc value in seconds. The received offset
should not replace the previous value, but should be added to it. Since the
time update event is relative to the qemu start time, we should store the
initial value and use it for the calculation.
Bug-Url: https://bugzilla.redhat.com/show_bug.cgi?id=956741
Change-Id: I27c70a53f64fb05607e93bffbac25fdee7d1cd2a
Signed-off-by: Peter V. Saveliev <peet(a)redhat.com>
---
M vdsm/vm.py
1 file changed, 4 insertions(+), 1 deletion(-)
git pull ssh://gerrit.ovirt.org:29418/vdsm refs/changes/50/14750/1
diff --git a/vdsm/vm.py b/vdsm/vm.py
index 2b76662..bbc833a 100644
--- a/vdsm/vm.py
+++ b/vdsm/vm.py
@@ -351,6 +351,7 @@
self.id = self.conf['vmId']
self._volPrepareLock = threading.Lock()
self._initTimePauseCode = None
+ self._initTimeRTC = None
self.guestAgent = None
self._guestEvent = 'Powering up'
self._guestEventTime = 0
@@ -852,7 +853,9 @@
def _rtcUpdate(self, timeOffset):
self.log.debug('new rtc offset %s', timeOffset)
with self._confLock:
- self.conf['timeOffset'] = timeOffset
+ if self._initTimeRTC is None:
+ self._initTimeRTC = long(self.conf['timeOffset'])
+ self.conf['timeOffset'] = self._initTimeRTC + long(timeOffset)
def extendDriveVolume(self, vmDrive):
if not vmDrive.blockDev:
--
To view, visit http://gerrit.ovirt.org/14750
To unsubscribe, visit http://gerrit.ovirt.org/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I27c70a53f64fb05607e93bffbac25fdee7d1cd2a
Gerrit-PatchSet: 1
Gerrit-Project: vdsm
Gerrit-Branch: master
Gerrit-Owner: Peter V. Saveliev <peet(a)redhat.com>
10 years, 3 months
Change in vdsm[master]: Teardown only VDSM images when power-off VM
by sgotliv@redhat.com
Sergey Gotliv has uploaded a new change for review.
Change subject: Teardown only VDSM images when power-off VM
......................................................................
Teardown only VDSM images when power-off VM
Trying to tear down a cdrom or external lun throws an exception which
creates a lot of log printings.
Change-Id: I041a306636c75a7aa37d4d7c0811366d80fe609c
Signed-off-by: Sergey Gotliv <sgotliv(a)redhat.com>
---
M vdsm/vm.py
1 file changed, 2 insertions(+), 1 deletion(-)
git pull ssh://gerrit.ovirt.org:29418/vdsm refs/changes/73/21973/1
diff --git a/vdsm/vm.py b/vdsm/vm.py
index ccdf950..3f6e615 100644
--- a/vdsm/vm.py
+++ b/vdsm/vm.py
@@ -2538,7 +2538,8 @@
# Skip any exception as we don't want to interrupt the
# teardown process for any reason.
try:
- self.cif.teardownVolumePath(drive)
+ if drive.isVdsmImage():
+ self.cif.teardownVolumePath(drive)
except:
self.log.error("Drive teardown failure for %s",
drive, exc_info=True)
--
To view, visit http://gerrit.ovirt.org/21973
To unsubscribe, visit http://gerrit.ovirt.org/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I041a306636c75a7aa37d4d7c0811366d80fe609c
Gerrit-PatchSet: 1
Gerrit-Project: vdsm
Gerrit-Branch: master
Gerrit-Owner: Sergey Gotliv <sgotliv(a)redhat.com>
10 years, 3 months
Change in vdsm[master]: Adding official_release global to spec
by ybronhei@redhat.com
Yaniv Bronhaim has uploaded a new change for review.
Change subject: Adding official_release global to spec
......................................................................
Adding official_release global to spec
When this global set to True, vdsm won't build packages that are in work
in progress state. This to avoid shipping unready packages in official
releases.
Change-Id: I7229fde2263d1add4c0e74aeb7d5d4e0694f3cda
Signed-off-by: Yaniv Bronhaim <ybronhei(a)redhat.com>
---
M vdsm.spec.in
1 file changed, 7 insertions(+), 0 deletions(-)
git pull ssh://gerrit.ovirt.org:29418/vdsm refs/changes/33/24033/1
diff --git a/vdsm.spec.in b/vdsm.spec.in
index d4ebc43..6d0cf53 100644
--- a/vdsm.spec.in
+++ b/vdsm.spec.in
@@ -42,6 +42,9 @@
%global with_tmpfiles_macro 1
%endif
+# when this global is 0 the build will include also wip (before ship) packages
+%global official_release 0
+
Name: %{vdsm_name}
Version: @PACKAGE_VERSION@
Release: @PACKAGE_RELEASE@%{?dist}%{?extra_release}
@@ -281,6 +284,7 @@
An XMLRPC interface for interacting with vdsmd. Primary control interface for
ovirt-engine and vdsClient.
+%if ! 0%{?official_release}
%package api
Summary: VDSM API definition
BuildArch: noarch
@@ -309,6 +313,7 @@
%description yajsonrpc
A JSON RPC server and client implementation.
+%endif
%package python-zombiereaper
Summary: Collects zombie processes automatically
@@ -1349,6 +1354,7 @@
%dir %{_datadir}/%{vdsm_name}
%{_datadir}/%{vdsm_name}/BindingXMLRPC.py*
+%if ! 0%{?official_release}
%files api
%doc vdsm_api/vdsm-api.html
%{_datadir}/%{vdsm_name}/vdsmapi-schema.json
@@ -1364,6 +1370,7 @@
%{python_sitelib}/yajsonrpc/asyncoreReactor.py*
%{python_sitelib}/yajsonrpc/protonReactor.py*
%{python_sitelib}/yajsonrpc/client.py*
+%endif
%files python-zombiereaper
%{python_sitelib}/zombiereaper/__init__.py*
--
To view, visit http://gerrit.ovirt.org/24033
To unsubscribe, visit http://gerrit.ovirt.org/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I7229fde2263d1add4c0e74aeb7d5d4e0694f3cda
Gerrit-PatchSet: 1
Gerrit-Project: vdsm
Gerrit-Branch: master
Gerrit-Owner: Yaniv Bronhaim <ybronhei(a)redhat.com>
10 years, 3 months
Change in vdsm[master]: [poc] vm: do not pause during refreshVolume
by Federico Simoncelli
Federico Simoncelli has uploaded a new change for review.
Change subject: [poc] vm: do not pause during refreshVolume
......................................................................
[poc] vm: do not pause during refreshVolume
Signed-off-by: Federico Simoncelli <fsimonce(a)redhat.com>
Change-Id: I896993c00b94c3255ad2007486e0589bf10b3a98
---
M vdsm/vm.py
1 file changed, 2 insertions(+), 13 deletions(-)
git pull ssh://gerrit.ovirt.org:29418/vdsm refs/changes/82/8382/1
diff --git a/vdsm/vm.py b/vdsm/vm.py
index 64644f0..686a589 100644
--- a/vdsm/vm.py
+++ b/vdsm/vm.py
@@ -743,19 +743,8 @@
self.__extendDriveVolume(vmDrive, newSize)
def __refreshDriveVolume(self, volInfo):
- """ Stop vm before refreshing LV. """
-
- self._guestCpuLock.acquire()
- try:
- wasRunning = self._guestCpuRunning
- if wasRunning:
- self.pause(guestCpuLocked=True)
- self.cif.irs.refreshVolume(volInfo['domainID'],
- volInfo['poolID'], volInfo['imageID'], volInfo['volumeID'])
- if wasRunning:
- self.cont(guestCpuLocked=True)
- finally:
- self._guestCpuLock.release()
+ self.cif.irs.refreshVolume(volInfo['domainID'], volInfo['poolID'],
+ volInfo['imageID'], volInfo['volumeID'])
def __afterReplicaExtend(self, volInfo):
self.log.debug("Refreshing replica volume: %s", volInfo)
--
To view, visit http://gerrit.ovirt.org/8382
To unsubscribe, visit http://gerrit.ovirt.org/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I896993c00b94c3255ad2007486e0589bf10b3a98
Gerrit-PatchSet: 1
Gerrit-Project: vdsm
Gerrit-Branch: master
Gerrit-Owner: Federico Simoncelli <fsimonce(a)redhat.com>
10 years, 3 months
Change in vdsm[master]: stroageTests.py: Call detachStorageDomain on rollback
by vvolansk@redhat.com
Vered Volansky has uploaded a new change for review.
Change subject: stroageTests.py: Call detachStorageDomain on rollback
......................................................................
stroageTests.py: Call detachStorageDomain on rollback
vdsClient.deactivateStorageDomain() should be called as
vdsClient.activateStorageDomain() 's rollback.
Change-Id: I943c117b36ac3dd6ccba1e195853b53d83df43c8
Signed-off-by: Vered Volansky <vvolansk(a)redhat.com>
---
M tests/functional/storageTests.py
1 file changed, 8 insertions(+), 2 deletions(-)
git pull ssh://gerrit.ovirt.org:29418/vdsm refs/changes/25/23725/1
diff --git a/tests/functional/storageTests.py b/tests/functional/storageTests.py
index 91f43a9..d87cb76 100644
--- a/tests/functional/storageTests.py
+++ b/tests/functional/storageTests.py
@@ -197,13 +197,19 @@
if sdid != storagePools[poolid]['master_uuid']:
r = self.s.attachStorageDomain(sdid, poolid)
self.assertVdsOK(r)
- undo = lambda sdid=sdid, poolid=poolid: \
+ undo1 = lambda sdid=sdid, poolid=poolid: \
self.assertVdsOK(
self.s.detachStorageDomain(
sdid, poolid, storage.sd.BLANK_UUID,
storagePools[poolid]['master_ver']))
- rollback.prependDefer(undo)
+ rollback.prependDefer(undo1)
r = self.s.activateStorageDomain(sdid, poolid)
+ undo2 = lambda sdid=sdid, poolid=poolid: \
+ self.assertVdsOK(
+ self.s.deactivateStorageDomain(
+ sdid, poolid, storage.sd.BLANK_UUID,
+ storagePools[poolid]['master_ver']))
+ rollback.prependDefer(undo2)
self.assertVdsOK(r)
r = self.s.getVdsStats()
--
To view, visit http://gerrit.ovirt.org/23725
To unsubscribe, visit http://gerrit.ovirt.org/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I943c117b36ac3dd6ccba1e195853b53d83df43c8
Gerrit-PatchSet: 1
Gerrit-Project: vdsm
Gerrit-Branch: master
Gerrit-Owner: Vered Volansky <vvolansk(a)redhat.com>
10 years, 3 months
Change in vdsm[master]: pep8: fix damage introduced in 0bc1e2
by Dan Kenigsberg
Dan Kenigsberg has uploaded a new change for review.
Change subject: pep8: fix damage introduced in 0bc1e2
......................................................................
pep8: fix damage introduced in 0bc1e2
Change-Id: Ibdb2e4dc6c3ea7d0d40ef871714da48b955fe667
Signed-off-by: Dan Kenigsberg <danken(a)redhat.com>
---
M client/vdsClient.py
1 file changed, 2 insertions(+), 2 deletions(-)
git pull ssh://gerrit.ovirt.org:29418/vdsm refs/changes/20/24020/1
diff --git a/client/vdsClient.py b/client/vdsClient.py
index e52c920..beae673 100644
--- a/client/vdsClient.py
+++ b/client/vdsClient.py
@@ -1964,8 +1964,8 @@
('vmId=<id> method=<offline|online> src=<host[:port]> '
'dst=<host[:port]> dstqemu=<host>',
'Migrate a desktop from src machine to dst host using '
- 'the specified ports and an optional address for migration'
- 'data traffic.'
+ 'the specified ports and an optional address for '
+ 'migration data traffic.'
)),
'migrateStatus': (serv.do_mStat,
('<vmId>',
--
To view, visit http://gerrit.ovirt.org/24020
To unsubscribe, visit http://gerrit.ovirt.org/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ibdb2e4dc6c3ea7d0d40ef871714da48b955fe667
Gerrit-PatchSet: 1
Gerrit-Project: vdsm
Gerrit-Branch: master
Gerrit-Owner: Dan Kenigsberg <danken(a)redhat.com>
10 years, 3 months
Change in vdsm[master]: Changing sanlock not configured print
by ybronhei@redhat.com
Yaniv Bronhaim has uploaded a new change for review.
Change subject: Changing sanlock not configured print
......................................................................
Changing sanlock not configured print
Instead of asking for restart sanlock service, just prompt sanlock
service is not configured. Restart the service might not be enough if
sanlock configure didn't run before and set the supplementary groups.
Change-Id: I0595f82e710fb023804eada172332cbf95bb0c80
Signed-off-by: Yaniv Bronhaim <ybronhei(a)redhat.com>
---
M lib/vdsm/tool/configurator.py
1 file changed, 1 insertion(+), 1 deletion(-)
git pull ssh://gerrit.ovirt.org:29418/vdsm refs/changes/12/24012/1
diff --git a/lib/vdsm/tool/configurator.py b/lib/vdsm/tool/configurator.py
index 9e47618..561b16e 100644
--- a/lib/vdsm/tool/configurator.py
+++ b/lib/vdsm/tool/configurator.py
@@ -174,7 +174,7 @@
raise
if not configured:
- sys.stdout.write("sanlock service requires restart\n")
+ sys.stdout.write("sanlock service is not configured\n")
else:
sys.stdout.write("sanlock service is already configured\n")
--
To view, visit http://gerrit.ovirt.org/24012
To unsubscribe, visit http://gerrit.ovirt.org/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I0595f82e710fb023804eada172332cbf95bb0c80
Gerrit-PatchSet: 1
Gerrit-Project: vdsm
Gerrit-Branch: master
Gerrit-Owner: Yaniv Bronhaim <ybronhei(a)redhat.com>
10 years, 3 months
Change in vdsm[master]: Text: add description for dstqemut in migration command
by mtayer@redhat.com
mooli tayer has uploaded a new change for review.
Change subject: Text: add description for dstqemut in migration command
......................................................................
Text: add description for dstqemut in migration command
Change-Id: I4cf7098537f3b2561a25bc77f4518b2a6ba0bfeb
Bug-Url: https://bugzilla.redhat.com/show_bug.cgi?id=1007686
Signed-off-by: Mooli Tayer <mtayer(a)redhat.com>
---
M client/vdsClient.py
1 file changed, 4 insertions(+), 3 deletions(-)
git pull ssh://gerrit.ovirt.org:29418/vdsm refs/changes/09/24009/1
diff --git a/client/vdsClient.py b/client/vdsClient.py
index 23959e2..46722e9 100644
--- a/client/vdsClient.py
+++ b/client/vdsClient.py
@@ -1957,10 +1957,11 @@
' name:value,name:value'
)),
'migrate': (serv.do_migrate,
- ('vmId=<id> method=<offline|online> src=<host:[port]> '
- 'dst=<host:[port]>',
+ ('vmId=<id> method=<offline|online> src=<host[:port]> '
+ 'dst=<host[:port]> dstqemu=<host>',
'Migrate a desktop from src machine to dst host using '
- 'the specified ports'
+ 'the specified ports and an optional address for migration'
+ 'data traffic.'
)),
'migrateStatus': (serv.do_mStat,
('<vmId>',
--
To view, visit http://gerrit.ovirt.org/24009
To unsubscribe, visit http://gerrit.ovirt.org/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I4cf7098537f3b2561a25bc77f4518b2a6ba0bfeb
Gerrit-PatchSet: 1
Gerrit-Project: vdsm
Gerrit-Branch: master
Gerrit-Owner: mooli tayer <mtayer(a)redhat.com>
10 years, 3 months
Change in vdsm[master]: configurator: use sanlock group for sanlock check
by Douglas Schilling Landgraf
Douglas Schilling Landgraf has uploaded a new change for review.
Change subject: configurator: use sanlock group for sanlock check
......................................................................
configurator: use sanlock group for sanlock check
During the check if sanlock service is running we look for the group id's
from /proc/<sanlock pid>/status to finally do a last validation against
DISKIMAGE_GROUP. However, DISKIMAGE_GROUP is a constant for qemu group
not sanlock group. This patch will add a new constant and use
it in configurator.py
Change-Id: Ib1dc5f3b0678f4c6811c7c22287da2a1d4480164
Bug-Url: https://bugzilla.redhat.com/show_bug.cgi?id=1055153
Signed-off-by: Douglas Schilling Landgraf <dougsland(a)redhat.com>
---
M lib/vdsm/constants.py.in
M lib/vdsm/tool/configurator.py
2 files changed, 3 insertions(+), 2 deletions(-)
git pull ssh://gerrit.ovirt.org:29418/vdsm refs/changes/88/23788/1
diff --git a/lib/vdsm/constants.py.in b/lib/vdsm/constants.py.in
index 6653d54..35d3386 100644
--- a/lib/vdsm/constants.py.in
+++ b/lib/vdsm/constants.py.in
@@ -40,6 +40,7 @@
METADATA_GROUP = '@METADATAGROUP@'
QEMU_PROCESS_USER = '@QEMUUSER@'
QEMU_PROCESS_GROUP = '@QEMUGROUP@'
+SANLOCK_GROUP = '@SNLKGROUP@'
#
# The username of SASL authenticating for libvirt connection
diff --git a/lib/vdsm/tool/configurator.py b/lib/vdsm/tool/configurator.py
index dfc4115..7573797 100644
--- a/lib/vdsm/tool/configurator.py
+++ b/lib/vdsm/tool/configurator.py
@@ -24,7 +24,7 @@
from .. import utils
from . import service, expose
-from ..constants import P_VDSM_EXEC, DISKIMAGE_GROUP
+from ..constants import P_VDSM_EXEC, SANLOCK_GROUP
from ..constants import QEMU_PROCESS_GROUP, VDSM_GROUP
@@ -159,7 +159,7 @@
break
else:
raise RuntimeError("Unable to find sanlock service groups")
- configured = grp.getgrnam(DISKIMAGE_GROUP)[2] in groups
+ configured = grp.getgrnam(SANLOCK_GROUP)[2] in groups
except IOError as e:
if e.errno == os.errno.ENOENT:
sys.stdout.write("sanlock service is not running\n")
--
To view, visit http://gerrit.ovirt.org/23788
To unsubscribe, visit http://gerrit.ovirt.org/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ib1dc5f3b0678f4c6811c7c22287da2a1d4480164
Gerrit-PatchSet: 1
Gerrit-Project: vdsm
Gerrit-Branch: master
Gerrit-Owner: Douglas Schilling Landgraf <dougsland(a)redhat.com>
10 years, 3 months
Change in vdsm[ovirt-3.4]: gluster: adopt xml changes of rebalance and remove-brick status
by barumuga@redhat.com
Hello Timothy Asir, Saggi Mizrahi, Aravinda VK, Dan Kenigsberg, Darshan N,
I'd like you to do a code review. Please visit
http://gerrit.ovirt.org/23649
to review the following change.
Change subject: gluster: adopt xml changes of rebalance and remove-brick status
......................................................................
gluster: adopt xml changes of rebalance and remove-brick status
xml output of rebalance and remove-brick status add host uuid and task
runtime (per host and summary). This patch adopts these additional
elements below verbs
* glusterVolumeRebalanceStatus
* glusterVolumeRemoveBrickStatus
Below is the change in output which doesn't break backward
compatibility
{'summary': {
==>> 'runtime': FLOAT,
'filesScanned': INT,
'filesMoved': INT,
'filesFailed': INT,
'filesSkipped': INT,
'totalSizeMoved': INT,
'status': STRING
},
'hosts': [{
'name': STRING,
==>> 'id': STRING,
==>> 'runtime': FLOAT,
'filesScanned': INT,
'filesMoved': INT,
'filesFailed': INT,
'filesSkipped': INT,
'totalSizeMoved': INT,
'status': STRING
}]}
Change-Id: I5866ff338768bd5162acc313eed132526b7777ef
Reviewed-on: http://gerrit.ovirt.org/19597
Reviewed-by: Timothy Asir <tjeyasin(a)redhat.com>
Reviewed-by: Dan Kenigsberg <danken(a)redhat.com>
Signed-off-by: Bala.FA <barumuga(a)redhat.com>
---
M tests/glusterTestData.py
M tests/glusterVolumeRebalanceStatus.xml
M tests/glusterVolumeRemoveBricksStatus.xml
M vdsm/gluster/cli.py
4 files changed, 22 insertions(+), 7 deletions(-)
git pull ssh://gerrit.ovirt.org:29418/vdsm refs/changes/49/23649/1
diff --git a/tests/glusterTestData.py b/tests/glusterTestData.py
index 5e0024b..7622f10 100644
--- a/tests/glusterTestData.py
+++ b/tests/glusterTestData.py
@@ -768,6 +768,7 @@
REBALANCE_REMOVE_BRICK_STATUS = {
'summary': {
+ 'runtime': '10.2',
'filesScanned': '278',
'filesMoved': '78',
'filesFailed': '0',
@@ -777,6 +778,8 @@
},
'hosts': [{
'name': 'localhost',
+ 'id': '883626f8-4d29-4d02-8c5d-c9f48c5b2445',
+ 'runtime': '10.2',
'filesScanned': '278',
'filesMoved': '78',
'filesFailed': '0',
diff --git a/tests/glusterVolumeRebalanceStatus.xml b/tests/glusterVolumeRebalanceStatus.xml
index 42968c5..41f5598 100644
--- a/tests/glusterVolumeRebalanceStatus.xml
+++ b/tests/glusterVolumeRebalanceStatus.xml
@@ -9,6 +9,8 @@
<nodeCount>1</nodeCount>
<node>
<nodeName>localhost</nodeName>
+ <id>883626f8-4d29-4d02-8c5d-c9f48c5b2445</id>
+ <runtime>10.2</runtime>
<files>78</files>
<size>79872</size>
<lookups>278</lookups>
@@ -18,6 +20,7 @@
<statusStr>completed</statusStr>
</node>
<aggregate>
+ <runtime>10.2</runtime>
<files>78</files>
<size>79872</size>
<lookups>278</lookups>
diff --git a/tests/glusterVolumeRemoveBricksStatus.xml b/tests/glusterVolumeRemoveBricksStatus.xml
index 26bb97c..eb7df91 100644
--- a/tests/glusterVolumeRemoveBricksStatus.xml
+++ b/tests/glusterVolumeRemoveBricksStatus.xml
@@ -7,6 +7,8 @@
<nodeCount>1</nodeCount>
<node>
<nodeName>localhost</nodeName>
+ <id>883626f8-4d29-4d02-8c5d-c9f48c5b2445</id>
+ <runtime>10.2</runtime>
<files>78</files>
<size>79872</size>
<lookups>278</lookups>
@@ -16,6 +18,7 @@
<statusStr>completed</statusStr>
</node>
<aggregate>
+ <runtime>10.2</runtime>
<files>78</files>
<size>79872</size>
<lookups>278</lookups>
diff --git a/vdsm/gluster/cli.py b/vdsm/gluster/cli.py
index 5a090c5..e3f7c84 100644
--- a/vdsm/gluster/cli.py
+++ b/vdsm/gluster/cli.py
@@ -618,13 +618,16 @@
def _parseVolumeRebalanceRemoveBrickStatus(xmltree, mode):
"""
returns {'hosts': [{'name': NAME,
- 'filesScanned': INT AS STRING,
- 'filesMoved': INT AS STRING,
- 'filesFailed': INT AS STRING,
- 'filesSkipped': INT AS STRING,
- 'totalSizeMoved': INT AS STRING,
- 'status': STRING},...]
- 'summary': {'filesScanned': INT AS STRING,
+ 'id': UUID_STRING,
+ 'runtime': FLOAT_AS_STRING,
+ 'filesScanned': INT AS STRING,
+ 'filesMoved': INT AS STRING,
+ 'filesFailed': INT AS STRING,
+ 'filesSkipped': INT AS STRING,
+ 'totalSizeMoved': INT AS STRING,
+ 'status': STRING},...]
+ 'summary': {'runtime': FLOAT_AS_STRING,
+ 'filesScanned': INT AS STRING,
'filesMoved': INT AS STRING,
'filesFailed': INT AS STRING,
'filesSkipped': INT AS STRING,
@@ -640,6 +643,7 @@
status = {
'summary': {
+ 'runtime': tree.find('aggregate/runtime').text,
'filesScanned': tree.find('aggregate/lookups').text,
'filesMoved': tree.find('aggregate/files').text,
'filesFailed': tree.find('aggregate/failures').text,
@@ -650,6 +654,8 @@
for el in tree.findall('node'):
status['hosts'].append({'name': el.find('nodeName').text,
+ 'id': el.find('id').text,
+ 'runtime': el.find('runtime').text,
'filesScanned': el.find('lookups').text,
'filesMoved': el.find('files').text,
'filesFailed': el.find('failures').text,
--
To view, visit http://gerrit.ovirt.org/23649
To unsubscribe, visit http://gerrit.ovirt.org/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I5866ff338768bd5162acc313eed132526b7777ef
Gerrit-PatchSet: 1
Gerrit-Project: vdsm
Gerrit-Branch: ovirt-3.4
Gerrit-Owner: Bala.FA <barumuga(a)redhat.com>
Gerrit-Reviewer: Aravinda VK <avishwan(a)redhat.com>
Gerrit-Reviewer: Dan Kenigsberg <danken(a)redhat.com>
Gerrit-Reviewer: Darshan N <dnarayan(a)redhat.com>
Gerrit-Reviewer: Saggi Mizrahi <smizrahi(a)redhat.com>
Gerrit-Reviewer: Timothy Asir <tjeyasin(a)redhat.com>
10 years, 3 months