vdsm-patches March 2014

vdsm-patches@lists.fedorahosted.org

40 participants
401 discussions

Change in vdsm[master]: Add man page for vdsm.conf
by Douglas Schilling Landgraf 05 Dec '14

05 Dec '14

Douglas Schilling Landgraf has uploaded a new change for review. Change subject: Add man page for vdsm.conf ...................................................................... Add man page for vdsm.conf Show to user the vdsm.conf options. Change-Id: Id8e5a47d484fa06070d4566a39cab8a7a53ea717 Signed-off-by: Douglas Schilling Landgraf <dougsland(a)redhat.com> --- M debian/vdsm.install M vdsm.spec.in M vdsm/Makefile.am A vdsm/vdsm.conf.5 4 files changed, 400 insertions(+), 0 deletions(-) git pull ssh://gerrit.ovirt.org:29418/vdsm refs/changes/91/22891/1 diff --git a/debian/vdsm.install b/debian/vdsm.install index ef46ed3..0c2b137 100644 --- a/debian/vdsm.install +++ b/debian/vdsm.install @@ -31,6 +31,7 @@ ./usr/libexec/vdsm/unpersist-vdsm-hook ./usr/libexec/vdsm/vdsm-gencerts.sh ./usr/libexec/vdsm/vdsmd_init_common.sh +./usr/share/man/man5/vdsm.conf.5 ./usr/share/man/man8/vdsmd.8 ./usr/share/vdsm/API.py ./usr/share/vdsm/BindingJsonRpc.py diff --git a/vdsm.spec.in b/vdsm.spec.in index 385a29b..364997b 100644 --- a/vdsm.spec.in +++ b/vdsm.spec.in @@ -1014,6 +1014,7 @@ %{python_sitelib}/sos/plugins/vdsm.py* /lib/udev/rules.d/12-vdsm-lvm.rules /etc/security/limits.d/99-vdsm.conf +%{_mandir}/man5/vdsm.conf.5* %{_mandir}/man8/vdsmd.8* %if 0%{?rhel} %dir %{_localstatedir}/log/core diff --git a/vdsm/Makefile.am b/vdsm/Makefile.am index 3834f55..1c1671e 100644 --- a/vdsm/Makefile.am +++ b/vdsm/Makefile.am @@ -89,6 +89,9 @@ vdsm-restore-net-config \ $(NULL) +dist_man5_MANS = \ + vdsm.conf.5 + nodist_man8_MANS = \ vdsmd.8 diff --git a/vdsm/vdsm.conf.5 b/vdsm/vdsm.conf.5 new file mode 100644 index 0000000..98b4ccd --- /dev/null +++ b/vdsm/vdsm.conf.5 @@ -0,0 +1,395 @@ +.\"Copyright 2010-2013 Red Hat, Inc. and/or its affiliates. +.\" +.\"Licensed to you under the GNU General Public License as published by +.\"the Free Software Foundation; either version 2 of the License, or +.\"(at your option) any later version. See the files README and +.\"LICENSE_GPL_v2 which accompany this distribution. +.\" +.\" +.\" File Name macro definition plagiarized from bash. +.\" +.de FN +\fI\|\\$1\|\fP +.. +.TH VDSM.CONF 5 "December 6, 2013" "" "" +.SH NAME +vdsm.conf \- The configuration file for Virtual Desktops and Servers Manager (VDSM) +.br +.SH SYNOPSIS +.PP +The +vdsm\&.conf +file is a configuration file for VDSM. +vdsm\&.conf +contains runtime configuration information for the VDSM\&. +The complete description of the file format and possible parameters held within are here for reference +purposes\&. +.SH "FILE FORMAT" +.PP +The file consists of sections and parameters\&. A section begins with the name of the section in square brackets and +continues until the next section begins\&. Sections contain parameters of the form: +.sp +.if n \{\ +.RS 4 +.\} +.nf +\fIname\fR = \fIvalue \fR +.fi +.if n \{\ +.RE +.\} + +.SH CONFIGURATION BY SECTION (EXAMPLE) +.PP +.B [vars] + +\fBcore_dump_enable\fR = true +.br +Enable core dump + +\fBhost_mem_reserve\fR = 256 +.br +Reserves memory for the host to prevent VMs from using all the physical pages. The values are in Mbytes. + +\fBguest_ram_overhead\fR = 65 + +\fBextra_mem_reserve\fR = 65 +.br +Memory reserved for non-vds-administered programs. + +\fBfake_nics\fR +.br +Comma-separated list of fnmatch-patterns for dummy hosts nics to be shown to vdsm. + +\fBnic_model\fR = rtl8139,pv +.br +NIC model is rtl8139, ne2k_pci pv or any other valid device recognized by kvm/qemu if a coma separated list +given then a NIC per device will be created. + +\fBmigration_timeout\fR = 300 +.br +Maximum time the destination waits for migration to end. Source waits twice aslong (to avoid races) + +\fBmigration_listener_timeout\fR = 30 +.br +Time to wait (in seconds) for migration destination to start listening before migration begins. + +\fBmigration_max_bandwidth\fR = 32 +.br +Maximum bandwidth for migration, in MiBps, 0 means libvirt's default, since 0.10.x default in libvirt is unlimited + +\fBmigration_monitor_intervang\fR = 10 +.br +How often (in seconds) should the monitor thread pulse, 0 means the thread is disabled + +\fBhidden_nics\fR = wlan*,usb* +.br +Comma-separated list of fnmatch-patterns for host nics to be hidden from vdsm. + +\fBdefault_bridge\fR = engine +.br +Default bridge + +\fBmigration_downtime\fR = 500 +.br +Maxmium allowed downtime for live migration in milliseconds (anything below 100ms is ignored) if you do not care about +liveness of migration, set to a very high value, such as 600000. + +\fBmigration_downtime_steps\fR = 10 +.br +Incremental steps used to reach migration_downtime + +\fBmax_outgoing_migrations\fR = 3 +.br +Maximum concurrent outgoing migrations + +\fBsys_shutdown_timeout\fR = 10 +.br +Destroy and shutdown timeouts (in sec) before completing the action. + +\fBuser_shutdown_timeout\fR = 30 +.br +Grace period (seconds) to let guest user close his applications before shutdown. + +\fBguest_agent_timeout\fR = 30 +.br +Time (in sec) to wait for guest agent. + +\fBvm_command_timeout\fR = 60 +.br +Time to wait (in seconds) for vm to respond to a monitor command, 30 secs is a nice default. Set to 300 if the vm is expected to freeze during cluster failover. + +\fBvm_watermark_interval\fR = 2 +.br +How often should we sample each vm for statistics (seconds). + +\fBvm_sample_cpu_interval\fR = 15 +.br +Interval to collect sampe from CPU + +\fBvm_sample_cpu_window\fR = 2 +.br +Interval to collect from CPU window + +\fBvm_sample_disk_interval\fR = 60 +.br +Interval to collect sample from disk + +\fBvm_sample_disk_window\fR = 2 +.br +Interval to collect disk window + +\fBvm_sample_disk_latency_interval\fR = 60 +.br +Interval to collect disk latency + +\fBvm_sample_disk_latency_window\fR = 2 +.br +Interval to collect disk latency window + +\fBvm_sample_net_interval\fR = 5 +.br +Interval to collect sample from net + +\fBvm_sample_net_window\fR = 2 +.br +Interval to collect sample from net window + +\fBtrust_store_path\fR = /etc/pki/vdsm +.br +Where the certificates and keys are situated + +\fBssl\fR = true +.br +Whether to use ssl encryption and authentication. + +\fBvds_responsiveness_timeout\fR = 60 +.br +Responsiveness timeout + +\fBvdsm_nice\fR = -5 +.br +Set vdsm scheduling priority + +\fBqemu_drive_cache\fR = none +.br +Qemu drive cache + +\fBfake_kvm_support\fR = false +.br +Emulate kvm support + +\fBxmlrpc_enable\fR = true +.br +Enable the xmlrpc server + +\fBjsonrpc_enable\fR = true +.br +Enable the JSON RPC server + +\fBreport_host_threads_as_cores\fR = false +.br +Count each cpu hyperthread as an individual core + +\fBlibvirt_env_variable_log_filters\fR +.br +Specify the log filters to track libvirt calls + +\fBlibvirt_env_variable_log_outputs\fR +.br +Specify the output to track libvirt calls + +.B [ksm] +.br +\fBksm_monitor_thread\fR = true +.br +KSM Monitor + +.br +.B [mom] +.br +\fBconf\fR = /etc/vdsm/mom.conf +.br +Mom conf file +.br + +.B [irs] +.br +\fBirs_enable\fR = true +.br +Enable IRS + +\fBrepository\fR = path to repository +.br +Image Repository + +\fBhsm_tasks\fR = (repository)/hsm +.br +hsm dir + +\fBimages\fR = images/ +.br +images dir + +\fBirsd\fR = (images)/irsd +.br +irsd dir + +\fBimages_check_times\fR = 0 +.br +Image repository check period (seconds). + +\fBvolume_utilization_percent\fR = 50 +.br +Volume utilization percent + +\fBvolume_utilization_chunk_mb\fR = 1024 +.br +Volume utilization chunk of mb + +\fBvol_size_sample_interval\fR = 60 +.br +How often should the volume size be checked (seconds). + +\fBsd_validate_timeout\fR = 80 +.br +Storage domain validate timeout, the maximum number of seconds to wait until all the domains will be validated. + +\fBscsi_rescan_minimal_timeout\fR = 2 +.br +The minimum number of seconds to wait for scsi scan to return. + +\fBscsi_rescan_maximal_timeout\fR = 30 +.br +The maximal number of seconds to wait for scsi scan to return. + +\fBsd_health_check_delay\fR = 10 +.br +Storage domain health check delay, the amount of seconds to wait between two successive run of the domain health check. + +\fBnfs_mount_options\fR = soft,nosharecache +.br +NFS mount options, comma-separated list (NB: no white space allowed!) + +\fBpools_data_dir\fR = /var/run/vdsm/pools +.br +Pool data dir + +\fBvol_extend_policy\fR = ON +.br +Volume extend policy + +\fBlock_util_path\fR = /usr/libexec/vdsm +.br +Block util path + +\fBlock_cmd\fR = spmprotect.sh +.br +The lock command + +\fBfree_lock_cmd\fR = spmstop.sh +.br +The free lock command + +\fBthread_pool_size\fR = 10 +.br +Thread pool size + +\fBmax_tasks\fR = 500 +.br +Number max of tasks + +\fBlvm_dev_whitelist\fR +.br +LVM whitelist + +\fBmd_backup_versions\fR = 30 +.br +Versions of backup + +\fBmd_backup_dir\fR = /var/log/vdsm/backup +.br +Backup dir + +\fBmaximum_allowed_pvs\fR = 8 +.br +The number of PVs per VG has a hard-coded limit of 10. + +\fBrepo_stats_cache_refresh_timeout\fR = 300 +.br +Repo stats cache refresh + +\fBtask_resource_default_timeout\fR = 120000 +.br +Task resource default timeout + +\fBprepare_image_timeout\fR = 600000 +.br +Prepare image timeout + +\fBgc_blocker_force_collect_interval\fR = 60 +.br +Force collect interval + +\fBmaximum_domains_in_pool\fR = 100 +.br +Process pool configuration. + +\fBprocess_pool_size\fR = 100 +.br +Pool size + +\fBprocess_pool_timeout\fR = 60 +.br +Pool timeout + +\fBprocess_pool_grace_period\fR = 2 +.br +Pool grace period + +\fBprocess_pool_max_slots_per_domain\fR = 10 +.br +Max slots per domain + +\fBiscsi_default_ifaces\fR = default +.br +Comma seperated ifaces to connect with. i.e. iser,default + +\fBuse_volume_leases\fR = false +.br +Whether to use the volume leases or not. + +.B [address] +.br +\fBmanagement_port\fR = 54321 +.br +Port on which the vdsmd server listens to network clients + +\fBss_pool_timeoutjson_port\fR = 4044 +.br +Port on which the vdsmd Json RPC server listens to network clients + +\fBmanagement_ip\fR +.br +IP address of management server + +\fBguests_gateway_ip\fR +.br +Guests gateway IP address + +.SH "SEE ALSO" +.PP + +\fBvdsClient\fR(1), +\fBvdsmd\fR(8) + +.SH AUTHOR +VDSM was written by Ayal Baron, Barak Azulay, Cyril Plisko, Dan Kenigsberg, +Doron Fediuck, Igor Lvovsky, Saggi Mizrahi, Shahar Frank, Simon Grinberg and +others. + +.SH BUGS +Report bugs to <http://bugzilla.redhat.com> + +.SH COPYRIGHT +Copyright 2010-2013 Red Hat, Inc. License GPLv2: GNU GPL Version 2 <http://gnu.org/licenses/gpl.html>. -- To view, visit http://gerrit.ovirt.org/22891 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Id8e5a47d484fa06070d4566a39cab8a7a53ea717 Gerrit-PatchSet: 1 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Douglas Schilling Landgraf <dougsland(a)redhat.com>

