Change in vdsm[master]: NetReload: netmodels for addNetwork
by Dan Kenigsberg
Dan Kenigsberg has submitted this change and it was merged.
Change subject: NetReload: netmodels for addNetwork
......................................................................
NetReload: netmodels for addNetwork
This patch defines the netwok entities that we use in oVirt:
- NetDevice,
- Bridge,
- Vlan,
- Bond,
- Nic
These entities are now responsible for their underlying devices for
the addNetwork step.
The interaction is as follows:
1. addNetwork -(generates netmodels via)-> objectivizeNetwork
2. "configure(logical_net)" is called on the top network device,
3. The top network device calls configure for its device type on the
configurator, that in turn calls configure in any underlying device.
In a following patch, they shall take
responsibility as well for network deleting.
Change-Id: Iba5c5b84760e27245cbe34c3b290c54e51278e72
Signed-off-by: Antoni S. Puimedon <asegurap(a)redhat.com>
---
M lib/vdsm/netinfo.py
M tests/Makefile.am
M tests/configNetworkTests.py
A tests/netmodelsTests.py
M vdsm.spec.in
M vdsm/API.py
M vdsm/Makefile.am
M vdsm/configNetwork.py
M vdsm/netconf/ifcfg.py
A vdsm/netmodels.py
10 files changed, 661 insertions(+), 447 deletions(-)
Approvals:
Antoni Segura Puimedon: Verified
Dan Kenigsberg: Looks good to me, approved
--
To view, visit http://gerrit.ovirt.org/14303
To unsubscribe, visit http://gerrit.ovirt.org/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Iba5c5b84760e27245cbe34c3b290c54e51278e72
Gerrit-PatchSet: 22
Gerrit-Project: vdsm
Gerrit-Branch: master
Gerrit-Owner: Antoni Segura Puimedon <asegurap(a)redhat.com>
Gerrit-Reviewer: Antoni Segura Puimedon <asegurap(a)redhat.com>
Gerrit-Reviewer: Dan Kenigsberg <danken(a)redhat.com>
Gerrit-Reviewer: Giuseppe Vallarelli <gvallare(a)redhat.com>
Gerrit-Reviewer: Livnat Peer <lpeer(a)redhat.com>
Gerrit-Reviewer: Mark Wu <wudxw(a)linux.vnet.ibm.com>
Gerrit-Reviewer: oVirt Jenkins CI Server
10 years, 10 months
Change in vdsm[master]: NetReload: netmodels for addNetwork
by Dan Kenigsberg
Dan Kenigsberg has posted comments on this change.
Change subject: NetReload: netmodels for addNetwork
......................................................................
Patch Set 22: Looks good to me, approved
basically copying Mark's ack. Thanks!
--
To view, visit http://gerrit.ovirt.org/14303
To unsubscribe, visit http://gerrit.ovirt.org/settings
Gerrit-MessageType: comment
Gerrit-Change-Id: Iba5c5b84760e27245cbe34c3b290c54e51278e72
Gerrit-PatchSet: 22
Gerrit-Project: vdsm
Gerrit-Branch: master
Gerrit-Owner: Antoni Segura Puimedon <asegurap(a)redhat.com>
Gerrit-Reviewer: Antoni Segura Puimedon <asegurap(a)redhat.com>
Gerrit-Reviewer: Dan Kenigsberg <danken(a)redhat.com>
Gerrit-Reviewer: Giuseppe Vallarelli <gvallare(a)redhat.com>
Gerrit-Reviewer: Livnat Peer <lpeer(a)redhat.com>
Gerrit-Reviewer: Mark Wu <wudxw(a)linux.vnet.ibm.com>
Gerrit-Reviewer: oVirt Jenkins CI Server
10 years, 10 months
Change in vdsm[master]: [WIP] vdsm: memory overcommitment reporting
by peet@redhat.com
Peter V. Saveliev has uploaded a new change for review.
Change subject: [WIP] vdsm: memory overcommitment reporting
......................................................................
[WIP] vdsm: memory overcommitment reporting
The patch changes memory overcommitment behaviour. Now the
available memory amount will not be reported as a negative
number in the case of overcommitment, API return 0 for
memAvailable and some value for memOvercommit, e.g.:
was:
memAvailable = -1976
now:
memAvailable = 0
memOvercommit = 1976
In the case there is no overcommitment, memOvercommit is
reported as 0.
The reason behind this patch is that reporting negative
number as available memory is a little bit confusing and
can be treated as a bug, though it is not.
Bug-Url: https://bugzilla.redhat.com/show_bug.cgi?id=956750
Signed-off-by: Peter V. Saveliev <peet(a)redhat.com>
Change-Id: Icfb8bf886197c943ffa67d945755fe1c89fa5902
---
M vdsm/API.py
1 file changed, 12 insertions(+), 2 deletions(-)
git pull ssh://gerrit.ovirt.org:29418/vdsm refs/changes/28/15328/1
diff --git a/vdsm/API.py b/vdsm/API.py
index ee72116..8c370ab 100644
--- a/vdsm/API.py
+++ b/vdsm/API.py
@@ -1154,7 +1154,9 @@
decStats = self._cif._hostStats.get()
for var in decStats:
stats[var] = utils.convertToStr(decStats[var])
- stats['memAvailable'] = self._memAvailable() / Mbytes
+ available, overcommit = self._memAvailable()
+ stats['memAvailable'] = available / Mbytes
+ stats['memOvercommit'] = overcommit / Mbytes
stats['memCommitted'] = self._memCommitted() / Mbytes
stats['swapTotal'], stats['swapFree'] = _readSwapTotalFree()
stats['vmCount'], stats['vmActive'], stats['vmMigrating'] = \
@@ -1395,6 +1397,7 @@
"""
memCommitted = self._memCommitted()
resident = 0
+ overcommit = 0
for v in self._cif.vmContainer.values():
if v.conf['pid'] == '0':
continue
@@ -1407,8 +1410,15 @@
meminfo = utils.readMemInfo()
freeOrCached = (meminfo['MemFree'] +
meminfo['Cached'] + meminfo['Buffers']) * Kbytes
- return freeOrCached + resident - memCommitted - \
+ available = freeOrCached + resident - memCommitted - \
config.getint('vars', 'host_mem_reserve') * Mbytes
+ if available < 0:
+ # memory overcommitment is really possible situation, so
+ # we should take it into account, but to report negative
+ # memory amount is a bad idea
+ overcommit = abs(available)
+ available = 0
+ return available, overcommit
def _memShared(self):
"""
--
To view, visit http://gerrit.ovirt.org/15328
To unsubscribe, visit http://gerrit.ovirt.org/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Icfb8bf886197c943ffa67d945755fe1c89fa5902
Gerrit-PatchSet: 1
Gerrit-Project: vdsm
Gerrit-Branch: master
Gerrit-Owner: Peter V. Saveliev <peet(a)redhat.com>
10 years, 10 months
Change in vdsm[master]: NetReload: netmodels for addNetwork
by asegurap@redhat.com
Antoni Segura Puimedon has posted comments on this change.
Change subject: NetReload: netmodels for addNetwork
......................................................................
Patch Set 22: Verified
Just changed isVlanned as per Dan's suggestion. Rerun some tests and everything is green.
--
To view, visit http://gerrit.ovirt.org/14303
To unsubscribe, visit http://gerrit.ovirt.org/settings
Gerrit-MessageType: comment
Gerrit-Change-Id: Iba5c5b84760e27245cbe34c3b290c54e51278e72
Gerrit-PatchSet: 22
Gerrit-Project: vdsm
Gerrit-Branch: master
Gerrit-Owner: Antoni Segura Puimedon <asegurap(a)redhat.com>
Gerrit-Reviewer: Antoni Segura Puimedon <asegurap(a)redhat.com>
Gerrit-Reviewer: Dan Kenigsberg <danken(a)redhat.com>
Gerrit-Reviewer: Giuseppe Vallarelli <gvallare(a)redhat.com>
Gerrit-Reviewer: Livnat Peer <lpeer(a)redhat.com>
Gerrit-Reviewer: Mark Wu <wudxw(a)linux.vnet.ibm.com>
Gerrit-Reviewer: oVirt Jenkins CI Server
10 years, 10 months
Change in vdsm[master]: NetReload: netmodels for addNetwork
by wudxw@linux.vnet.ibm.com
Mark Wu has posted comments on this change.
Change subject: NetReload: netmodels for addNetwork
......................................................................
Patch Set 21: Looks good to me, but someone else must approve
--
To view, visit http://gerrit.ovirt.org/14303
To unsubscribe, visit http://gerrit.ovirt.org/settings
Gerrit-MessageType: comment
Gerrit-Change-Id: Iba5c5b84760e27245cbe34c3b290c54e51278e72
Gerrit-PatchSet: 21
Gerrit-Project: vdsm
Gerrit-Branch: master
Gerrit-Owner: Antoni Segura Puimedon <asegurap(a)redhat.com>
Gerrit-Reviewer: Antoni Segura Puimedon <asegurap(a)redhat.com>
Gerrit-Reviewer: Dan Kenigsberg <danken(a)redhat.com>
Gerrit-Reviewer: Giuseppe Vallarelli <gvallare(a)redhat.com>
Gerrit-Reviewer: Livnat Peer <lpeer(a)redhat.com>
Gerrit-Reviewer: Mark Wu <wudxw(a)linux.vnet.ibm.com>
Gerrit-Reviewer: oVirt Jenkins CI Server
10 years, 10 months
Change in vdsm[master]: NetReload: netmodels for addNetwork
by Dan Kenigsberg
Dan Kenigsberg has posted comments on this change.
Change subject: NetReload: netmodels for addNetwork
......................................................................
Patch Set 21: (1 inline comment)
....................................................
File lib/vdsm/netinfo.py
Line 446: return d
Line 447:
Line 448:
Line 449: def isVlanned(dev):
Line 450: return len(glob.glob(PROC_NET_VLAN + dev + '.*')) != 0
I kinda prefer iglob (which avoids list allocation). But I wonder why is it a bit different to the implementation of the vlans() function. I'd prefer
return any([vlan.startswith(dev + '.') for vlan in vlans()])
and if PROC_NET_VLAN is safer than /sys/class/net (I think that it is!), that should be fixed in vlans().
Line 451:
Line 452:
Line 453: def getVlanDevice(vlan):
Line 454: """ Return the device of the given VLAN. """
--
To view, visit http://gerrit.ovirt.org/14303
To unsubscribe, visit http://gerrit.ovirt.org/settings
Gerrit-MessageType: comment
Gerrit-Change-Id: Iba5c5b84760e27245cbe34c3b290c54e51278e72
Gerrit-PatchSet: 21
Gerrit-Project: vdsm
Gerrit-Branch: master
Gerrit-Owner: Antoni Segura Puimedon <asegurap(a)redhat.com>
Gerrit-Reviewer: Antoni Segura Puimedon <asegurap(a)redhat.com>
Gerrit-Reviewer: Dan Kenigsberg <danken(a)redhat.com>
Gerrit-Reviewer: Giuseppe Vallarelli <gvallare(a)redhat.com>
Gerrit-Reviewer: Livnat Peer <lpeer(a)redhat.com>
Gerrit-Reviewer: Mark Wu <wudxw(a)linux.vnet.ibm.com>
Gerrit-Reviewer: oVirt Jenkins CI Server
10 years, 10 months
Change in vdsm[master]: mom: add mom balloon functional tests for running vms
by dfediuck@redhat.com
Doron Fediuck has posted comments on this change.
Change subject: mom: add mom balloon functional tests for running vms
......................................................................
Patch Set 5: Looks good to me, but someone else must approve
--
To view, visit http://gerrit.ovirt.org/13156
To unsubscribe, visit http://gerrit.ovirt.org/settings
Gerrit-MessageType: comment
Gerrit-Change-Id: I922568233dc769d83e2fdffe1c24439d13d03d7e
Gerrit-PatchSet: 5
Gerrit-Project: vdsm
Gerrit-Branch: master
Gerrit-Owner: Mei Liu <liumbj(a)linux.vnet.ibm.com>
Gerrit-Reviewer: Doron Fediuck <dfediuck(a)redhat.com>
Gerrit-Reviewer: Mark Wu <wudxw(a)linux.vnet.ibm.com>
Gerrit-Reviewer: Martin Sivák <msivak(a)redhat.com>
Gerrit-Reviewer: Mei Liu <liumbj(a)linux.vnet.ibm.com>
Gerrit-Reviewer: Zhou Zheng Sheng <zhshzhou(a)linux.vnet.ibm.com>
Gerrit-Reviewer: oVirt Jenkins CI Server
10 years, 10 months