Change in vdsm[master]: sampling: a quick fix to make vdsm run again

[Dan Kenigsberg]

Dan Kenigsberg has uploaded a new change for review.

Change subject: sampling: a quick fix to make vdsm run again
......................................................................

sampling: a quick fix to make vdsm run again

commit c506391442bc was merged too quickly, leaving a process that fails
to start due to
    AttributeError: 'HostStatsThread' object has no a ttribute 'nics'

Change-Id: Idc993a6b1284345805455a63e3926bc2893d5874
Signed-off-by: Dan Kenigsberg <danken(a)redhat.com&gt;
---
M vdsm/sampling.py
1 file changed, 1 insertion(+), 1 deletion(-)


  git pull ssh://gerrit.ovirt.org:29418/vdsm refs/changes/02/13902/1

diff --git a/vdsm/sampling.py b/vdsm/sampling.py
index acc2217..df03fd7 100644
--- a/vdsm/sampling.py
+++ b/vdsm/sampling.py
@@ -504,7 +504,7 @@
         from vdsm.netinfo import speed as nicspeed
 
         i = 0
-        for ifid in self.nics:
+        for ifid in self._ifids:
             if (hs0.interfaces[ifid].operstate !=
                     hs1.interfaces[ifid].operstate):
                 self._ifrates[i] = nicspeed(ifid)


--
To view, visit http://gerrit.ovirt.org/13902
To unsubscribe, visit http://gerrit.ovirt.org/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: Idc993a6b1284345805455a63e3926bc2893d5874
Gerrit-PatchSet: 1
Gerrit-Project: vdsm
Gerrit-Branch: master
Gerrit-Owner: Dan Kenigsberg <danken(a)redhat.com&gt;

[Jenkins CI RO]

oVirt Jenkins CI Server has posted comments on this change.

Change subject: sampling: a quick fix to make vdsm run again
......................................................................


Patch Set 1:

Build Started http://jenkins.ovirt.org/job/vdsm_pep8_gerrit/1958/ (2/2)

--
To view, visit http://gerrit.ovirt.org/13902
To unsubscribe, visit http://gerrit.ovirt.org/settings

Gerrit-MessageType: comment
Gerrit-Change-Id: Idc993a6b1284345805455a63e3926bc2893d5874
Gerrit-PatchSet: 1
Gerrit-Project: vdsm
Gerrit-Branch: master
Gerrit-Owner: Dan Kenigsberg <danken(a)redhat.com&gt;
Gerrit-Reviewer: oVirt Jenkins CI Server

Daniel Erez has posted comments on this change.

Change subject: sampling: a quick fix to make vdsm run again
......................................................................


Patch Set 1: Looks good to me, but someone else must approve

--
To view, visit http://gerrit.ovirt.org/13902
To unsubscribe, visit http://gerrit.ovirt.org/settings

Gerrit-MessageType: comment
Gerrit-Change-Id: Idc993a6b1284345805455a63e3926bc2893d5874
Gerrit-PatchSet: 1
Gerrit-Project: vdsm
Gerrit-Branch: master
Gerrit-Owner: Dan Kenigsberg <danken(a)redhat.com&gt;
Gerrit-Reviewer: Daniel Erez <derez(a)redhat.com&gt;
Gerrit-Reviewer: Mark Wu <wudxw(a)linux.vnet.ibm.com&gt;
Gerrit-Reviewer: oVirt Jenkins CI Server

Daniel Erez has posted comments on this change.

Change subject: sampling: a quick fix to make vdsm run again
......................................................................


Patch Set 1: Verified

--
To view, visit http://gerrit.ovirt.org/13902
To unsubscribe, visit http://gerrit.ovirt.org/settings

Gerrit-MessageType: comment
Gerrit-Change-Id: Idc993a6b1284345805455a63e3926bc2893d5874
Gerrit-PatchSet: 1
Gerrit-Project: vdsm
Gerrit-Branch: master
Gerrit-Owner: Dan Kenigsberg <danken(a)redhat.com&gt;
Gerrit-Reviewer: Daniel Erez <derez(a)redhat.com&gt;
Gerrit-Reviewer: Mark Wu <wudxw(a)linux.vnet.ibm.com&gt;
Gerrit-Reviewer: oVirt Jenkins CI Server

Mark Wu has posted comments on this change.

Change subject: sampling: a quick fix to make vdsm run again
......................................................................


Patch Set 2:

Dan,
Thanks for your kindness. But I think it's none of your fault! Each developer should
be responsible for each commit is valid even in a branch. It's very difficult to find
the mistake from review. So the lesson I learned is I should verify every commit in the
branch to make sure it's valid.

As for your problem, I am going to answer it in the mailing list.

--
To view, visit http://gerrit.ovirt.org/13902
To unsubscribe, visit http://gerrit.ovirt.org/settings

Gerrit-MessageType: comment
Gerrit-Change-Id: Idc993a6b1284345805455a63e3926bc2893d5874
Gerrit-PatchSet: 2
Gerrit-Project: vdsm
Gerrit-Branch: master
Gerrit-Owner: Dan Kenigsberg <danken(a)redhat.com&gt;
Gerrit-Reviewer: Dan Kenigsberg <danken(a)redhat.com&gt;
Gerrit-Reviewer: Daniel Erez <derez(a)redhat.com&gt;
Gerrit-Reviewer: Mark Wu <wudxw(a)linux.vnet.ibm.com&gt;
Gerrit-Reviewer: oVirt Jenkins CI Server

[Dan Kenigsberg]

Dan Kenigsberg has submitted this change and it was merged.