6 9

Change in vdsm[master]: cleanup: drop several unused local variables
by asegurap＠redhat.com 05 Nov '14

05 Nov '14

Antoni Segura Puimedon has uploaded a new change for review. Change subject: cleanup: drop several unused local variables ...................................................................... cleanup: drop several unused local variables Change-Id: Ib81c292f900154819e8852c21ae389c323034999 Signed-off-by: Antoni S. Puimedon <asegurap(a)redhat.com> --- M client/vdsClient.py M lib/vdsm/netinfo.py M lib/yajsonrpc/protonReactor.py M tests/functional/networkTests.py M tests/functional/virtTests.py M tests/hookValidation.py M tests/hooksTests.py M tests/jsonRpcTests.py M tests/miscTests.py M tests/testValidation.py M tests/vmTests.py M vds_bootstrap/setup M vds_bootstrap/vds_bootstrap.py M vds_bootstrap/vds_bootstrap_complete.py M vdsm/storage/hsm.py M vdsm/storage/iscsi.py M vdsm/storage/misc.py M vdsm/storage/remoteFileHandler.py M vdsm/storage/resourceManager.py M vdsm/storage/sp.py M vdsm/storage/task.py M vdsm/vm.py M vdsm_api/Bridge.py M vdsm_api/process-schema.py M vdsm_api/vdsmapi.py 25 files changed, 23 insertions(+), 49 deletions(-) git pull ssh://gerrit.ovirt.org:29418/vdsm refs/changes/35/20535/1 diff --git a/client/vdsClient.py b/client/vdsClient.py index 37dd7cb..4c09546 100644 --- a/client/vdsClient.py +++ b/client/vdsClient.py @@ -842,7 +842,6 @@ masterDom = args[3] domList = args[4].split(",") mVer = int(args[5]) - pool = None if len(args) > 6: pool = self.s.createStoragePool(poolType, spUUID, poolName, masterDom, diff --git a/lib/vdsm/netinfo.py b/lib/vdsm/netinfo.py index e8f2b8d..cf70089 100644 --- a/lib/vdsm/netinfo.py +++ b/lib/vdsm/netinfo.py @@ -93,8 +93,6 @@ The list of nics is built by filtering out nics defined as hidden, fake or hidden bonds (with related nics'slaves). """ - res = [] - def isHiddenNic(device): """ Returns boolean given the device name stating @@ -397,7 +395,7 @@ "Convert an integer to the corresponding ip address in the dot-notation" ip_address = [] - for i in xrange(4): + for _ in xrange(4): ip_num, ip_val = divmod(ip_num, 256) ip_address.append(str(ip_val)) diff --git a/lib/yajsonrpc/protonReactor.py b/lib/yajsonrpc/protonReactor.py index 557600c..7892e3c 100644 --- a/lib/yajsonrpc/protonReactor.py +++ b/lib/yajsonrpc/protonReactor.py @@ -376,7 +376,6 @@ proton.pn_link_advance(link) def createListener(self, address, acceptHandler): - host, port = address return self._scheduleOp(True, self._createListener, address, acceptHandler) diff --git a/tests/functional/networkTests.py b/tests/functional/networkTests.py index a9149be..ba93343 100644 --- a/tests/functional/networkTests.py +++ b/tests/functional/networkTests.py @@ -377,7 +377,7 @@ for index in range(VLAN_COUNT)] with dummyIf(1) as nics: firstVlan, firstVlanId = NET_VLANS[0] - status, msg = self.vdsm_net.addNetwork(firstVlan, vlan=firstVlanId, + _ = self.vdsm_net.addNetwork(firstVlan, vlan=firstVlanId, bond=BONDING_NAME, nics=nics, opts=opts) with nonChangingOperstate(BONDING_NAME): diff --git a/tests/functional/virtTests.py b/tests/functional/virtTests.py index cdb695a..85781f7 100644 --- a/tests/functional/virtTests.py +++ b/tests/functional/virtTests.py @@ -83,7 +83,7 @@ def _genInitramfs(): fd, path = tempfile.mkstemp() cmd = [_mkinitrd.cmd, "-f", path, _kernelVer] - rc, out, err = execCmd(cmd, sudo=False) + _ = execCmd(cmd, sudo=False) os.chmod(path, 0o644) return path diff --git a/tests/hookValidation.py b/tests/hookValidation.py index 80e7239..208ed35 100644 --- a/tests/hookValidation.py +++ b/tests/hookValidation.py @@ -67,8 +67,6 @@ cookie_file = _createHookScript(hook_path, hook_name, hook_script) - output = None - try: kwargs['hook_cookiefile'] = cookie_file output = test_function(*args, **kwargs) diff --git a/tests/hooksTests.py b/tests/hooksTests.py index 1018a4e..ddb3530 100644 --- a/tests/hooksTests.py +++ b/tests/hooksTests.py @@ -42,7 +42,7 @@ echo -n %s >> "$_hook_domxml" """ scripts = [tempfile.NamedTemporaryFile(dir=dirName, delete=False) - for n in xrange(Q)] + for _ in xrange(Q)] scripts.sort(key=lambda f: f.name) for n, script in enumerate(scripts): script.write(code % n) diff --git a/tests/jsonRpcTests.py b/tests/jsonRpcTests.py index a7b565f..00025ae 100644 --- a/tests/jsonRpcTests.py +++ b/tests/jsonRpcTests.py @@ -85,7 +85,7 @@ def serve(reactor): try: reactor.process_requests() - except socket.error as e: + except socket.error: pass except Exception as e: self.log.error("Reactor died unexpectedly", exc_info=True) diff --git a/tests/miscTests.py b/tests/miscTests.py index c836e55..1a9a16c 100644 --- a/tests/miscTests.py +++ b/tests/miscTests.py @@ -432,7 +432,7 @@ os.chmod(dstPath, 0o666) #Copy - rc, out, err = misc.ddWatchCopy(srcPath, dstPath, None, len(data)) + _ = misc.ddWatchCopy(srcPath, dstPath, None, len(data)) #Get copied data readData = open(dstPath).read() @@ -448,7 +448,7 @@ fd, path = tempfile.mkstemp() try: - for i in xrange(repetitions): + for _ in xrange(repetitions): os.write(fd, data) self.assertEquals(os.stat(path).st_size, misc.MEGA) except: @@ -474,7 +474,7 @@ self.assertEquals(os.stat(path).st_size, misc.MEGA * 2) with open(path, "r") as f: - for i in xrange(repetitions): + for _ in xrange(repetitions): self.assertEquals(f.read(len(data)), data) finally: os.unlink(path) @@ -501,7 +501,7 @@ misc.MEGA * 2 + len(add_data)) with open(path, "r") as f: - for i in xrange(repetitions): + for _ in xrange(repetitions): self.assertEquals(f.read(len(data)), data) # Checking the additional data self.assertEquals(f.read(len(add_data)), add_data) @@ -535,7 +535,7 @@ os.chmod(dstPath, 0o666) #Copy - rc, out, err = misc.ddWatchCopy(srcPath, dstPath, None, len(data)) + _ = misc.ddWatchCopy(srcPath, dstPath, None, len(data)) #Get copied data readData = open(dstPath).read() diff --git a/tests/testValidation.py b/tests/testValidation.py index d370971..92790d9 100644 --- a/tests/testValidation.py +++ b/tests/testValidation.py @@ -110,7 +110,7 @@ def wrapper(*args, **kwargs): if not os.path.exists('/sys/module/dummy'): cmd_modprobe = [modprobe.cmd, "dummy"] - rc, out, err = utils.execCmd(cmd_modprobe, sudo=True) + _ = utils.execCmd(cmd_modprobe, sudo=True) return f(*args, **kwargs) return wrapper diff --git a/tests/vmTests.py b/tests/vmTests.py index 1f69f0a..9d91723 100644 --- a/tests/vmTests.py +++ b/tests/vmTests.py @@ -390,7 +390,7 @@ driveInput.update({'shared': 'UNKNOWN-VALUE'}) with self.assertRaises(ValueError): - drive = vm.Drive({}, self.log, **driveInput) + _ = vm.Drive({}, self.log, **driveInput) def testDriveXML(self): SERIAL = '54-a672-23e5b495a9ea' diff --git a/vds_bootstrap/setup b/vds_bootstrap/setup index 778dc12..701df8b 100755 --- a/vds_bootstrap/setup +++ b/vds_bootstrap/setup @@ -63,7 +63,6 @@ return False, HYPERVISOR_RELEASE_FILE + ", " + REDHAT_RELEASE_FILE def get_id_line(): - line = '' RELEASE_FILE = None try: @@ -193,7 +192,6 @@ import calendar return_value = False - ticket = None try: time_struct = time.strptime(systime, '%Y-%m-%dT%H:%M:%S') diff --git a/vds_bootstrap/vds_bootstrap.py b/vds_bootstrap/vds_bootstrap.py index a9dc901..e45c8b6 100755 --- a/vds_bootstrap/vds_bootstrap.py +++ b/vds_bootstrap/vds_bootstrap.py @@ -289,7 +289,6 @@ """ status = "OK" message = 'Host properly registered with RHN/Satellite.' - rc = True try: rc = bool(deployUtil.yumListPackages(VDSM_NAME)) @@ -316,7 +315,6 @@ """ status = "OK" message = 'Available VDSM matches requirements' - rc = True try: rc = deployUtil.yumSearchVersion(VDSM_NAME, VDSM_MIN_VER) @@ -393,7 +391,6 @@ """ os_status = "FAIL" kernel_status = "FAIL" - os_message = "Unsupported platform version" os_name = "Unknown OS" kernel_message = '' self.rc = True @@ -741,8 +738,6 @@ return self.rc def _addNetwork(self, vdcName, vdcPort): - fReturn = True - #add management bridge try: fReturn = deployUtil.makeBridge( @@ -859,9 +854,6 @@ # TODO remove legacy if deployUtil.getBootstrapInterfaceVersion() == 1 and \ engine_ssh_key is None: - vdcAddress = None - vdcPort = None - vdcAddress, vdcPort = deployUtil.getAddress(url) if vdcAddress is not None: strKey = deployUtil.getAuthKeysFile(vdcAddress, vdcPort) diff --git a/vds_bootstrap/vds_bootstrap_complete.py b/vds_bootstrap/vds_bootstrap_complete.py index fd18847..07c3610 100755 --- a/vds_bootstrap/vds_bootstrap_complete.py +++ b/vds_bootstrap/vds_bootstrap_complete.py @@ -101,7 +101,6 @@ except: arg = 1 - res = True try: res = deployUtil.instCert(rnum, VDSM_CONF_FILE) if res: diff --git a/vdsm/storage/hsm.py b/vdsm/storage/hsm.py index 4579763..322ee8b 100644 --- a/vdsm/storage/hsm.py +++ b/vdsm/storage/hsm.py @@ -1095,7 +1095,7 @@ misc.validateN(hostID, 'hostID') # already disconnected/or pool is just unknown - return OK try: - pool = self.getPool(spUUID) + _ = self.getPool(spUUID) except se.StoragePoolUnknown: self.log.warning("disconnect sp: %s failed. Known pools %s", spUUID, self.pools) @@ -1861,7 +1861,7 @@ self.log.info("spUUID=%s master=%s", spUUID, masterDom) try: - pool = self.getPool(spUUID) + _ = self.getPool(spUUID) except se.StoragePoolUnknown: pool = sp.StoragePool(spUUID, self.domainMonitor, self.taskMng) else: diff --git a/vdsm/storage/iscsi.py b/vdsm/storage/iscsi.py index 7da94ab..9976026 100644 --- a/vdsm/storage/iscsi.py +++ b/vdsm/storage/iscsi.py @@ -415,7 +415,7 @@ log.debug("Performing SCSI scan, this will take up to %s seconds", maxTimeout) time.sleep(minTimeout) - for i in xrange(maxTimeout - minTimeout): + for _ in xrange(maxTimeout - minTimeout): for p in processes[:]: (hba, proc) = p if proc.wait(0): @@ -429,7 +429,7 @@ time.sleep(1) else: log.warning("Still waiting for scsi scan of hbas: %s", - tuple(hba for p in processes)) + tuple(hba for _ in processes)) def devIsiSCSI(dev): diff --git a/vdsm/storage/misc.py b/vdsm/storage/misc.py index fc13a9c..5245264 100644 --- a/vdsm/storage/misc.py +++ b/vdsm/storage/misc.py @@ -484,7 +484,6 @@ log.debug("dir: %s, prefixName: %s, versions: %s" % (directory, prefixName, gen)) gen = int(gen) - files = os.listdir(directory) files = glob.glob("%s*" % prefixName) fd = {} for fname in files: @@ -614,7 +613,6 @@ return self.acquire(True) def acquire(self, exclusive): - currentEvent = None currentThread = threading.currentThread() # Handle reacquiring lock in the same thread @@ -1081,7 +1079,7 @@ maxthreads -= 1 # waiting for rest threads to end - for i in xrange(threadsCount): + for _ in xrange(threadsCount): yield respQueue.get() diff --git a/vdsm/storage/remoteFileHandler.py b/vdsm/storage/remoteFileHandler.py index 5b24053..accf51c 100644 --- a/vdsm/storage/remoteFileHandler.py +++ b/vdsm/storage/remoteFileHandler.py @@ -275,7 +275,7 @@ def __init__(self, numOfHandlers): self._numOfHandlers = numOfHandlers self.handlers = [None] * numOfHandlers - self.occupied = [Lock() for i in xrange(numOfHandlers)] + self.occupied = [Lock() for _ in xrange(numOfHandlers)] def _isHandlerAvailable(self, poolHandler): if poolHandler is None: diff --git a/vdsm/storage/resourceManager.py b/vdsm/storage/resourceManager.py index 14049dc..486ea18 100644 --- a/vdsm/storage/resourceManager.py +++ b/vdsm/storage/resourceManager.py @@ -926,7 +926,7 @@ return req.wait(timeout) # req not found - check that it is not granted - for fullName in self.resources: + for _ in self.resources: return True # Note that there is a risk of another thread that is racing with us diff --git a/vdsm/storage/sp.py b/vdsm/storage/sp.py index 38cd453..db66662 100644 --- a/vdsm/storage/sp.py +++ b/vdsm/storage/sp.py @@ -1326,7 +1326,6 @@ self.log.info("spUUID=%s sdUUID=%s", self.spUUID, sdUUID) vms = self._getVMsPath(sdUUID) # We should exclude 'masterd' link from IMG_METAPATTERN globing - vmUUID = ovf = imgList = '' for vm in vmList: if not vm: continue diff --git a/vdsm/storage/task.py b/vdsm/storage/task.py index 4eff5c1..0532b02 100644 --- a/vdsm/storage/task.py +++ b/vdsm/storage/task.py @@ -872,10 +872,7 @@ def _runJobs(self): result = "" - code = 100 - message = "Unknown Error" i = 0 - j = None try: if self.aborting(): raise se.TaskAborted("shutting down") @@ -891,7 +888,6 @@ if result is None: result = "" i += 1 - j = None self._updateResult(0, "%s jobs completed successfully" % i, result) self._updateState(State.finished) self.log.debug('Task.run: exit - success: result %s' % result) diff --git a/vdsm/vm.py b/vdsm/vm.py index 0c12334..5e1c7f1 100644 --- a/vdsm/vm.py +++ b/vdsm/vm.py @@ -3058,7 +3058,7 @@ self._dom.attachDevice(nicXml) except libvirt.libvirtError as e: self.log.error("Hotplug failed", exc_info=True) - nicXml = hooks.after_nic_hotplug_fail( + _ = hooks.after_nic_hotplug_fail( nicXml, self.conf, params=customProps) if e.get_error_code() == libvirt.VIR_ERR_NO_DOMAIN: return errCode['noVM'] @@ -3760,7 +3760,7 @@ "trying again without it (%s)", e) try: self._dom.snapshotCreateXML(snapxml, snapFlags) - except Exception as e: + except Exception: self.log.error("Unable to take snapshot", exc_info=True) if memoryParams: self.cif.teardownVolumePath(memoryVol) diff --git a/vdsm_api/Bridge.py b/vdsm_api/Bridge.py index b9fdaf8..4812354 100644 --- a/vdsm_api/Bridge.py +++ b/vdsm_api/Bridge.py @@ -34,7 +34,6 @@ def dispatch(self, name, argobj): methodName = name.replace('.', '_') - result = None try: fn = getattr(self, methodName) except AttributeError: diff --git a/vdsm_api/process-schema.py b/vdsm_api/process-schema.py index c4bda0d..307d498 100755 --- a/vdsm_api/process-schema.py +++ b/vdsm_api/process-schema.py @@ -255,12 +255,12 @@ # Union member types names = strip_stars(s.get('data', [])) types = filter_types(names) - details = [None for n in names] + details = [None for _ in names] attr_table('Types', names, types, details) elif 'enum' in s: # Enum values names = strip_stars(s.get('data', [])) - types = [None for n in names] + types = [None for _ in names] details = [s['info_data'][n] for n in names] attr_table('Values', names, types, details) elif 'map' in s: diff --git a/vdsm_api/vdsmapi.py b/vdsm_api/vdsmapi.py index db29c13..c38ff01 100644 --- a/vdsm_api/vdsmapi.py +++ b/vdsm_api/vdsmapi.py @@ -92,7 +92,6 @@ def parse_schema(fp): exprs = [] expr = '' - expr_eval = None for line in fp: if line.startswith('#') or line == '\n': -- To view, visit http://gerrit.ovirt.org/20535 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ib81c292f900154819e8852c21ae389c323034999 Gerrit-PatchSet: 1 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Antoni Segura Puimedon <asegurap(a)redhat.com>

