Change in vdsm[master]: gluster: add node uuid in rebalance and remove-brick status

Hello Timothy Asir, Saggi Mizrahi, Aravinda VK, Dan Kenigsberg,

I'd like you to do a code review.  Please visit

http://gerrit.ovirt.org/19597

to review the following change.

Change subject: gluster: add node uuid in rebalance and remove-brick status
......................................................................

gluster: add node uuid in rebalance and remove-brick status

This patch adds node uuid as 'id' element to output of rebalance and
remove-brick status.  Below verbs are affected

* glusterVolumeRebalanceStatus
* glusterVolumeRemoveBrickStatus

Below is the change in output which doesn't break backward
compatibility
        {'summary': {
            'filesScanned': INT,
            'filesMoved': INT,
            'filesFailed': INT,
            'filesSkipped': INT,
            'totalSizeMoved': INT,
            'status': STRING
        },
        'hosts': [{
            'name': STRING,
    ==>>    'id': STRING,
            'filesScanned': INT,
            'filesMoved': INT,
            'filesFailed': INT,
            'filesSkipped': INT,
            'totalSizeMoved': INT,
            'status': STRING
        }]}

Change-Id: I5b3031b6eb796b7475bbe533fbdd0366fbaf6aea
Signed-off-by: Bala.FA 
---
M tests/glusterTestData.py
M tests/glusterVolumeRebalanceStatus.xml
M tests/glusterVolumeRemoveBricksStatus.xml
M vdsm/gluster/cli.py
4 files changed, 4 insertions(+), 0 deletions(-)

git pull ssh://gerrit.ovirt.org:29418/vdsm refs/changes/97/19597/1

