Change in vdsm[master]: py3: let bulk_sampling_test pass under py3
by Dan Kenigsberg
Dan Kenigsberg has uploaded a new change for review.
Change subject: py3: let bulk_sampling_test pass under py3
......................................................................
py3: let bulk_sampling_test pass under py3
Change-Id: Ic8f148a7984fab0a092fca588b5de61bdeb4e899
Signed-off-by: Dan Kenigsberg <danken(a)redhat.com>
---
M lib/vdsm/virt/sampling.py
M lib/vdsm/virt/utils.py
M tests/Makefile.am
3 files changed, 8 insertions(+), 7 deletions(-)
git pull ssh://gerrit.ovirt.org:29418/vdsm refs/changes/06/65006/1
diff --git a/lib/vdsm/virt/sampling.py b/lib/vdsm/virt/sampling.py
index 87e86c6..e8fa2c1 100644
--- a/lib/vdsm/virt/sampling.py
+++ b/lib/vdsm/virt/sampling.py
@@ -18,6 +18,7 @@
# Refer to the README and COPYING files for full details of the license
#
from __future__ import absolute_import
+import six
"""
Support for VM and host statistics sampling.
@@ -279,12 +280,12 @@
def to_connlog(self):
text = ', '.join(
('%s:(%s)' % (ifid, ifacesample.to_connlog()))
- for (ifid, ifacesample) in self.interfaces.iteritems())
+ for (ifid, ifacesample) in six.iteritems(self.interfaces))
return ('recent_client:%s, ' % self.recentClient) + text
def connlog_diff(self, other):
text = ''
- for ifid, sample in self.interfaces.iteritems():
+ for ifid, sample in six.iteritems(self.interfaces):
if ifid in other.interfaces:
diff = sample.connlog_diff(other.interfaces[ifid])
if diff:
@@ -292,7 +293,7 @@
else:
text += 'new %s:(%s) ' % (ifid, sample.to_connlog())
- for ifid, sample in other.interfaces.iteritems():
+ for ifid, sample in six.iteritems(other.interfaces):
if ifid not in self.interfaces:
text += 'dropped %s:(%s) ' % (ifid, sample.to_connlog())
@@ -560,14 +561,14 @@
vm_sample.first_value,
vm_sample.last_value,
vm_sample.interval)
- for vm_id, vm_sample in vm_samples.items()
+ for vm_id, vm_sample in six.iteritems(vm_samples)
}
vmstats.send_metrics(stats)
def _get_responsive_doms(self):
vms = self._get_vms()
doms = []
- for vm_id, vm_obj in vms.iteritems():
+ for vm_id, vm_obj in six.iteritems(vms):
to_skip = self._skip_doms.get(vm_id, False)
if to_skip:
continue
diff --git a/lib/vdsm/virt/utils.py b/lib/vdsm/virt/utils.py
index 1d215e0..7d64a28 100644
--- a/lib/vdsm/virt/utils.py
+++ b/lib/vdsm/virt/utils.py
@@ -18,6 +18,7 @@
# Refer to the README and COPYING files for full details of the license
#
from __future__ import absolute_import
+import six
"""
shared utilities and common code for the virt package
@@ -93,7 +94,7 @@
with self._lock:
expired_keys = [
key for key, (expiration, _)
- in self._items.iteritems()
+ in six.iteritems(self._items)
if expiration <= now]
for key in expired_keys:
del self._items[key]
diff --git a/tests/Makefile.am b/tests/Makefile.am
index fb3d7c3..c690f3e 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -167,7 +167,6 @@
blockVolumeTests.py \
blocksdTests.py \
bridgeTests.py \
- bulk_sampling_test.py \
cPopenTests.py \
clientifTests.py \
deviceTests.py \
--
To view, visit https://gerrit.ovirt.org/65006
To unsubscribe, visit https://gerrit.ovirt.org/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ic8f148a7984fab0a092fca588b5de61bdeb4e899
Gerrit-PatchSet: 1
Gerrit-Project: vdsm
Gerrit-Branch: master
Gerrit-Owner: Dan Kenigsberg <danken(a)redhat.com>
7 years, 6 months
Change in vdsm[master]: **WIP** tool: reconfigure containers networks
by fromani＠redhat.com
Francesco Romani has uploaded a new change for review.
Change subject: **WIP** tool: reconfigure containers networks
......................................................................
**WIP** tool: reconfigure containers networks
TODO: properly integrate into vdsm-tool
Added as PoC/placeholder
Change-Id: I6053e283c004cd61ba7727cea22ba73a631180ba
Signed-off-by: Francesco Romani <fromani(a)redhat.com>
---
A contrib/cont-setup-net
1 file changed, 53 insertions(+), 0 deletions(-)
git pull ssh://gerrit.ovirt.org:29418/vdsm refs/changes/18/60918/1
diff --git a/contrib/cont-setup-net b/contrib/cont-setup-net
new file mode 100755
index 0000000..7bc7c07
--- /dev/null
+++ b/contrib/cont-setup-net
@@ -0,0 +1,53 @@
+#!/usr/bin/env python
+
+# TODO: integrate into vdsm-tool
+
+import argparse
+import logging
+import sys
+
+from vdsm.virt.containers import config
+from vdsm.virt.containers import runtime
+
+
+_DEFAULT_OVIRT_NET = 'ovirtmgmt'
+_DEFAULT_SUBNET = '10.1.0.0'
+_DEFAULT_MASK = 24
+
+
+def _main():
+ parser = argparse.ArgumentParser()
+ parser.add_argument('--name', type=str, nargs='?',
+ default=_DEFAULT_OVIRT_NET,
+ help='network name to use')
+ parser.add_argument('--bridge', type=str, nargs='?',
+ default=_DEFAULT_OVIRT_NET,
+ help='bridge to use')
+ parser.add_argument('--subnet', type=str, nargs='?',
+ default=_DEFAULT_SUBNET,
+ help='subnet to use')
+ parser.add_argument('--mask', type=int, nargs='?',
+ default=_DEFAULT_MASK,
+ help='netmask to use')
+ args = parser.parse_args()
+
+ runtimes = convirt.runtime.supported()
+ if not runtimes:
+ logging.warning('no runtimes detected, nothing to do')
+ return
+
+ logging.info('configuring runtimes: %s', runtimes)
+
+ config.network.update(
+ name=args.name,
+ bridge=args.bridge,
+ subnet=args.subnet,
+ mask=args.mask,
+ )
+
+ runtime.configure()
+
+
+if __name__ == "__main__":
+ logging.basicConfig(level=logging.DEBUG)
+ _main()
--
To view, visit https://gerrit.ovirt.org/60918
To unsubscribe, visit https://gerrit.ovirt.org/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I6053e283c004cd61ba7727cea22ba73a631180ba
Gerrit-PatchSet: 1
Gerrit-Project: vdsm
Gerrit-Branch: master
Gerrit-Owner: Francesco Romani <fromani(a)redhat.com>
7 years, 6 months
Change in vdsm[master]: config: add tunables for container support
by fromani＠redhat.com
Francesco Romani has uploaded a new change for review.
Change subject: config: add tunables for container support
......................................................................
config: add tunables for container support
Add the config items we'll need later on
Change-Id: I30e4372fc88ebb7e68cc3b982af3c2eefacef7ce
Signed-off-by: Francesco Romani <fromani(a)redhat.com>
---
M lib/vdsm/config.py.in
1 file changed, 20 insertions(+), 0 deletions(-)
git pull ssh://gerrit.ovirt.org:29418/vdsm refs/changes/43/64243/1
diff --git a/lib/vdsm/config.py.in b/lib/vdsm/config.py.in
index 695e790..c63eb41 100644
--- a/lib/vdsm/config.py.in
+++ b/lib/vdsm/config.py.in
@@ -522,6 +522,26 @@
'development only. Value is comma delimeted.'),
]),
+ # Section: [containers]
+ ('containers', [
+
+ ('cgroup_slice', 'machine',
+ 'Run the containers in this cgroup slice.'),
+
+ ('network_name', 'ovirt',
+ 'human-friendly name for the configuration of the container '
+ 'runtime network. Used only for identification.'),
+
+ ('network_bridge', 'ovirtmgmt',
+ 'network bridge to use for the containers networking'),
+
+ ('network_subnet', '10.1.0.0',
+ 'private subnet address for the containers'),
+
+ ('network_mask', '20',
+ 'network mask for the network_subnet'),
+ ]),
+
# Section: [tests]
('tests', [
--
To view, visit https://gerrit.ovirt.org/64243
To unsubscribe, visit https://gerrit.ovirt.org/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I30e4372fc88ebb7e68cc3b982af3c2eefacef7ce
Gerrit-PatchSet: 1
Gerrit-Project: vdsm
Gerrit-Branch: master
Gerrit-Owner: Francesco Romani <fromani(a)redhat.com>
7 years, 6 months
Change in vdsm[master]: virt: Try to detect non guest iniated shutdowns
by Vinzenz Feenstra
Vinzenz Feenstra has uploaded a new change for review.
Change subject: virt: Try to detect non guest iniated shutdowns
......................................................................
virt: Try to detect non guest iniated shutdowns
When a host system shutsdown due to a variety of reasons (USP, fencing...)
VMs running on that system get stopped before VDSM and libvirtd services
are stopped. This is due to the way how they are registerd with machined.
This results in the qemu processes being signaled with SIG_TERM and them
exiting. To libvirt this looks the same as if the shutdown would have been
initiated from within the VM and therefore emits a lifecycle event that
looks to VDSM as if the VM was stopped from within. VDSM in this case
reports the exit reason as user shutdown. This is a problem for HA VMs
which will not be automatically rescheduled when they see a user shutdown
exit reason.
This patch attempts to detect non user shutdowns. This requires the VM to
have the ovirt guest agent running to detect these scenarios properly.
Change-Id: Ie04b9806fbf0a81dc576aa28cfdda5edb079ce29
Signed-off-by: Vinzenz Feenstra <vfeenstr(a)redhat.com>
---
M lib/vdsm/virt/guestagent.py
M vdsm/virt/vm.py
2 files changed, 20 insertions(+), 1 deletion(-)
git pull ssh://gerrit.ovirt.org:29418/vdsm refs/changes/91/64991/1
diff --git a/lib/vdsm/virt/guestagent.py b/lib/vdsm/virt/guestagent.py
index f2d45a3..487e4d8 100644
--- a/lib/vdsm/virt/guestagent.py
+++ b/lib/vdsm/virt/guestagent.py
@@ -33,6 +33,7 @@
from vdsm import supervdsm
from vdsm import utils
from vdsm.common import filecontrol
+from vdsm.config import config
from vdsm.virt import vmstatus
_MAX_SUPPORTED_API_VERSION = 3
@@ -150,6 +151,8 @@
class GuestAgent(object):
MAX_MESSAGE_SIZE = 2 ** 20 # 1 MiB for now
+ SEEN_SHUTDOWN_TIMEOUT = config.get_int('general',
+ 'sys_shutdown_timeout', 120) * 2
def __init__(self, socketName, channelListener, log, onStatusChange,
api_version=None, user='Unknown', ips=''):
@@ -181,6 +184,13 @@
self._completion_lock = threading.Lock()
self._completion_events = {}
self._first_connect = threading.Event()
+ self._seen_shutdown = False
+
+ def has_seen_shutdown(self):
+ diff = time.time() - self._agentTimestamp
+ if diff < GuestAgent.SEEN_SHUTDOWN_TIMEOUT:
+ return self._seen_shutdown
+ return False
def _on_completion(self, reply_id):
with self._completion_lock:
@@ -345,6 +355,7 @@
# Only change the state AFTER all data of the heartbeat has been
# consumed
self.guestStatus = vmstatus.UP
+ self._seen_shutdown = False
elif message == 'host-name':
self.guestInfo['guestName'] = args['name']
elif message == 'os-version':
@@ -387,10 +398,12 @@
self.log.debug("guest agent was uninstalled.")
self.guestInfo['appsList'] = ()
elif message == 'session-startup':
+ self._seen_shutdown = False
self.log.debug("Guest system is started or restarted.")
elif message == 'fqdn':
self.guestInfo['guestFQDN'] = args['fqdn']
elif message == 'session-shutdown':
+ self._seen_shutdown = True
self.log.debug("Guest system shuts down.")
elif message == 'containers':
self.guestInfo['guestContainers'] = args['list']
diff --git a/vdsm/virt/vm.py b/vdsm/virt/vm.py
index 6109c43..2f53cd8 100644
--- a/vdsm/virt/vm.py
+++ b/vdsm/virt/vm.py
@@ -4126,8 +4126,14 @@
hooks.after_vm_hibernate(self._domain.xml, self.conf)
else:
if detail == libvirt.VIR_DOMAIN_EVENT_STOPPED_SHUTDOWN:
+ # seen_shutdown is used to detect VMs that have been
+ # stopped by sending them SIG_TERM (e.g. system shutdown)
+ # In that case libvirt and qemu report a user initiated
+ # shutdown that is not correct.
+ seen_shutdown = not self.guestAgent or \
+ self.guestAgent.has_seen_shutdown()
with self._shutdownLock:
- if self._shutdownReason is None:
+ if self._shutdownReason is None and seen_shutdown:
# do not overwrite admin shutdown, if present
self._shutdownReason = vmexitreason.USER_SHUTDOWN
self._onQemuDeath()
--
To view, visit https://gerrit.ovirt.org/64991
To unsubscribe, visit https://gerrit.ovirt.org/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ie04b9806fbf0a81dc576aa28cfdda5edb079ce29
Gerrit-PatchSet: 1
Gerrit-Project: vdsm
Gerrit-Branch: master
Gerrit-Owner: Vinzenz Feenstra <vfeenstr(a)redhat.com>
7 years, 6 months
Change in vdsm[master]: network: filter out 'veth' devices.
by fromani＠redhat.com
Francesco Romani has uploaded a new change for review.
Change subject: network: filter out 'veth' devices.
......................................................................
network: filter out 'veth' devices.
The `rkt' networking uses a pair of veth for its networking needs;
this configuration step should not be disabled, because it covers
an internal use case, as detailed in
https://coreos.com/rkt/docs/latest/networking/overview.html#the-default-n...
This patch makes the Vdsm code ignore this veth pair.
Change-Id: I859c4bc885c0afd99fdaf741706d9bd1538850e6
Signed-off-by: Francesco Romani <fromani(a)redhat.com>
---
M lib/vdsm/network/netinfo/qos.py
1 file changed, 2 insertions(+), 1 deletion(-)
git pull ssh://gerrit.ovirt.org:29418/vdsm refs/changes/21/60821/1
diff --git a/lib/vdsm/network/netinfo/qos.py b/lib/vdsm/network/netinfo/qos.py
index 6268587..90ee72d 100644
--- a/lib/vdsm/network/netinfo/qos.py
+++ b/lib/vdsm/network/netinfo/qos.py
@@ -36,7 +36,8 @@
iface = attrs['iface']
if iface in netinfo['bridges']:
host_ports = [port for port in attrs['ports'] if
- not port.startswith('vnet')]
+ (not port.startswith('vnet') and
+ not port.startswith('veth'))]
if not host_ports: # Port-less bridge
continue
iface, = host_ports
--
To view, visit https://gerrit.ovirt.org/60821
To unsubscribe, visit https://gerrit.ovirt.org/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I859c4bc885c0afd99fdaf741706d9bd1538850e6
Gerrit-PatchSet: 1
Gerrit-Project: vdsm
Gerrit-Branch: master
Gerrit-Owner: Francesco Romani <fromani(a)redhat.com>
7 years, 6 months
Change in vdsm[master]: tests: Add basic tests for RWLock
by alitke＠redhat.com
Adam Litke has uploaded a new change for review.
Change subject: tests: Add basic tests for RWLock
......................................................................
tests: Add basic tests for RWLock
Change-Id: I77b9ea1cd6d378738fbf14de119c88bf0ebc94e2
Signed-off-by: Adam Litke <alitke(a)redhat.com>
---
M tests/miscTests.py
1 file changed, 18 insertions(+), 0 deletions(-)
git pull ssh://gerrit.ovirt.org:29418/vdsm refs/changes/72/42772/1
diff --git a/tests/miscTests.py b/tests/miscTests.py
index 976b503..c6d9690 100644
--- a/tests/miscTests.py
+++ b/tests/miscTests.py
@@ -1268,3 +1268,21 @@
def _run(self):
self.result = self._func()
+
+
+class RWLockTests(TestCaseBase):
+
+ def test_multiple_acquire(self):
+ lock = misc.RWLock()
+ self.assertTrue(lock.acquire(exclusive=True))
+ self.assertTrue(lock.acquire(exclusive=True))
+
+ def test_demote(self):
+ lock = misc.RWLock()
+ self.assertTrue(lock.acquire(exclusive=True))
+ self.assertTrue(lock.acquire(exclusive=False))
+
+ def test_promote(self):
+ lock = misc.RWLock()
+ self.assertTrue(lock.acquire(False))
+ self.assertRaises(RuntimeError, lock.acquire, True)
--
To view, visit https://gerrit.ovirt.org/42772
To unsubscribe, visit https://gerrit.ovirt.org/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I77b9ea1cd6d378738fbf14de119c88bf0ebc94e2
Gerrit-PatchSet: 1
Gerrit-Project: vdsm
Gerrit-Branch: master
Gerrit-Owner: Adam Litke <alitke(a)redhat.com>
7 years, 6 months
Change in vdsm[master]: lvm: Fail loudly if called with unexptected input.
by Nir Soffer
Nir Soffer has uploaded a new change for review.
Change subject: lvm: Fail loudly if called with unexptected input.
......................................................................
lvm: Fail loudly if called with unexptected input.
When creating pvs with the force option, we are very carefull to accept
only True. When using the jsonrpc transport, engine was sending "true"
and "false", causing the call to fail misteiously.
Now we are also carefull about rejecting invlid input, making debugging
easier.
Change-Id: If9e6754d4aa2efaf894a9309cfaa4595d710063b
Signed-off-by: Nir Soffer <nsoffer(a)redhat.com>
---
M vdsm/storage/lvm.py
1 file changed, 5 insertions(+), 0 deletions(-)
git pull ssh://gerrit.ovirt.org:29418/vdsm refs/changes/29/37329/1
diff --git a/vdsm/storage/lvm.py b/vdsm/storage/lvm.py
index aa3c04b..549839a 100644
--- a/vdsm/storage/lvm.py
+++ b/vdsm/storage/lvm.py
@@ -724,6 +724,11 @@
else:
raise
+ # We must be very carefull here; any value execpt True or False is a user
+ # error.
+ if type(force) != bool:
+ raise ValueError("Invalid value for 'force': %r" % force)
+
if force is True:
options = ("-y", "-ff")
_initpvs_removeHolders()
--
To view, visit http://gerrit.ovirt.org/37329
To unsubscribe, visit http://gerrit.ovirt.org/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: If9e6754d4aa2efaf894a9309cfaa4595d710063b
Gerrit-PatchSet: 1
Gerrit-Project: vdsm
Gerrit-Branch: master
Gerrit-Owner: Nir Soffer <nsoffer(a)redhat.com>
7 years, 6 months
Change in vdsm[master]: static: move man
by Martin Polednik
Martin Polednik has uploaded a new change for review.
Change subject: static: move man
......................................................................
static: move man
Change-Id: I91fa36b38904d85fc60734ce966b8d993911b490
Signed-off-by: Martin Polednik <mpolednik(a)redhat.com>
---
M static/Makefile.am
R static/usr/share/man/man8/vdsmd.8.in
M vdsm/Makefile.am
3 files changed, 5 insertions(+), 4 deletions(-)
git pull ssh://gerrit.ovirt.org:29418/vdsm refs/changes/49/62549/1
diff --git a/static/Makefile.am b/static/Makefile.am
index 5024d63..360ed54 100644
--- a/static/Makefile.am
+++ b/static/Makefile.am
@@ -20,6 +20,9 @@
include $(top_srcdir)/build-aux/Makefile.subs
+man8_MANS = \
+ ./usr/share/man/man8/vdsmd.8
+
vdsm_DATA = \
./usr/share/vdsm/bonding-defaults.json \
./usr/share/vdsm/bonding-name2numeric.json \
@@ -98,6 +101,7 @@
$(sudoers_DATA) \
$(systemdunit_DATA) \
$(vdsmconf_DATA) \
+ $(man8_MANS) \
$(NULL)
EXTRA_DIST = \
@@ -116,4 +120,5 @@
./usr/lib/systemd/system/supervdsmd.service.in \
./usr/lib/systemd/system/vdsm-network.service.in \
./usr/lib/systemd/system/vdsmd.service.in \
+ ./usr/share/man/man8/vdsmd.8.in \
$(NULL)
diff --git a/vdsm/vdsmd.8.in b/static/usr/share/man/man8/vdsmd.8.in
similarity index 100%
rename from vdsm/vdsmd.8.in
rename to static/usr/share/man/man8/vdsmd.8.in
diff --git a/vdsm/Makefile.am b/vdsm/Makefile.am
index 734c900..9077ddc 100644
--- a/vdsm/Makefile.am
+++ b/vdsm/Makefile.am
@@ -54,9 +54,6 @@
vdsm-restore-net-config \
$(NULL)
-nodist_man8_MANS = \
- vdsmd.8
-
CLEANFILES = \
config.log \
$(nodist_vdsm_SCRIPTS) \
@@ -76,7 +73,6 @@
vdsm-libvirt-access.rules \
vdsm-logrotate \
vdsm-store-net-config.in \
- vdsmd.8.in \
$(NULL)
all-local: \
--
To view, visit https://gerrit.ovirt.org/62549
To unsubscribe, visit https://gerrit.ovirt.org/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I91fa36b38904d85fc60734ce966b8d993911b490
Gerrit-PatchSet: 1
Gerrit-Project: vdsm
Gerrit-Branch: master
Gerrit-Owner: Martin Polednik <mpolednik(a)redhat.com>
7 years, 6 months
Change in vdsm[master]: static: move vdsm bonding defaults under static
by Martin Polednik
Martin Polednik has uploaded a new change for review.
Change subject: static: move vdsm bonding defaults under static
......................................................................
static: move vdsm bonding defaults under static
Part of the move of static files to new directory. The files are
moved to corresponding *expected* path under static
(/usr/share/vdsm).
Change-Id: I9cbd81e59aec49876e15337d7cd617e51316a604
Signed-off-by: Martin Polednik <mpolednik(a)redhat.com>
---
M static/Makefile.am
R static/usr/share/vdsm/bonding-defaults.json
R static/usr/share/vdsm/bonding-name2numeric.json
M vdsm/Makefile.am
4 files changed, 6 insertions(+), 14 deletions(-)
git pull ssh://gerrit.ovirt.org:29418/vdsm refs/changes/37/62537/1
diff --git a/static/Makefile.am b/static/Makefile.am
index f182190..5024d63 100644
--- a/static/Makefile.am
+++ b/static/Makefile.am
@@ -20,6 +20,11 @@
include $(top_srcdir)/build-aux/Makefile.subs
+vdsm_DATA = \
+ ./usr/share/vdsm/bonding-defaults.json \
+ ./usr/share/vdsm/bonding-name2numeric.json \
+ $(NULL)
+
vdsmconf_DATA = \
./etc/vdsm/logger.conf \
./etc/vdsm/mom.conf \
@@ -101,6 +106,7 @@
$(modulesload_DATA) \
$(sysctl_DATA) \
$(vdsmconfrotate_DATA) \
+ $(vdsm_DATA) \
./etc/rwtab.d/vdsm.in \
./etc/sudoers.d/50_vdsm.in \
./etc/vdsm/logger.conf.in \
diff --git a/vdsm/bonding-defaults.json b/static/usr/share/vdsm/bonding-defaults.json
similarity index 100%
rename from vdsm/bonding-defaults.json
rename to static/usr/share/vdsm/bonding-defaults.json
diff --git a/vdsm/bonding-name2numeric.json b/static/usr/share/vdsm/bonding-name2numeric.json
similarity index 100%
rename from vdsm/bonding-name2numeric.json
rename to static/usr/share/vdsm/bonding-name2numeric.json
diff --git a/vdsm/Makefile.am b/vdsm/Makefile.am
index 6518129..734c900 100644
--- a/vdsm/Makefile.am
+++ b/vdsm/Makefile.am
@@ -67,8 +67,6 @@
$(nodist_man8_MANS)
EXTRA_DIST = \
- bonding-defaults.json \
- bonding-name2numeric.json \
dumpStorageTable.py.in \
libvirt_password \
mk_sysprep_floppy.in \
@@ -91,7 +89,6 @@
chmod 775 $(DESTDIR)$(localstatedir)/lib/libvirt/qemu/channels
install-data-local: \
- install-data-bonding-defaults \
install-data-dhclient-hooks \
install-data-libvirtpass \
install-data-logrotate \
@@ -114,7 +111,6 @@
$(MKDIR_P) $(DESTDIR)$(localstatedir)/lib/libvirt/qemu/channels
uninstall-local: \
- uninstall-data-bonding-defaults \
uninstall-data-dhclient-hooks \
uninstall-data-libvirtpass \
uninstall-data-logrotate \
@@ -127,16 +123,6 @@
uninstall-data-libvirtpass:
$(RM) $(DESTDIR)$(vdsmtsdir)/keys/libvirt_password
-
-install-data-bonding-defaults:
- $(INSTALL_DATA) -m 600 $(srcdir)/bonding-defaults.json \
- $(DESTDIR)$(vdsmdir)/bonding-defaults.json
- $(INSTALL_DATA) -m 600 $(srcdir)/bonding-name2numeric.json \
- $(DESTDIR)$(vdsmdir)/bonding-name2numeric.json
-
-uninstall-data-bonding-defaults:
- $(RM) $(DESTDIR)$(vdsmdir)/bonding-defaults.json
- $(RM) $(DESTDIR)$(vdsmdir)/bonding-name2numeric.json
install-data-logrotate:
$(MKDIR_P) $(DESTDIR)$(sysconfdir)/cron.hourly
--
To view, visit https://gerrit.ovirt.org/62537
To unsubscribe, visit https://gerrit.ovirt.org/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I9cbd81e59aec49876e15337d7cd617e51316a604
Gerrit-PatchSet: 1
Gerrit-Project: vdsm
Gerrit-Branch: master
Gerrit-Owner: Martin Polednik <mpolednik(a)redhat.com>
7 years, 6 months
Change in vdsm[master]: virt: Minor typo fixes in Vm.getStats docstring
by mzamazal＠redhat.com
Milan Zamazal has uploaded a new change for review.
Change subject: virt: Minor typo fixes in Vm.getStats docstring
......................................................................
virt: Minor typo fixes in Vm.getStats docstring
Change-Id: I4e07c9b237cf0af22ec8d0f7618ab655839839f2
Signed-off-by: Milan Zamazal <mzamazal(a)redhat.com>
---
M vdsm/virt/vm.py
1 file changed, 3 insertions(+), 4 deletions(-)
git pull ssh://gerrit.ovirt.org:29418/vdsm refs/changes/50/63550/1
diff --git a/vdsm/virt/vm.py b/vdsm/virt/vm.py
index c936987..2526051 100644
--- a/vdsm/virt/vm.py
+++ b/vdsm/virt/vm.py
@@ -1180,13 +1180,12 @@
def getStats(self):
"""
- used by API.Vm.getStats
+ Used by API.Vm.getStats.
- WARNING: this method should only gather statistics by copying data.
- Especially avoid costly and dangerous ditrect calls to the _dom
+ WARNING: This method should only gather statistics by copying data.
+ Especially avoid costly and dangerous direct calls to the _dom
attribute. Use the periodic operations instead!
"""
-
stats = {'statusTime': self._get_status_time()}
if self.lastStatus == vmstatus.DOWN:
stats.update(self._getDownVmStats())
--
To view, visit https://gerrit.ovirt.org/63550
To unsubscribe, visit https://gerrit.ovirt.org/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I4e07c9b237cf0af22ec8d0f7618ab655839839f2
Gerrit-PatchSet: 1
Gerrit-Project: vdsm
Gerrit-Branch: master
Gerrit-Owner: Milan Zamazal <mzamazal(a)redhat.com>
7 years, 6 months