7 19

Change in vdsm[master]: vm: migration: exponential downtime increment
by fromani＠redhat.com 04 Nov '14

04 Nov '14

Francesco Romani has uploaded a new change for review. Change subject: vm: migration: exponential downtime increment ...................................................................... vm: migration: exponential downtime increment Migration downtime is calculated using an interpolation using the current downtime step (up to a configurabile maximum) and the maximum downtime. The downtime is incremented at each downtime step until it reaches the maximum, or the migration is finished. This patch changes the interpolation formula from linear to exponential, being the new one: d = c ** s where d is the downtime, s is the step and c is the exponentiation coefficient computed in such a way of when s = S (number of steps to perform), then we will have d = D (selected downtime). Please note that this patch still preserve an linear increment of the wait time. Change-Id: I6401772f52ea28144452e67198bddff18f6703eb Bug-Url: https://bugzilla.redhat.com/show_bug.cgi?id=1004101 Signed-off-by: Francesco Romani <fromani(a)redhat.com> --- M vdsm/vm.py 1 file changed, 2 insertions(+), 1 deletion(-) git pull ssh://gerrit.ovirt.org:29418/vdsm refs/changes/20/25820/1 diff --git a/vdsm/vm.py b/vdsm/vm.py index c53f1d4..1d7b643 100644 --- a/vdsm/vm.py +++ b/vdsm/vm.py @@ -722,6 +722,7 @@ delay_per_gib = config.getint('vars', 'migration_downtime_delay') memSize = int(vm.conf['memSize']) self._wait = (delay_per_gib * max(memSize, 2048) + 1023) / 1024 + self._coeff = self._downtime ** (1 / float(self.DOWNTIME_STEPS)) self.daemon = True self.start() @@ -735,7 +736,7 @@ if self._stop.isSet(): break - downtime = self._downtime * (i + 1) / self.DOWNTIME_STEPS + downtime = int(self._coeff ** i) self._vm.log.debug('setting migration downtime to %d', downtime) self._vm._dom.migrateSetMaxDowntime(downtime, 0) -- To view, visit http://gerrit.ovirt.org/25820 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I6401772f52ea28144452e67198bddff18f6703eb Gerrit-PatchSet: 1 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Francesco Romani <fromani(a)redhat.com>

