Dan Kenigsberg has uploaded a new change for review.
Change subject: vdsmd: do not swallow libvirt error
......................................................................
vdsmd: do not swallow libvirt error
Recently I've seen multiple cases of vdsm not starting up with a vague
error "Failed to define network filters on libvirt", when the underlying
issue was that libvirt has crashed.
It's better to have a line or two of log noise, in order to see that
libvirt could not have been reached.
Change-Id: I6a91061f52ec4eff24dd1e10f525fd3fed9185ef
Signed-off-by: Dan Kenigsberg <danken(a)redhat.com>
---
M vdsm/vdsmd.init.in
1 file changed, 1 insertion(+), 1 deletion(-)
git pull ssh://gerrit.ovirt.org:29418/vdsm refs/changes/09/13909/1
diff --git a/vdsm/vdsmd.init.in b/vdsm/vdsmd.init.in
index dd1d65b..ba98e53 100755
--- a/vdsm/vdsmd.init.in
+++ b/vdsm/vdsmd.init.in
@@ -474,7 +474,7 @@
return $ret_val
fi
- python @VDSMDIR@/nwfilter.pyc > /dev/null 2>&1
+ python @VDSMDIR@/nwfilter.pyc
ret_val=$?
if [ $ret_val -ne 0 ]
then
--
To view, visit http://gerrit.ovirt.org/13909
To unsubscribe, visit http://gerrit.ovirt.org/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I6a91061f52ec4eff24dd1e10f525fd3fed9185ef
Gerrit-PatchSet: 1
Gerrit-Project: vdsm
Gerrit-Branch: master
Gerrit-Owner: Dan Kenigsberg <danken(a)redhat.com>
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>
---
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>
Mark Wu has posted comments on this change.
Change subject: Separate sampling code from vdsm.utils
......................................................................
Patch Set 3:
Dan,
I had seen the long discussion about moving sampling function out of vdsm before, but didn't know Yaniv had taken this task. Hope it will not cause Yaniv waste his effort because of this out-of-sync.
Actually, I think this is just the first step to improve the sampling. In future we could separate vm stats from libvirtvm, and move host stats code from the sampling base infrastructure.
--
To view, visit http://gerrit.ovirt.org/13838
To unsubscribe, visit http://gerrit.ovirt.org/settings
Gerrit-MessageType: comment
Gerrit-Change-Id: I1de4c81b3cf202f9f548a59b86ef0c8a97c2af19
Gerrit-PatchSet: 3
Gerrit-Project: vdsm
Gerrit-Branch: master
Gerrit-Owner: Mark Wu <wudxw(a)linux.vnet.ibm.com>
Gerrit-Reviewer: Dan Kenigsberg <danken(a)redhat.com>
Gerrit-Reviewer: Mark Wu <wudxw(a)linux.vnet.ibm.com>
Gerrit-Reviewer: Yaniv Bronhaim <ybronhei(a)redhat.com>
Gerrit-Reviewer: oVirt Jenkins CI Server
Dan Kenigsberg has submitted this change and it was merged.
Change subject: Separate sampling code from vdsm.utils
......................................................................
Separate sampling code from vdsm.utils
vdsm.utils should only include helper functions which could be shared
different modules. Sampling is a separate function, so it should be
moved out of utils. It could resolve the problem of circular import.
Change-Id: I1de4c81b3cf202f9f548a59b86ef0c8a97c2af19
Signed-off-by: Mark Wu <wudxw(a)linux.vnet.ibm.com>
---
M lib/vdsm/utils.py
M vdsm.spec.in
M vdsm/Makefile.am
M vdsm/clientIF.py
M vdsm/libvirtvm.py
A vdsm/sampling.py
6 files changed, 615 insertions(+), 529 deletions(-)
Approvals:
Mark Wu: Verified
Dan Kenigsberg: Looks good to me, approved
--
To view, visit http://gerrit.ovirt.org/13838
To unsubscribe, visit http://gerrit.ovirt.org/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I1de4c81b3cf202f9f548a59b86ef0c8a97c2af19
Gerrit-PatchSet: 2
Gerrit-Project: vdsm
Gerrit-Branch: master
Gerrit-Owner: Mark Wu <wudxw(a)linux.vnet.ibm.com>
Gerrit-Reviewer: Dan Kenigsberg <danken(a)redhat.com>
Gerrit-Reviewer: Mark Wu <wudxw(a)linux.vnet.ibm.com>
Gerrit-Reviewer: Yaniv Bronhaim <ybronhei(a)redhat.com>
Gerrit-Reviewer: oVirt Jenkins CI Server
Dan Kenigsberg has posted comments on this change.
Change subject: Separate sampling code from vdsm.utils
......................................................................
Patch Set 2: Looks good to me, approved
Mark, have you overheard it when I've asked Yaniv to perform this very same separation? I like it very much!
--
To view, visit http://gerrit.ovirt.org/13838
To unsubscribe, visit http://gerrit.ovirt.org/settings
Gerrit-MessageType: comment
Gerrit-Change-Id: I1de4c81b3cf202f9f548a59b86ef0c8a97c2af19
Gerrit-PatchSet: 2
Gerrit-Project: vdsm
Gerrit-Branch: master
Gerrit-Owner: Mark Wu <wudxw(a)linux.vnet.ibm.com>
Gerrit-Reviewer: Dan Kenigsberg <danken(a)redhat.com>
Gerrit-Reviewer: Mark Wu <wudxw(a)linux.vnet.ibm.com>
Gerrit-Reviewer: Yaniv Bronhaim <ybronhei(a)redhat.com>
Gerrit-Reviewer: oVirt Jenkins CI Server
oVirt Jenkins CI Server has posted comments on this change.
Change subject: Separate sampling code from vdsm.utils
......................................................................
Patch Set 2:
Build Successful
http://jenkins.ovirt.org/job/vdsm_unit_tests_gerrit/2002/ : SUCCESS
http://jenkins.ovirt.org/job/vdsm_pep8_gerrit/1946/ : SUCCESS
--
To view, visit http://gerrit.ovirt.org/13838
To unsubscribe, visit http://gerrit.ovirt.org/settings
Gerrit-MessageType: comment
Gerrit-Change-Id: I1de4c81b3cf202f9f548a59b86ef0c8a97c2af19
Gerrit-PatchSet: 2
Gerrit-Project: vdsm
Gerrit-Branch: master
Gerrit-Owner: Mark Wu <wudxw(a)linux.vnet.ibm.com>
Gerrit-Reviewer: Mark Wu <wudxw(a)linux.vnet.ibm.com>
Gerrit-Reviewer: oVirt Jenkins CI Server
Mark Wu has posted comments on this change.
Change subject: Separate sampling code from vdsm.utils
......................................................................
Patch Set 2: Verified
--
To view, visit http://gerrit.ovirt.org/13838
To unsubscribe, visit http://gerrit.ovirt.org/settings
Gerrit-MessageType: comment
Gerrit-Change-Id: I1de4c81b3cf202f9f548a59b86ef0c8a97c2af19
Gerrit-PatchSet: 2
Gerrit-Project: vdsm
Gerrit-Branch: master
Gerrit-Owner: Mark Wu <wudxw(a)linux.vnet.ibm.com>
Gerrit-Reviewer: Mark Wu <wudxw(a)linux.vnet.ibm.com>
Gerrit-Reviewer: oVirt Jenkins CI Server