Change subject: sampling: a quick fix to make vdsm run again
......................................................................


sampling: a quick fix to make vdsm run again

commit c506391442bc was merged too quickly, leaving a process that fails
to start due to
    AttributeError: 'HostStatsThread' object has no a ttribute 'nics'

Change-Id: Idc993a6b1284345805455a63e3926bc2893d5874
Signed-off-by: Dan Kenigsberg <danken(a)redhat.com&gt;
---
M vdsm/sampling.py
1 file changed, 1 insertion(+), 1 deletion(-)

Approvals:
  Mark Wu: Looks good to me, but someone else must approve
  Daniel Erez: Verified; Looks good to me, but someone else must approve
  Dan Kenigsberg: Looks good to me, approved


--
To view, visit http://gerrit.ovirt.org/13902
To unsubscribe, visit http://gerrit.ovirt.org/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: Idc993a6b1284345805455a63e3926bc2893d5874
Gerrit-PatchSet: 1
Gerrit-Project: vdsm
Gerrit-Branch: master
Gerrit-Owner: Dan Kenigsberg <danken(a)redhat.com&gt;
Gerrit-Reviewer: Dan Kenigsberg <danken(a)redhat.com&gt;
Gerrit-Reviewer: Daniel Erez <derez(a)redhat.com&gt;
Gerrit-Reviewer: Mark Wu <wudxw(a)linux.vnet.ibm.com&gt;
Gerrit-Reviewer: oVirt Jenkins CI Server

[Dan Kenigsberg]

Dan Kenigsberg has posted comments on this change.

Change subject: sampling: a quick fix to make vdsm run again
......................................................................


Patch Set 1: Looks good to me, approved

Mark, part of the blame is on me, for taking a mid-branch commit so quickly.

P.s., I do not think that this solves the no-net-stats issue that D.Erez reported on
vdsm-devel.

--
To view, visit http://gerrit.ovirt.org/13902
To unsubscribe, visit http://gerrit.ovirt.org/settings

Gerrit-MessageType: comment
Gerrit-Change-Id: Idc993a6b1284345805455a63e3926bc2893d5874
Gerrit-PatchSet: 1
Gerrit-Project: vdsm
Gerrit-Branch: master
Gerrit-Owner: Dan Kenigsberg <danken(a)redhat.com&gt;
Gerrit-Reviewer: Dan Kenigsberg <danken(a)redhat.com&gt;
Gerrit-Reviewer: Daniel Erez <derez(a)redhat.com&gt;
Gerrit-Reviewer: Mark Wu <wudxw(a)linux.vnet.ibm.com&gt;
Gerrit-Reviewer: oVirt Jenkins CI Server

Mark Wu has posted comments on this change.

Change subject: sampling: a quick fix to make vdsm run again
......................................................................


Patch Set 1: Looks good to me, but someone else must approve

Dan,
Thanks for the quick fix!  The change from _ifids to nics_ should be included in the
http://gerrit.ovirt.org/13839. It was included in this c506391442bc because of code rebase
mistake. And I only verified the last patch of the series, and didn't find
c506391442bc is not self-contained. 
I need take great care for code merge/rebase, especially for the case of moving code to
new file. 

I apologize for the mistake!

--
To view, visit http://gerrit.ovirt.org/13902
To unsubscribe, visit http://gerrit.ovirt.org/settings

Gerrit-MessageType: comment
Gerrit-Change-Id: Idc993a6b1284345805455a63e3926bc2893d5874
Gerrit-PatchSet: 1
Gerrit-Project: vdsm
Gerrit-Branch: master
Gerrit-Owner: Dan Kenigsberg <danken(a)redhat.com&gt;
Gerrit-Reviewer: Daniel Erez <derez(a)redhat.com&gt;
Gerrit-Reviewer: Mark Wu <wudxw(a)linux.vnet.ibm.com&gt;
Gerrit-Reviewer: oVirt Jenkins CI Server

[Jenkins CI RO]

oVirt Jenkins CI Server has posted comments on this change.

Change subject: sampling: a quick fix to make vdsm run again
......................................................................


Patch Set 1:

Build Successful 

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

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

--
To view, visit http://gerrit.ovirt.org/13902
To unsubscribe, visit http://gerrit.ovirt.org/settings

Gerrit-MessageType: comment
Gerrit-Change-Id: Idc993a6b1284345805455a63e3926bc2893d5874
Gerrit-PatchSet: 1
Gerrit-Project: vdsm
Gerrit-Branch: master
Gerrit-Owner: Dan Kenigsberg <danken(a)redhat.com&gt;
Gerrit-Reviewer: Daniel Erez <derez(a)redhat.com&gt;
Gerrit-Reviewer: Mark Wu <wudxw(a)linux.vnet.ibm.com&gt;
Gerrit-Reviewer: oVirt Jenkins CI Server

[Jenkins CI RO]

oVirt Jenkins CI Server has posted comments on this change.

Change subject: sampling: a quick fix to make vdsm run again
......................................................................


Patch Set 1:

Build Started http://jenkins.ovirt.org/job/vdsm_unit_tests_gerrit/2014/ (1/2)

--
To view, visit http://gerrit.ovirt.org/13902
To unsubscribe, visit http://gerrit.ovirt.org/settings

Gerrit-MessageType: comment
Gerrit-Change-Id: Idc993a6b1284345805455a63e3926bc2893d5874
Gerrit-PatchSet: 1
Gerrit-Project: vdsm
Gerrit-Branch: master
Gerrit-Owner: Dan Kenigsberg <danken(a)redhat.com&gt;
Gerrit-Reviewer: oVirt Jenkins CI Server