6 42

Change in vdsm[master]: vdsm: Refactoring of retrieving device info from xml
by Vinzenz Feenstra 23 Oct '14

23 Oct '14

Vinzenz Feenstra has uploaded a new change for review. Change subject: vdsm: Refactoring of retrieving device info from xml ...................................................................... vdsm: Refactoring of retrieving device info from xml Reworked a bit the retrieval of device info from the libvirt domain xml. Now VDSM won't parse the code in lastXmlDesc every time and the retrieval of elements from the domain xml has been a bit abstracted. Additionally the retrieval of an alias has been moved into a separate function call to make the readability a bit better. Change-Id: I7e106b2f2d3f4160d4e882f1a2880cb1b52fbb22 Signed-off-by: Vinzenz Feenstra <vfeenstr(a)redhat.com> --- M vdsm/vm.py 1 file changed, 63 insertions(+), 76 deletions(-) git pull ssh://gerrit.ovirt.org:29418/vdsm refs/changes/94/17694/1 diff --git a/vdsm/vm.py b/vdsm/vm.py index dc52909..e51050e 100644 --- a/vdsm/vm.py +++ b/vdsm/vm.py @@ -1698,6 +1698,7 @@ self._guestSocketFile = self._makeChannelPath(_VMCHANNEL_DEVICE_NAME) self._qemuguestSocketFile = self._makeChannelPath(_QEMU_GA_DEVICE_NAME) self._lastXMLDesc = '<domain><uuid>%s</uuid></domain>' % self.id + self._lastParsedXmlDesc = _domParseStr(self._lastXMLDesc) self._devXmlHash = '0' self._released = False self._releaseLock = threading.Lock() @@ -2722,24 +2723,30 @@ self._guestCpuRunning = (self._dom.info()[0] == libvirt.VIR_DOMAIN_RUNNING) + def _getDevicesXml(self, parsedXml=None): + parsedXml = parsedXml or self._lastParsedXmlDesc + return parsedXml.childNodes[0].getElementsByTagName('devices')[0] + def _getUnderlyingVmDevicesInfo(self): """ Obtain underlying vm's devices info from libvirt. """ - self._getUnderlyingNetworkInterfaceInfo() - self._getUnderlyingDriveInfo() - self._getUnderlyingDisplayPort() - self._getUnderlyingSoundDeviceInfo() - self._getUnderlyingVideoDeviceInfo() - self._getUnderlyingControllerDeviceInfo() - self._getUnderlyingBalloonDeviceInfo() - self._getUnderlyingWatchdogDeviceInfo() - self._getUnderlyingSmartcardDeviceInfo() - self._getUnderlyingConsoleDeviceInfo() + devicesXml = self._getDevicesXml(parsedXml=self._lastParsedXmlDesc) + self._getUnderlyingNetworkInterfaceInfo(devicesXml=devicesXml) + self._getUnderlyingDriveInfo(devicesXml=devicesXml) + self._getUnderlyingDisplayPort(xml=self._lastParsedXmlDesc) + self._getUnderlyingSoundDeviceInfo(devicesXml=devicesXml) + self._getUnderlyingVideoDeviceInfo(devicesXml=devicesXml) + self._getUnderlyingControllerDeviceInfo(devicesXml=devicesXml) + self._getUnderlyingBalloonDeviceInfo(devicesXml=devicesXml) + self._getUnderlyingWatchdogDeviceInfo(devicesXml=devicesXml) + self._getUnderlyingSmartcardDeviceInfo(devicesXml=devicesXml) + self._getUnderlyingConsoleDeviceInfo(devicesXml=devicesXml) # Obtain info of all unknown devices. Must be last! - self._getUnderlyingUnknownDeviceInfo() + self._getUnderlyingUnknownDeviceInfo(devicesXml=devicesXml) + self._updateAgentChannels(devicesXml=devicesXml) - def _updateAgentChannels(self): + def _updateAgentChannels(self, devicesXml): """ We moved the naming of guest agent channel sockets. To keep backwards compatability we need to make symlinks from the old channel sockets, to @@ -2747,9 +2754,7 @@ This is necessary to prevent incoming migrations, restoring of VMs and the upgrade of VDSM with running VMs to fail on this. """ - agentChannelXml = _domParseStr(self._lastXMLDesc).childNodes[0]. \ - getElementsByTagName('devices')[0]. \ - getElementsByTagName('channel') + agentChannelXml = devicesXml.getElementsByTagName('channel') for channel in agentChannelXml: try: name = channel.getElementsByTagName('target')[0].\ @@ -2781,7 +2786,6 @@ self._getUnderlyingVmInfo() self._getUnderlyingVmDevicesInfo() - self._updateAgentChannels() #Currently there is no protection agains mirroring a network twice, for nic in self._devices[NIC_DEVICES]: @@ -2937,9 +2941,8 @@ or revert to snapshot. """ parsedSrcDomXML = _domParseStr(srcDomXML) - - allDiskDeviceXmlElements = parsedSrcDomXML.childNodes[0]. \ - getElementsByTagName('devices')[0].getElementsByTagName('disk') + devicesXml = self._getDevicesXml(parsedXml=parsedSrcDomXML) + allDiskDeviceXmlElements = devicesXml.getElementsByTagName('disk') snappableDiskDeviceXmlElements = \ _filterSnappableDiskDevices(allDiskDeviceXmlElements) @@ -3008,7 +3011,8 @@ with self._confLock: self.conf['devices'].append(nicParams) self.saveState() - self._getUnderlyingNetworkInterfaceInfo() + self._getUnderlyingNetworkInterfaceInfo( + devicesXml=self._getDevicesXml()) hooks.after_nic_hotplug(nicXml, self.conf, params=customProps) @@ -3264,7 +3268,7 @@ with self._confLock: self.conf['devices'].append(diskParams) self.saveState() - self._getUnderlyingDriveInfo() + self._getUnderlyingDriveInfo(devicesXml=self._getDevicesXml()) hooks.after_disk_hotplug(driveXml, self.conf, params=customProps) @@ -4181,8 +4185,8 @@ def _getUnderlyingVmInfo(self): self._lastXMLDesc = self._dom.XMLDesc(0) - devxml = _domParseStr(self._lastXMLDesc).childNodes[0]. \ - getElementsByTagName('devices')[0] + self._lastParsedXmlDesc = _domParseStr(self._lastXMLDesc) + devxml = self._getDevicesXml() self._devXmlHash = str(hash(devxml.toxml())) return self._lastXMLDesc @@ -4331,6 +4335,9 @@ self.saveState() return {'status': doneCode} + def _getUnderlyingDeviceAliasName(self, devXml): + return devXml.getElementsByTagName('alias')[0].getAttribute('name') + def _getUnderlyingDeviceAddress(self, devXml): """ Obtain device's address from libvirt @@ -4347,7 +4354,7 @@ return address - def _getUnderlyingUnknownDeviceInfo(self): + def _getUnderlyingUnknownDeviceInfo(self, devicesXml): """ Obtain unknown devices info from libvirt. @@ -4360,16 +4367,13 @@ return True return False - devsxml = _domParseStr(self._lastXMLDesc).childNodes[0]. \ - getElementsByTagName('devices')[0] - - for x in devsxml.childNodes: + for x in devicesXml.childNodes: # Ignore empty nodes and devices without address if (x.nodeName == '#text' or not x.getElementsByTagName('address')): continue - alias = x.getElementsByTagName('alias')[0].getAttribute('name') + alias = self._getUnderlyingDeviceAliasName(x) if not isKnownDevice(alias): address = self._getUnderlyingDeviceAddress(x) # I general case we assume that device has attribute 'type', @@ -4381,18 +4385,16 @@ 'address': address} self.conf['devices'].append(newDev) - def _getUnderlyingControllerDeviceInfo(self): + def _getUnderlyingControllerDeviceInfo(self, devicesXml): """ Obtain controller devices info from libvirt. """ - ctrlsxml = _domParseStr(self._lastXMLDesc).childNodes[0]. \ - getElementsByTagName('devices')[0]. \ - getElementsByTagName('controller') + ctrlsxml = devicesXml.getElementsByTagName('controller') for x in ctrlsxml: # Ignore controller devices without address if not x.getElementsByTagName('address'): continue - alias = x.getElementsByTagName('alias')[0].getAttribute('name') + alias = self._getUnderlyingDeviceAliasName(x) device = x.getAttribute('type') # Get model and index. Relevant for USB controllers. model = x.getAttribute('model') @@ -4428,20 +4430,18 @@ 'address': address, 'alias': alias}) - def _getUnderlyingBalloonDeviceInfo(self): + def _getUnderlyingBalloonDeviceInfo(self, devicesXml): """ Obtain balloon device info from libvirt. """ - balloonxml = _domParseStr(self._lastXMLDesc).childNodes[0]. \ - getElementsByTagName('devices')[0]. \ - getElementsByTagName('memballoon') + balloonxml = devicesXml.getElementsByTagName('memballoon') for x in balloonxml: # Ignore balloon devices without address. if not x.getElementsByTagName('address'): address = None else: address = self._getUnderlyingDeviceAddress(x) - alias = x.getElementsByTagName('alias')[0].getAttribute('name') + alias = self._getUnderlyingDeviceAliasName(x) for dev in self._devices[BALLOON_DEVICES]: if address and not hasattr(dev, 'address'): @@ -4456,16 +4456,14 @@ if not dev.get('alias'): dev['alias'] = alias - def _getUnderlyingConsoleDeviceInfo(self): + def _getUnderlyingConsoleDeviceInfo(self, devicesXml): """ Obtain the alias for the console device from libvirt """ - consolexml = _domParseStr(self._lastXMLDesc).childNodes[0].\ - getElementsByTagName('devices')[0].\ - getElementsByTagName('console') + consolexml = devicesXml.getElementsByTagName('console') for x in consolexml: # All we care about is the alias - alias = x.getElementsByTagName('alias')[0].getAttribute('name') + alias = self._getUnderlyingDeviceAliasName(x) for dev in self._devices[CONSOLE_DEVICES]: if not hasattr(dev, 'alias'): dev.alias = alias @@ -4475,19 +4473,17 @@ not dev.get('alias'): dev['alias'] = alias - def _getUnderlyingSmartcardDeviceInfo(self): + def _getUnderlyingSmartcardDeviceInfo(self, devicesXml): """ Obtain smartcard device info from libvirt. """ - smartcardxml = _domParseStr(self._lastXMLDesc).childNodes[0].\ - getElementsByTagName('devices')[0].\ - getElementsByTagName('smartcard') + smartcardxml = devicesXml.getElementsByTagName('smartcard') for x in smartcardxml: if not x.getElementsByTagName('address'): continue address = self._getUnderlyingDeviceAddress(x) - alias = x.getElementsByTagName('alias')[0].getAttribute('name') + alias = self._getUnderlyingDeviceAliasName(x) for dev in self._devices[SMARTCARD_DEVICES]: if not hasattr(dev, 'address'): @@ -4500,19 +4496,17 @@ dev['address'] = address dev['alias'] = alias - def _getUnderlyingWatchdogDeviceInfo(self): + def _getUnderlyingWatchdogDeviceInfo(self, devicesXml): """ Obtain watchdog device info from libvirt. """ - watchdogxml = _domParseStr(self._lastXMLDesc).childNodes[0]. \ - getElementsByTagName('devices')[0]. \ - getElementsByTagName('watchdog') + watchdogxml = devicesXml.getElementsByTagName('watchdog') for x in watchdogxml: # PCI watchdog has "address" different from ISA watchdog if x.getElementsByTagName('address'): address = self._getUnderlyingDeviceAddress(x) - alias = x.getElementsByTagName('alias')[0].getAttribute('name') + alias = self._getUnderlyingDeviceAliasName(x) for wd in self._devices[WATCHDOG_DEVICES]: if not hasattr(wd, 'address') or not hasattr(wd, 'alias'): @@ -4525,14 +4519,13 @@ dev['address'] = address dev['alias'] = alias - def _getUnderlyingVideoDeviceInfo(self): + def _getUnderlyingVideoDeviceInfo(self, devicesXml): """ Obtain video devices info from libvirt. """ - videosxml = _domParseStr(self._lastXMLDesc).childNodes[0]. \ - getElementsByTagName('devices')[0].getElementsByTagName('video') + videosxml = devicesXml.getElementsByTagName('video') for x in videosxml: - alias = x.getElementsByTagName('alias')[0].getAttribute('name') + alias = self._getUnderlyingDeviceAliasName(x) # Get video card address address = self._getUnderlyingDeviceAddress(x) @@ -4553,14 +4546,13 @@ dev['alias'] = alias break - def _getUnderlyingSoundDeviceInfo(self): + def _getUnderlyingSoundDeviceInfo(self, devicesXml): """ Obtain sound devices info from libvirt. """ - soundsxml = _domParseStr(self._lastXMLDesc).childNodes[0]. \ - getElementsByTagName('devices')[0].getElementsByTagName('sound') + soundsxml = devicesXml.getElementsByTagName('sound') for x in soundsxml: - alias = x.getElementsByTagName('alias')[0].getAttribute('name') + alias = self._getUnderlyingDeviceAliasName(x) # Get sound card address address = self._getUnderlyingDeviceAddress(x) @@ -4581,12 +4573,11 @@ dev['alias'] = alias break - def _getUnderlyingDriveInfo(self): + def _getUnderlyingDriveInfo(self, devicesXml): """ Obtain block devices info from libvirt. """ - disksxml = _domParseStr(self._lastXMLDesc).childNodes[0]. \ - getElementsByTagName('devices')[0].getElementsByTagName('disk') + disksxml = devicesXml.getElementsByTagName('disk') # FIXME! We need to gather as much info as possible from the libvirt. # In the future we can return this real data to management instead of # vm's conf @@ -4600,7 +4591,7 @@ target = x.getElementsByTagName('target') name = target[0].getAttribute('dev') if target else '' - alias = x.getElementsByTagName('alias')[0].getAttribute('name') + alias = self._getUnderlyingDeviceAliasName(x) readonly = bool(x.getElementsByTagName('readonly')) boot = x.getElementsByTagName('boot') bootOrder = boot[0].getAttribute('order') if boot else '' @@ -4646,12 +4637,11 @@ diskDev['bootOrder'] = bootOrder self.conf['devices'].append(diskDev) - def _getUnderlyingDisplayPort(self): + def _getUnderlyingDisplayPort(self, xml): """ Obtain display port info from libvirt. """ - graphics = _domParseStr(self._lastXMLDesc).childNodes[0]. \ - getElementsByTagName('graphics')[0] + graphics = xml.childNodes[0].getElementsByTagName('graphics')[0] port = graphics.getAttribute('port') if port: self.conf['displayPort'] = port @@ -4659,18 +4649,16 @@ if port: self.conf['displaySecurePort'] = port - def _getUnderlyingNetworkInterfaceInfo(self): + def _getUnderlyingNetworkInterfaceInfo(self, devicesXml): """ Obtain network interface info from libvirt. """ # TODO use xpath instead of parseString (here and elsewhere) - ifsxml = _domParseStr(self._lastXMLDesc).childNodes[0]. \ - getElementsByTagName('devices')[0]. \ - getElementsByTagName('interface') + ifsxml = devicesXml.getElementsByTagName('interface') for x in ifsxml: devType = x.getAttribute('type') mac = x.getElementsByTagName('mac')[0].getAttribute('address') - alias = x.getElementsByTagName('alias')[0].getAttribute('name') + alias = self._getUnderlyingDeviceAliasName(x) if devType == 'hostdev': name = alias model = 'passthrough' @@ -4802,8 +4790,7 @@ "during migration at destination host" % devType) - devices = _domParseStr(xml).childNodes[0]. \ - getElementsByTagName('devices')[0] + devices = self._getDevicesXml(parsedXml=_domParseStr(xml)) for deviceXML in devices.childNodes: if deviceXML.nodeType != Node.ELEMENT_NODE: -- To view, visit http://gerrit.ovirt.org/17694 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I7e106b2f2d3f4160d4e882f1a2880cb1b52fbb22 Gerrit-PatchSet: 1 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Vinzenz Feenstra <vfeenstr(a)redhat.com>