diff --git a/tests/glusterTestData.py b/tests/glusterTestData.py
index 2afd033..fc4d761 100644
--- a/tests/glusterTestData.py
+++ b/tests/glusterTestData.py
@@ -777,6 +777,7 @@
     },
     'hosts': [{
         'name': 'localhost',
+        'id': '883626f8-4d29-4d02-8c5d-c9f48c5b2445',
         'filesScanned': 278,
         'filesMoved': 78,
         'filesFailed': 0,
diff --git a/tests/glusterVolumeRebalanceStatus.xml b/tests/glusterVolumeRebalanceStatus.xml
index 42968c5..337075a 100644
--- a/tests/glusterVolumeRebalanceStatus.xml
+++ b/tests/glusterVolumeRebalanceStatus.xml
@@ -9,6 +9,7 @@
     <nodeCount>1</nodeCount>
     <node>
       <nodeName>localhost</nodeName>
+      <id>883626f8-4d29-4d02-8c5d-c9f48c5b2445</id>
       <files>78</files>
       <size>79872</size>
       <lookups>278</lookups>
diff --git a/tests/glusterVolumeRemoveBricksStatus.xml b/tests/glusterVolumeRemoveBricksStatus.xml
index 26bb97c..5712d19 100644
--- a/tests/glusterVolumeRemoveBricksStatus.xml
+++ b/tests/glusterVolumeRemoveBricksStatus.xml
@@ -7,6 +7,7 @@
     <nodeCount>1</nodeCount>
     <node>
       <nodeName>localhost</nodeName>
+      <id>883626f8-4d29-4d02-8c5d-c9f48c5b2445</id>
       <files>78</files>
       <size>79872</size>
       <lookups>278</lookups>
diff --git a/vdsm/gluster/cli.py b/vdsm/gluster/cli.py
index 62b5f13..6d7f389 100644
--- a/vdsm/gluster/cli.py
+++ b/vdsm/gluster/cli.py
@@ -620,6 +620,7 @@

for el in tree.findall('node'):
         status['hosts'].append({'name': el.find('nodeName').text,
+                                'id': el.find('id').text,
                                 'filesScanned': int(el.find('lookups').text),
                                 'filesMoved': int(el.find('files').text),
                                 'filesFailed': int(el.find('failures').text),

[Jenkins CI RO]

oVirt Jenkins CI Server has posted comments on this change.

Change subject: gluster: add node uuid in rebalance and remove-brick status
......................................................................

Patch Set 1:

Build Successful

http://jenkins.ovirt.org/job/vdsm_unit_tests_gerrit_el/3764/ : SUCCESS

http://jenkins.ovirt.org/job/vdsm_pep8_gerrit/4573/ : SUCCESS

http://jenkins.ovirt.org/job/vdsm_unit_tests_gerrit/4649/ : SUCCESS

Change in vdsm[master]: gluster: adopt xml changes of rebalance and remove-brick status

[Jenkins CI RO]

oVirt Jenkins CI Server has posted comments on this change.

Change subject: gluster: adopt xml changes of rebalance and remove-brick status
......................................................................

Patch Set 2:

Build Successful

http://jenkins.ovirt.org/job/vdsm_unit_tests_gerrit_el/3805/ : SUCCESS

http://jenkins.ovirt.org/job/vdsm_unit_tests_gerrit/4690/ : SUCCESS

http://jenkins.ovirt.org/job/vdsm_pep8_gerrit/4614/ : SUCCESS

Change in vdsm[master]: gluster: adopt xml changes of rebalance and remove-brick status

Aravinda VK has posted comments on this change.

Change subject: gluster: adopt xml changes of rebalance and remove-brick status
......................................................................

Patch Set 2: Code-Review+1

Change in vdsm[master]: gluster: adopt xml changes of rebalance and remove-brick status

Saggi Mizrahi has posted comments on this change.

Change subject: gluster: adopt xml changes of rebalance and remove-brick status
......................................................................

Patch Set 2:

isn't there a schema file that needs changing?

Change in vdsm[master]: gluster: adopt xml changes of rebalance and remove-brick status

Bala.FA has posted comments on this change.

Change subject: gluster: adopt xml changes of rebalance and remove-brick status
......................................................................

Patch Set 2:

Yes.  I will update schema file and update this patch set.

Change in vdsm[master]: gluster: adopt xml changes of rebalance and remove-brick status

Bala.FA has posted comments on this change.

Change subject: gluster: adopt xml changes of rebalance and remove-brick status
......................................................................

Patch Set 2: Code-Review-1

Change in vdsm[master]: gluster: adopt xml changes of rebalance and remove-brick status

Bala.FA has posted comments on this change.

Change subject: gluster: adopt xml changes of rebalance and remove-brick status
......................................................................

Patch Set 2:

The schema is in WIP at http://gerrit.ovirt.org/#/c/18005/4.  I have asked to complete the pending and remove WIP

Change in vdsm[master]: gluster: adopt xml changes of rebalance and remove-brick status

[Jenkins CI RO]

oVirt Jenkins CI Server has posted comments on this change.

Change subject: gluster: adopt xml changes of rebalance and remove-brick status
......................................................................

Patch Set 3: Verified-1

Build Failed

http://jenkins.ovirt.org/job/vdsm_unit_tests_gerrit/5066/ : SUCCESS

http://jenkins.ovirt.org/job/vdsm_pep8_gerrit/4992/ : SUCCESS

http://jenkins.ovirt.org/job/vdsm_unit_tests_gerrit_el/4185/ : FAILURE

Change in vdsm[master]: gluster: adopt xml changes of rebalance and remove-brick status

Bala.FA has posted comments on this change.

Change subject: gluster: adopt xml changes of rebalance and remove-brick status
......................................................................

Patch Set 3:

http://jenkins.ovirt.org/job/vdsm_unit_tests_gerrit_el/4185/ : FAILURE

This FAILURE is not by this patch

Change in vdsm[master]: gluster: adopt xml changes of rebalance and remove-brick status

Bala.FA has posted comments on this change.

Change subject: gluster: adopt xml changes of rebalance and remove-brick status
......................................................................

Patch Set 3: Verified+1

Change in vdsm[master]: gluster: adopt xml changes of rebalance and remove-brick status

Bala.FA has posted comments on this change.

Change subject: gluster: adopt xml changes of rebalance and remove-brick status
......................................................................

Patch Set 4: Verified+1

Change in vdsm[master]: gluster: adopt xml changes of rebalance and remove-brick status

[Jenkins CI RO]

oVirt Jenkins CI Server has posted comments on this change.

Change subject: gluster: adopt xml changes of rebalance and remove-brick status
......................................................................

Patch Set 4: Verified-1

Build Failed

http://jenkins.ovirt.org/job/vdsm_pep8_gerrit/5008/ : SUCCESS

http://jenkins.ovirt.org/job/vdsm_unit_tests_gerrit_el/4204/ : SUCCESS

http://jenkins.ovirt.org/job/vdsm_unit_tests_gerrit/5082/ : ABORTED

Change in vdsm[master]: gluster: adopt xml changes of rebalance and remove-brick status

Bala.FA has posted comments on this change.

Change subject: gluster: adopt xml changes of rebalance and remove-brick status
......................................................................

Patch Set 5:

Patch Set #5 is just a rebase to latest HEAD

Change in vdsm[master]: gluster: adopt xml changes of rebalance and remove-brick status

Bala.FA has posted comments on this change.

Change subject: gluster: adopt xml changes of rebalance and remove-brick status
......................................................................

Patch Set 5: Verified+1

Change in vdsm[master]: gluster: adopt xml changes of rebalance and remove-brick status

[Jenkins CI RO]

oVirt Jenkins CI Server has posted comments on this change.

Change subject: gluster: adopt xml changes of rebalance and remove-brick status
......................................................................

Patch Set 5:

Build Successful

http://jenkins.ovirt.org/job/vdsm_unit_tests_gerrit_el/4643/ : SUCCESS

http://jenkins.ovirt.org/job/vdsm_pep8_gerrit/5443/ : SUCCESS

http://jenkins.ovirt.org/job/vdsm_unit_tests_gerrit/5522/ : SUCCESS

Change in vdsm[master]: gluster: adopt xml changes of rebalance and remove-brick status

Bala.FA has posted comments on this change.

Change subject: gluster: adopt xml changes of rebalance and remove-brick status
......................................................................

Patch Set 7: Verified+1

Change in vdsm[master]: gluster: adopt xml changes of rebalance and remove-brick status

[Jenkins CI RO]

oVirt Jenkins CI Server has posted comments on this change.

Change subject: gluster: adopt xml changes of rebalance and remove-brick status
......................................................................

Patch Set 6:

Build Successful

http://jenkins.ovirt.org/job/vdsm_unit_tests_gerrit_el/4646/ : SUCCESS

http://jenkins.ovirt.org/job/vdsm_pep8_gerrit/5446/ : SUCCESS

http://jenkins.ovirt.org/job/vdsm_unit_tests_gerrit/5525/ : SUCCESS

Change in vdsm[master]: gluster: adopt xml changes of rebalance and remove-brick status

[Jenkins CI RO]

oVirt Jenkins CI Server has posted comments on this change.

Change subject: gluster: adopt xml changes of rebalance and remove-brick status
......................................................................

Patch Set 7: Verified-1

Build Failed

http://jenkins.ovirt.org/job/vdsm_unit_tests_gerrit_el/4648/ : SUCCESS

http://jenkins.ovirt.org/job/vdsm_pep8_gerrit/5448/ : SUCCESS

http://jenkins.ovirt.org/job/vdsm_unit_tests_gerrit/5527/ : FAILURE

Change in vdsm[master]: gluster: adopt xml changes of rebalance and remove-brick status

Bala.FA has posted comments on this change.

Change subject: gluster: adopt xml changes of rebalance and remove-brick status
......................................................................

Patch Set 7:

This patch is nothing to do with the above jenkins unit test failure

Change in vdsm[master]: gluster: adopt xml changes of rebalance and remove-brick status

Bala.FA has posted comments on this change.

Change subject: gluster: adopt xml changes of rebalance and remove-brick status
......................................................................

Patch Set 7:

Please note: this patch sets 'Requires: glusterfs > 3.4.2' and glusterfs 3.4.2 is not available yet, but respective code is available in glusterfs 3.4 release branch.

Change in vdsm[master]: gluster: adopt xml changes of rebalance and remove-brick status

Bala.FA has posted comments on this change.

Change subject: gluster: adopt xml changes of rebalance and remove-brick status
......................................................................

Patch Set 8: Verified+1

Change in vdsm[master]: gluster: adopt xml changes of rebalance and remove-brick status

[Jenkins CI RO]

oVirt Jenkins CI Server has posted comments on this change.

Change subject: gluster: adopt xml changes of rebalance and remove-brick status
......................................................................

Patch Set 8:

Build Successful

http://jenkins.ovirt.org/job/vdsm_unit_tests_gerrit_el/4658/ : SUCCESS

http://jenkins.ovirt.org/job/vdsm_pep8_gerrit/5458/ : SUCCESS

http://jenkins.ovirt.org/job/vdsm_unit_tests_gerrit/5537/ : SUCCESS

Change in vdsm[master]: gluster: adopt xml changes of rebalance and remove-brick status

[Jenkins CI RO]

oVirt Jenkins CI Server has posted comments on this change.

Change subject: gluster: adopt xml changes of rebalance and remove-brick status
......................................................................

Patch Set 9:

Build Successful

http://jenkins.ovirt.org/job/vdsm_unit_tests_gerrit_el/4707/ : SUCCESS

http://jenkins.ovirt.org/job/vdsm_pep8_gerrit/5507/ : SUCCESS

http://jenkins.ovirt.org/job/vdsm_unit_tests_gerrit/5586/ : SUCCESS

Change in vdsm[master]: gluster: adopt xml changes of rebalance and remove-brick status

Timothy Asir has posted comments on this change.

Change subject: gluster: adopt xml changes of rebalance and remove-brick status
......................................................................

Patch Set 9: Code-Review+1

Change in vdsm[master]: gluster: adopt xml changes of rebalance and remove-brick status

[Jenkins CI RO]

oVirt Jenkins CI Server has posted comments on this change.

Change subject: gluster: adopt xml changes of rebalance and remove-brick status
......................................................................

Patch Set 10: Verified-1

Build Failed

http://jenkins.ovirt.org/job/vdsm_unit_tests_gerrit/6559/ : SUCCESS

http://jenkins.ovirt.org/job/vdsm_unit_tests_gerrit_el/5666/ : SUCCESS

http://jenkins.ovirt.org/job/vdsm_pep8_gerrit/6472/ : SUCCESS

http://jenkins.ovirt.org/job/vdsm_master_install_rpm_sanity_gerrit/204/ : FAILURE

Change in vdsm[master]: gluster: adopt xml changes of rebalance and remove-brick status

Bala.FA has posted comments on this change.

Change subject: gluster: adopt xml changes of rebalance and remove-brick status
......................................................................

Patch Set 10: Verified+1

Change in vdsm[master]: gluster: adopt xml changes of rebalance and remove-brick status

Bala.FA has posted comments on this change.

Change subject: gluster: adopt xml changes of rebalance and remove-brick status
......................................................................

Patch Set 10: Verified-1

I see

Traceback (most recent call last):
  File "/usr/share/vdsm/BindingXMLRPC.py", line 941, in wrapper
    f.im_self.updateTimestamp()
AttributeError: 'GlusterApi' object has no attribute 'updateTimestamp'

for all gluster verbs.

This needs to be fixed first.

Change in vdsm[master]: gluster: adopt xml changes of rebalance and remove-brick status

[Jenkins CI RO]

oVirt Jenkins CI Server has posted comments on this change.

Change subject: gluster: adopt xml changes of rebalance and remove-brick status
......................................................................

Patch Set 11:

Build Successful

http://jenkins.ovirt.org/job/vdsm_unit_tests_gerrit_el/5959/ : SUCCESS

http://jenkins.ovirt.org/job/vdsm_pep8_gerrit/6747/ : SUCCESS

http://jenkins.ovirt.org/job/vdsm_unit_tests_gerrit/6853/ : SUCCESS

Change in vdsm[master]: gluster: adopt xml changes of rebalance and remove-brick status

Bala.FA has posted comments on this change.

Change subject: gluster: adopt xml changes of rebalance and remove-brick status
......................................................................

Patch Set 12: Verified+1

Change in vdsm[master]: gluster: adopt xml changes of rebalance and remove-brick status

Timothy Asir has posted comments on this change.

Change subject: gluster: adopt xml changes of rebalance and remove-brick status
......................................................................

Patch Set 12: Code-Review+1

Change in vdsm[master]: gluster: adopt xml changes of rebalance and remove-brick status

[Jenkins CI RO]

oVirt Jenkins CI Server has posted comments on this change.

Change subject: gluster: adopt xml changes of rebalance and remove-brick status
......................................................................

Patch Set 12:

Build Successful

http://jenkins.ovirt.org/job/vdsm_unit_tests_gerrit_el/6003/ : SUCCESS

http://jenkins.ovirt.org/job/vdsm_pep8_gerrit/6791/ : SUCCESS

http://jenkins.ovirt.org/job/vdsm_unit_tests_gerrit/6897/ : SUCCESS

Change in vdsm[master]: gluster: adopt xml changes of rebalance and remove-brick status

[Dan Kenigsberg]

Dan Kenigsberg has posted comments on this change.

Change subject: gluster: adopt xml changes of rebalance and remove-brick status
......................................................................

Patch Set 12: Code-Review+2

Change in vdsm[master]: gluster: adopt xml changes of rebalance and remove-brick status

[Dan Kenigsberg]

Dan Kenigsberg has submitted this change and it was merged.

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: I5b3031b6eb796b7475bbe533fbdd0366fbaf6aea
Signed-off-by: Bala.FA 
Reviewed-on: http://gerrit.ovirt.org/19597
Reviewed-by: Timothy Asir 
Reviewed-by: Dan Kenigsberg 
---
M tests/glusterTestData.py
M tests/glusterVolumeRebalanceStatus.xml
M tests/glusterVolumeRemoveBricksStatus.xml
M vdsm/gluster/cli.py
4 files changed, 22 insertions(+), 7 deletions(-)

Approvals:
  Timothy Asir: Looks good to me, but someone else must approve
  Bala.FA: Verified
  Dan Kenigsberg: Looks good to me, approved