11 79

Change in vdsm[master]: virt: migration: merge monitor and downtime thread
by fromani＠redhat.com 18 Sep '14

18 Sep '14

Francesco Romani has uploaded a new change for review. Change subject: virt: migration: merge monitor and downtime thread ...................................................................... virt: migration: merge monitor and downtime thread This patch merges the MigrationDowntimeThread into the MigrationMonitorThread. The benefits are * less code * less threads * better (and simpler) integration between migration progress tracking and downtime setting. Change-Id: I7ac66331b44435a9cffeb9de1454db6843245979 Signed-off-by: Francesco Romani <fromani(a)redhat.com> --- M vdsm/migration.py 1 file changed, 22 insertions(+), 41 deletions(-) git pull ssh://gerrit.ovirt.org:29418/vdsm refs/changes/77/25977/1 diff --git a/vdsm/migration.py b/vdsm/migration.py index 1234471..8c33f1e 100644 --- a/vdsm/migration.py +++ b/vdsm/migration.py @@ -293,10 +293,9 @@ self._vm.log.debug('starting migration to %s ' 'with miguri %s', duri, muri) - t = MigrationDowntimeThread(self._vm, int(self._downtime)) - self._monitorThread = MigrationMonitorThread(self._vm, - startTime) + startTime, + int(self._downtime)) self._monitorThread.start() try: @@ -325,7 +324,6 @@ self._raiseAbortError() finally: - t.cancel() self._monitorThread.stop() def stop(self): @@ -339,53 +337,24 @@ raise -class MigrationDowntimeThread(threading.Thread): - def __init__(self, vm, downtime): - super(MigrationDowntimeThread, self).__init__() - self.DOWNTIME_STEPS = config.getint('vars', 'migration_downtime_steps') - - self._vm = vm - self._downtime = downtime - self._stop = threading.Event() - - delay_per_gib = config.getint('vars', 'migration_downtime_delay') - memSize = int(vm.conf['memSize']) - self._wait = (delay_per_gib * max(memSize, 2048) + 1023) / 1024 - - self.daemon = True - self.start() - - def run(self): - self._vm.log.debug('migration downtime thread started') - - for i in range(self.DOWNTIME_STEPS): - self._stop.wait(self._wait / self.DOWNTIME_STEPS) - - if self._stop.isSet(): - break - - downtime = self._downtime * (i + 1) / self.DOWNTIME_STEPS - self._vm.log.debug('setting migration downtime to %d', downtime) - self._vm._dom.migrateSetMaxDowntime(downtime, 0) - - self._vm.log.debug('migration downtime thread exiting') - - def cancel(self): - self._vm.log.debug('canceling migration downtime thread') - self._stop.set() - - class MigrationMonitorThread(threading.Thread): _MIGRATION_MONITOR_INTERVAL = config.getint( 'vars', 'migration_monitor_interval') # seconds - def __init__(self, vm, startTime): + def __init__(self, vm, startTime, downTime): super(MigrationMonitorThread, self).__init__() self._stop = threading.Event() self._vm = vm self._startTime = startTime self.daemon = True self.progress = 0 + + self._downtime = downTime + delay_per_gib = config.getint('vars', 'migration_downtime_delay') + memSize = int(vm.conf['memSize']) + self._wait = (delay_per_gib * max(memSize, 2048) + 1023) / 1024 + self._downtime_interval = self._wait / self.DOWNTIME_STEPS + self._downtime_step = 0 @property def enabled(self): @@ -402,6 +371,7 @@ self._stop.wait(1.0) if self.enabled: self.monitor_migration(step) + self.monitor_downtime(step) step += 1 self._vm.log.debug('migration monitor thread exiting') @@ -467,6 +437,17 @@ ' data processed' % (timeElapsed / 1000, self.progress)) + def update_downtime(self, i): + return self._downtime * (i + 1) / self.DOWNTIME_STEPS + + def monitor_downtime(self, step): + if self._downtime_step < self.DOWNTIME_STEPS and \ + step % self._downtime_interval == 0: + downtime = self.update_downtime(self._downtime_step) + self._vm.log.debug('setting migration downtime to %d', downtime) + self._vm._dom.migrateSetMaxDowntime(downtime, 0) + self._downtime_step += 1 + def stop(self): self._vm.log.debug('stopping migration monitor thread') self._stop.set() -- To view, visit http://gerrit.ovirt.org/25977 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I7ac66331b44435a9cffeb9de1454db6843245979 Gerrit-PatchSet: 1 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Francesco Romani <fromani(a)redhat.com>

5 43

Change in vdsm[master]: virt: migration: add monitor thread control loop
by fromani＠redhat.com 18 Sep '14

18 Sep '14

Francesco Romani has uploaded a new change for review. Change subject: virt: migration: add monitor thread control loop ...................................................................... virt: migration: add monitor thread control loop This patch introduces a control loop in the monitor thread to factor out the scheduling logic from the worker method. This is a necessary step toward the integration of the MigrationMonitor and MigrationDowntime threads. Change-Id: Ie422bead060c8ba2bfd4bfada522b91d56697841 Signed-off-by: Francesco Romani <fromani(a)redhat.com> --- M vdsm/migration.py 1 file changed, 24 insertions(+), 23 deletions(-) git pull ssh://gerrit.ovirt.org:29418/vdsm refs/changes/76/25976/1 diff --git a/vdsm/migration.py b/vdsm/migration.py index 3699ca5..1234471 100644 --- a/vdsm/migration.py +++ b/vdsm/migration.py @@ -392,30 +392,34 @@ return MigrationMonitorThread._MIGRATION_MONITOR_INTERVAL > 0 def run(self): - if self.enabled: - self.monitor_migration() - else: - self.idle() + self._vm.log.debug('starting migration monitor thread') - def monitor_migration(self): + step = 1 + self._lastProgressTime = time.time() + self._lowmark = None + + while not self._stop.isSet(): + self._stop.wait(1.0) + if self.enabled: + self.monitor_migration(step) + step += 1 + + self._vm.log.debug('migration monitor thread exiting') + + def monitor_migration(self, step): def calculateProgress(remaining, total): if remaining == 0: return 100 progress = 100 - 100 * remaining / total if total else 0 return progress if (progress < 100) else 99 - self._vm.log.debug('starting migration monitor thread') - memSize = int(self._vm.conf['memSize']) maxTimePerGiB = config.getint('vars', 'migration_max_time_per_gib_mem') migrationMaxTime = (maxTimePerGiB * memSize + 1023) / 1024 - lastProgressTime = time.time() - lowmark = None progress_timeout = config.getint('vars', 'migration_progress_timeout') - while not self._stop.isSet(): - self._stop.wait(self._MIGRATION_MONITOR_INTERVAL) + if step % self._MIGRATION_MONITOR_INTERVAL == 0: (jobType, timeElapsed, _, dataTotal, dataProcessed, dataRemaining, memTotal, memProcessed, memRemaining, @@ -432,39 +436,36 @@ now - self._startTime, migrationMaxTime) abort = True - elif (lowmark is None) or (lowmark > dataRemaining): - lowmark = dataRemaining - lastProgressTime = now - elif (now - lastProgressTime) > progress_timeout: + elif (self._lowmark is None) or (self._lowmark > dataRemaining): + self._lowmark = dataRemaining + self._lastProgressTime = now + elif (now - self._lastProgressTime) > progress_timeout: # Migration is stuck, abort self._vm.log.warn( 'Migration is stuck: Hasn\'t progressed in %s seconds. ' - 'Aborting.' % (now - lastProgressTime)) + 'Aborting.' % (now - self._lastProgressTime)) abort = True if abort: self._vm._dom.abortJob() self.stop() - break + return - if dataRemaining > lowmark: + if dataRemaining > self._lowmark: self._vm.log.warn( 'Migration stalling: remaining (%sMiB)' ' > lowmark (%sMiB).' ' Refer to RHBZ#919201.', - dataRemaining / Mbytes, lowmark / Mbytes) + dataRemaining / Mbytes, self._lowmark / Mbytes) if jobType == 0: - continue + return self.progress = calculateProgress(dataRemaining, dataTotal) self._vm.log.info('Migration Progress: %s seconds elapsed, %s%% of' ' data processed' % (timeElapsed / 1000, self.progress)) - - def idle(self): - self._stop.wait(1.0) def stop(self): self._vm.log.debug('stopping migration monitor thread') -- To view, visit http://gerrit.ovirt.org/25976 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ie422bead060c8ba2bfd4bfada522b91d56697841 Gerrit-PatchSet: 1 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Francesco Romani <fromani(a)redhat.com>

5 49

Change in vdsm[master]: add xmlrpcTests for cpu pinning
by lvroyce＠linux.vnet.ibm.com 15 Sep '14

15 Sep '14

Royce Lv has uploaded a new change for review. Change subject: add xmlrpcTests for cpu pinning ...................................................................... add xmlrpcTests for cpu pinning Change-Id: Ia865f0d5eb4c9aabff6cef57b088c55df73a309e Signed-off-by: Royce Lv<lvroyce(a)linux.vnet.ibm.com> --- M tests/functional/xmlrpcTests.py M tests/vdsClientTests.py 2 files changed, 40 insertions(+), 0 deletions(-) git pull ssh://gerrit.ovirt.org:29418/vdsm refs/changes/12/8412/1 diff --git a/tests/functional/xmlrpcTests.py b/tests/functional/xmlrpcTests.py index 9c865db..2684d0f 100644 --- a/tests/functional/xmlrpcTests.py +++ b/tests/functional/xmlrpcTests.py @@ -174,3 +174,33 @@ destroyResult = self.s.destroy(VMID) self.assertVdsOK(destroyResult) + + def testCpuPin(self): + self.skipNoKVM() + + def assertVMAndGuestUp(): + self.assertVmUp(VMID) + self.assertGuestUp(VMID) + + VMID = '77777777-ffff-3333-aaaa-222222222222' + + with kernelBootImages() as (kernelPath, initramfsPath): + conf = {'display': 'vnc', + 'kernel': kernelPath, + 'initrd': initramfsPath, + 'kernelArgs': 'rd.break=cmdline rd.shell rd.skipfsck', + 'kvmEnable': 'true', + 'memSize': '256', + 'vmId': VMID, + 'vmName': 'vdsm_testPinVM', + 'vmType': 'kvm', + 'cpuPinning': {'emulator': '0', '0': '1'}} + + try: + self.assertVdsOK(self.s.create(conf)) + # wait 65 seconds for VM to come up until timeout + self.retryAssert(assertVMAndGuestUp, 65, 1) + finally: + destroyResult = self.s.destroy(VMID) + + self.assertVdsOK(destroyResult) diff --git a/tests/vdsClientTests.py b/tests/vdsClientTests.py index abf3242..57e6e74 100644 --- a/tests/vdsClientTests.py +++ b/tests/vdsClientTests.py @@ -118,3 +118,13 @@ allArgs[-1] = 'cpuPinning={0:1,1:0}' r4 = serv.do_create(['/dev/null'] + allArgs) self.assertNotEquals(r4, expectResult) + + # test just pin emulator + allArgs[-1] = "cpuPinning={emulator:1-3}" + r5 = serv.do_create(['/dev/null'] + allArgs) + self.assertEquals(r5['cpuPinning'],{'emulator':'1-3'}) + + # test pin emultor and vcpu + allArgs[-1] = "cpuPinning={emulator:1-3,1:0}" + r6 = serv.do_create(['/dev/null'] + allArgs) + self.assertEquals(r6['cpuPinning'],{'emulator':'1-3','1':'0'}) -- To view, visit http://gerrit.ovirt.org/8412 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ia865f0d5eb4c9aabff6cef57b088c55df73a309e Gerrit-PatchSet: 1 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Royce Lv <lvroyce(a)linux.vnet.ibm.com>

10 39

Change in vdsm[master]: [WIP]add simple balloon functional testcase
by lvroyce＠linux.vnet.ibm.com 13 Sep '14

13 Sep '14

Royce Lv has uploaded a new change for review. Change subject: [WIP]add simple balloon functional testcase ...................................................................... [WIP]add simple balloon functional testcase Change-Id: Ie8140fe1c754d9d4026c503a19420e6552a3f4fe Signed-off-by: Royce Lv<lvroyce(a)linux.vnet.ibm.com> --- M tests/functional/xmlrpcTests.py 1 file changed, 34 insertions(+), 0 deletions(-) git pull ssh://gerrit.ovirt.org:29418/vdsm refs/changes/20/12820/1 diff --git a/tests/functional/xmlrpcTests.py b/tests/functional/xmlrpcTests.py index 3eb65e4..88dd2c5 100644 --- a/tests/functional/xmlrpcTests.py +++ b/tests/functional/xmlrpcTests.py @@ -19,6 +19,7 @@ # import os +import time import tempfile import pwd import grp @@ -29,6 +30,7 @@ from testrunner import VdsmTestCase as TestCaseBase from testrunner import permutations, expandPermutations from nose.plugins.skip import SkipTest +from momTests import skipNoMOM try: import rtslib except ImportError: @@ -169,6 +171,38 @@ with RollbackContext() as rollback: self._runVMKernelBootTemplate(rollback, customization) + @skipNoKVM + @skipNoMOM + def testSmallVMBallooning(self): + policyStr = """ + (def set_guest (guest) + { + (guest.Control "balloon_target" 0) + }) + (with Guests guest (set_guest guest))""" + balloonSpec = {'device': 'memballoon', + 'type': 'balloon', + 'specParams': {'model': 'virtio'}} + customization = {'vmId': '77777777-ffff-3333-bbbb-555555555555', + 'vmName': 'vdsm_testBalloonVM', + 'devices': [balloonSpec]} + policy = {'balloon': policyStr} + + with RollbackContext() as rollback: + self._runVMKernelBootTemplate(rollback, customization) + self._enableBalloonPolicy(policy, rollback) + time.sleep(12) # MOM policy engine wake up evey 10s + balloonInf = self.s.getVmStats( + customization['vmId'])['statsList'][0]['balloonInfo'] + self.assertEqual(balloonInf['balloon_cur'], 0) + + def _enableBalloonPolicy(self, policy, rollback): + r = self.s.setMOMPolicy(policy) + self.assertVdsOK(r) + undo = lambda: \ + self.assertVdsOK(self.s.resetMOMPolicy()) + rollback.prependDefer(undo) + def _runVMKernelBootTemplate(self, rollback, vmDef={}, distro='fedora'): kernelArgsDistro = { # Fedora: The initramfs is generated by dracut. The following -- To view, visit http://gerrit.ovirt.org/12820 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ie8140fe1c754d9d4026c503a19420e6552a3f4fe Gerrit-PatchSet: 1 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Royce Lv <lvroyce(a)linux.vnet.ibm.com>

10 53

Change in vdsm[master]: testing storageTest.py as CI job.
by vvolansk＠redhat.com 28 Aug '14

28 Aug '14

Vered Volansky has uploaded a new change for review. Change subject: testing storageTest.py as CI job. ...................................................................... testing storageTest.py as CI job. Change-Id: I4d0caab1749e075f3650c91161b473e66b19977d Signed-off-by: Vered Volansky <vvolansk(a)redhat.com> --- M vdsm/storage/sp.py 1 file changed, 1 insertion(+), 0 deletions(-) git pull ssh://gerrit.ovirt.org:29418/vdsm refs/changes/43/23343/1 diff --git a/vdsm/storage/sp.py b/vdsm/storage/sp.py index 0bab95d..0cb7164 100644 --- a/vdsm/storage/sp.py +++ b/vdsm/storage/sp.py @@ -1,6 +1,7 @@ # # Copyright 2009-2011 Red Hat, Inc. # +# # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by # the Free Software Foundation; either version 2 of the License, or -- To view, visit http://gerrit.ovirt.org/23343 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I4d0caab1749e075f3650c91161b473e66b19977d Gerrit-PatchSet: 1 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Vered Volansky <vvolansk(a)redhat.com>

4 50

Change in vdsm[master]: Create GuestAgent instance in __init__ and connect later
by Vinzenz Feenstra 14 Aug '14

14 Aug '14

Vinzenz Feenstra has uploaded a new change for review. Change subject: Create GuestAgent instance in __init__ and connect later ...................................................................... Create GuestAgent instance in __init__ and connect later This is not only a cosmetic improvement. There are cases where we are trying to call methods of the GuestAgent before the instance was created. To avoid these race conditions we're creating the instance of the guest agent already in the __init__ phase. Change-Id: I82f7397b01bff48a3c635eee9912cc67cf722b13 Signed-off-by: Vinzenz Feenstra <vfeenstr(a)redhat.com> --- M vdsm/guestIF.py M vdsm/vm.py 2 files changed, 7 insertions(+), 6 deletions(-) git pull ssh://gerrit.ovirt.org:29418/vdsm refs/changes/42/26142/1 diff --git a/vdsm/guestIF.py b/vdsm/guestIF.py index 1f8d18d..1eaa42b 100644 --- a/vdsm/guestIF.py +++ b/vdsm/guestIF.py @@ -108,7 +108,7 @@ MAX_MESSAGE_SIZE = 2 ** 20 # 1 MiB for now def __init__(self, socketName, channelListener, log, user='Unknown', - ips='', connect=True): + ips=''): self.effectiveApiVersion = _IMPLICIT_API_VERSION_ZERO self.log = log self._socketName = socketName @@ -128,7 +128,8 @@ self._agentTimestamp = 0 self._channelListener = channelListener self._messageState = MessageState.NORMAL - if connect: + + def connect(self): try: self._prepare_socket() except: diff --git a/vdsm/vm.py b/vdsm/vm.py index 1390c6e..7fbf07a 100644 --- a/vdsm/vm.py +++ b/vdsm/vm.py @@ -2008,7 +2008,6 @@ self._volPrepareLock = threading.Lock() self._initTimePauseCode = None self._initTimeRTC = long(self.conf.get('timeOffset', 0)) - self.guestAgent = None self._guestEvent = 'Powering up' self._guestEventTime = 0 self._vmStats = None @@ -2028,6 +2027,8 @@ self.conf['vmName'] = 'n%s' % self.id self._guestSocketFile = self._makeChannelPath(_VMCHANNEL_DEVICE_NAME) self._qemuguestSocketFile = self._makeChannelPath(_QEMU_GA_DEVICE_NAME) + self.guestAgent = guestIF.GuestAgent( + self._guestSocketFile, self.cif.channelListener, self.log) self._lastXMLDesc = '<domain><uuid>%s</uuid></domain>' % self.id self._devXmlHash = '0' self._released = False @@ -3128,9 +3129,8 @@ # VmStatsThread may use block devices info from libvirt. # So, run it after you have this info self._initVmStats() - self.guestAgent = guestIF.GuestAgent( - self._guestSocketFile, self.cif.channelListener, self.log, - connect=utils.tobool(self.conf.get('vmchannel', 'true'))) + if utils.tobool(self.conf.get('vmchannel', 'true')): + self.guestAgent.connect() self._guestCpuRunning = (self._dom.info()[0] == libvirt.VIR_DOMAIN_RUNNING) -- To view, visit http://gerrit.ovirt.org/26142 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I82f7397b01bff48a3c635eee9912cc67cf722b13 Gerrit-PatchSet: 1 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Vinzenz Feenstra <vfeenstr(a)redhat.com>

7 35

← Newer
1
2
3
4
5
6
7
...
41
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

vdsm-patches March 2014