anaconda-patches December 2015

anaconda-patches@lists.fedorahosted.org

9 participants
498 discussions

[master 4/24] Teardown all devices before tearing disk images down
by dashea 01 Dec '15

01 Dec '15

From: Vratislav Podzimek <vpodzime(a)redhat.com> DM maps cannot be removed while they are in use so in order to make them removable, we need to teardown all devices "built" on top of them first. Since we don't support using disk images together with real disks we can safely just tear all devices down. This makes our examples (and possibly some tests) better clean after themselves. --- blivet/devicetree.py | 3 +++ 1 file changed, 3 insertions(+) diff --git a/blivet/devicetree.py b/blivet/devicetree.py index fe10aa5..953d977 100644 --- a/blivet/devicetree.py +++ b/blivet/devicetree.py @@ -1048,6 +1048,9 @@ def setup_disk_images(self): def teardown_disk_images(self): """ Tear down any disk image stacks. """ + # teardown all devices first so that there's nothing active running on + # top of disk images when we try to tear those down + self.teardown_all() self._populator.teardown_disk_images() @property -- To view this commit on github, visit https://github.com/rhinstaller/blivet/commit/1111ba89d6f11f75c3c6b545955df0…

1 0

[master 3/24] Define the Device.parent property with the @property decorator
by dashea 01 Dec '15

01 Dec '15

From: Vratislav Podzimek <vpodzime(a)redhat.com> It's just more common these days and the definition is easier to find and recognize in the sources. --- blivet/devices/device.py | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/blivet/devices/device.py b/blivet/devices/device.py index 48ea554..62637aa 100644 --- a/blivet/devices/device.py +++ b/blivet/devices/device.py @@ -148,18 +148,18 @@ def _init_parent_list(self): for parent in list(self._parents): self._parents.remove(parent) - def _set_parent_list(self, parents): + @property + def parents(self): + """ Devices upon which this device is built """ + return self._parents + + @parents.setter + def parents(self, parents): """ Set this instance's parent list. """ self._init_parent_list() for parent in parents: self._parents.append(parent) - def _get_parent_list(self): - return self._parents - - parents = property(_get_parent_list, _set_parent_list, - doc="devices upon which this device is built") - @property def dict(self): d = {"type": self.type, "name": self.name, -- To view this commit on github, visit https://github.com/rhinstaller/blivet/commit/24799edea1a46b6ded5cc0ead13e64…

1 0

[master 2/24] Honor the LV segment type when creating it
by dashea 01 Dec '15

01 Dec '15

From: Vratislav Podzimek <vpodzime(a)redhat.com> This really only takes care about passing the type down to libblockdev and thus lvcreate. We need to a lot more to actually fully support various types of LVs. --- blivet/devices/lvm.py | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/blivet/devices/lvm.py b/blivet/devices/lvm.py index 159e3ef..de40fd6 100644 --- a/blivet/devices/lvm.py +++ b/blivet/devices/lvm.py @@ -841,7 +841,9 @@ def _create(self): # TODO: specify sizes together with PVs once LVM and libblockdev support it pvs = [spec.pv.path for spec in self._pv_specs] pvs = pvs or None - blockdev.lvm.lvcreate(self.vg.name, self._name, self.size, pv_list=pvs) + + blockdev.lvm.lvcreate(self.vg.name, self._name, self.size, + type=self.seg_type, pv_list=pvs) else: mode = blockdev.lvm.cache_get_mode_from_str(self.cache.mode) # prepare the list of fast PV devices -- To view this commit on github, visit https://github.com/rhinstaller/blivet/commit/d96d2a807ae4f871813ee38886bfb5…

1 0

Updated: [rhinstaller/blivet/pulls/286 master] LVM RAID
by dashea 01 Dec '15

01 Dec '15

This adds an elementary support of non-linear LVs to Blivet. The first patch is unrelated, but also useful. Tests will follow later. -- To view this pull request on github, visit https://github.com/rhinstaller/blivet/pull/286

1 0

[master 1/24] Let LVMLogicalVolumeDevice specify PVs it should be allocated from
by dashea 01 Dec '15

01 Dec '15

From: Vratislav Podzimek <vpodzime(a)redhat.com> This allows for more precise configuration of how the LVM setup should look like. We already have some rudimentary support for specifying PVs for caches which is a must, but it's useful for all LVs in general. Thanks dlehman(a)redhat.com for pieces of code and ideas for this patch! --- blivet/devices/lvm.py | 48 +++++++++++++++++++++++++++++++++++++++--------- 1 file changed, 39 insertions(+), 9 deletions(-) diff --git a/blivet/devices/lvm.py b/blivet/devices/lvm.py index 350e423..159e3ef 100644 --- a/blivet/devices/lvm.py +++ b/blivet/devices/lvm.py @@ -27,6 +27,7 @@ import re import os import time +from collections import namedtuple import gi gi.require_version("BlockDev", "1.0") @@ -72,6 +73,10 @@ def get_internal_lv_class(lv_attr): return None +LVPVSpec = namedtuple("LVPVSpec", ["pv", "size"]) +""" A namedtuple class for specifying how much space on a PV should be allocated for some LV """ + + class LVMVolumeGroupDevice(ContainerDevice): """ An LVM Volume Group """ @@ -512,7 +517,7 @@ class LVMLogicalVolumeDevice(DMDevice): def __init__(self, name, parents=None, size=None, uuid=None, seg_type=None, fmt=None, exists=False, sysfs_path='', grow=None, maxsize=None, - percent=None, cache_request=None): + percent=None, cache_request=None, pvs=None): """ :param name: the device name (generally a device node's basename) :type name: str @@ -544,6 +549,8 @@ def __init__(self, name, parents=None, size=None, uuid=None, seg_type=None, :type percent: int :keyword cache_request: parameters of requested cache (if any) :type cache_request: :class:`~.devices.lvm.LVMCacheRequest` + :keyword pvs: list of PVs to allocate extents from (size could be specified for each PV) + :type pvs: list of :class:`~.devices.StorageDevice` or :class:`LVPVSpec` objects (tuples) """ @@ -581,6 +588,21 @@ def __init__(self, name, parents=None, size=None, uuid=None, seg_type=None, self._cache = LVMCache(self, size=cache_request.size, exists=False, fast_pvs=cache_request.fast_devs, mode=cache_request.mode) + self._pv_specs = [] + for pv_spec in pvs: + if isinstance(pv_spec, LVPVSpec): + self._pv_specs.append(pv_spec) + elif isinstance(pv_spec, StorageDevice): + self._pv_specs.append(LVPVSpec(pv_spec, Size(0))) + else: + raise ValueError("Invalid PV spec '%s' for the '%s' LV" % (pv_spec, self.name)) + # Make sure any destination PVs are actually PVs in this VG + if not set(spec.pv for spec in self._pv_specs).issubset(set(self.vg.parents)): + missing = [r.name for r in + set(spec.pv for spec in self._pv_specs).difference(set(self.vg.parents))] + msg = "invalid destination PV(s) %s for LV %s" % (missing, self.name) + raise ValueError(msg) + def _check_parents(self): """Check that this device has parents as expected""" @@ -816,7 +838,10 @@ def _create(self): # should we use --zero for safety's sake? if not self.cache: # just a plain LV - blockdev.lvm.lvcreate(self.vg.name, self._name, self.size) + # TODO: specify sizes together with PVs once LVM and libblockdev support it + pvs = [spec.pv.path for spec in self._pv_specs] + pvs = pvs or None + blockdev.lvm.lvcreate(self.vg.name, self._name, self.size, pv_list=pvs) else: mode = blockdev.lvm.cache_get_mode_from_str(self.cache.mode) # prepare the list of fast PV devices @@ -828,13 +853,17 @@ def _create(self): else: fast_pvs.append(pv_name) - # get the list of all fast PV devices used in the VG so that we can - # consider the rest to be slow PVs and generate a list of them - all_fast_pvs_names = set() - for lv in self.vg.lvs: - if lv.cached and lv.cache.fast_pvs: - all_fast_pvs_names |= set(pv.name for pv in lv.cache.fast_pvs) - slow_pvs = [pv.path for pv in self.vg.pvs if pv.name not in all_fast_pvs_names] + if self._pv_specs: + # (slow) PVs specified for this LV + slow_pvs = [spec.pv.path for spec in self._pv_specs] + else: + # get the list of all fast PV devices used in the VG so that we can + # consider the rest to be slow PVs and generate a list of them + all_fast_pvs_names = set() + for lv in self.vg.lvs: + if lv.cached and lv.cache.fast_pvs: + all_fast_pvs_names |= set(pv.name for pv in lv.cache.fast_pvs) + slow_pvs = [pv.path for pv in self.vg.pvs if pv.name not in all_fast_pvs_names] # VG name, LV name, data size, cache size, metadata size, mode, flags, slow PVs, fast PVs # XXX: we need to pass slow_pvs+fast_pvs as slow PVs because parts @@ -1573,6 +1602,7 @@ def _create(self): else: profile_name = None # TODO: chunk size, data/metadata split --> profile + # TODO: allow for specification of PVs blockdev.lvm.thpoolcreate(self.vg.name, self.lvname, self.size, md_size=self.metadata_size, chunk_size=self.chunk_size, -- To view this commit on github, visit https://github.com/rhinstaller/blivet/commit/6e2a6875f300ba70d84cc400323abb…

1 0

Re: [rhinstaller/anaconda/pulls/463 master] Translation tests
by dashea 01 Dec '15

01 Dec '15

Trying again with a subtree, suggested by @M4rtinK, which seems a lot less annoying. Instead of a remote ref, translation-canary gets merged into this project in a way that can it can be managed as a separate entity. -- To view this pull request on github, visit https://github.com/rhinstaller/anaconda/pull/463

1 0

Re: [rhinstaller/blivet/pulls/289 1.x-branch] Update partedPartition before (un)setting partition flags
by dashea 01 Dec '15

01 Dec '15

Added label: ACK. -- To view this pull request on github, visit https://github.com/rhinstaller/blivet/pull/289

1 0

Re: [rhinstaller/blivet/pulls/289 1.x-branch] Update partedPartition before (un)setting partition flags
by dashea 01 Dec '15

01 Dec '15

Looks good to me. -- To view this pull request on github, visit https://github.com/rhinstaller/blivet/pull/289

1 0

[master 6/6] Run the translation-canary/translated tests
by dashea 01 Dec '15

01 Dec '15

From: David Shea <dshea(a)redhat.com> These tests will be run on the source tarball during 'make release' and 'make ci'. --- Makefile.am | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/Makefile.am b/Makefile.am index 7920e6b..2583b48 100644 --- a/Makefile.am +++ b/Makefile.am @@ -96,7 +96,9 @@ scratch-bumpver: po-empty PYTHONPATH=$(srcdir)/translation-canary python3 -m translatable $(srcdir)/po/$(PACKAGE_NAME).pot release: - $(MAKE) dist && $(MAKE) tag && git checkout -- $(srcdir)/po/$(PACKAGE_NAME).pot + $(MAKE) dist + PYTHONPATH=$(srcdir)/translation-canary python3 -m translated $(PACKAGE_NAME)-$(PACKAGE_VERSION).tar.bz2 + git checkout -- $(srcdir)/po/$(PACKAGE_NAME).pot rc-release: scratch-bumpver scratch mock -r $(MOCKCHROOT) --scrub all || exit 1 @@ -177,6 +179,7 @@ runglade: glade ${GLADE_FILE} ci: rc-release + @PYTHONPATH=$(srcdir)/translation-canary python3 -m translated $(PACKAGE_NAME)-$(PACKAGE_VERSION).tar.bz2 @rm -f tests/test-suite.log.* @mkdir -p $(USER_SITE_PACKAGES) @cp $(abs_builddir)/tests/usercustomize.py $(USER_SITE_PACKAGES) -- To view this commit on github, visit https://github.com/rhinstaller/anaconda/commit/34cb84ee75cd75d7058ee1a499fc…

1 0

[master 5/6] Run translation-canary/translatable tests after pot-update
by dashea 01 Dec '15

01 Dec '15

From: David Shea <dshea(a)redhat.com> This ensures that unsuitable strings do not end up in the POT file. Using the xgettext_werror wrapper replaces the function of the gettext_warnings test. --- Makefile.am | 7 ++++++ po/Makevars | 3 +++ tests/Makefile.am | 2 -- tests/gettext_tests/gettext_warnings.sh | 44 --------------------------------- 4 files changed, 10 insertions(+), 46 deletions(-) delete mode 100755 tests/gettext_tests/gettext_warnings.sh diff --git a/Makefile.am b/Makefile.am index 3e0ae5a..7920e6b 100644 --- a/Makefile.am +++ b/Makefile.am @@ -23,6 +23,11 @@ SUBDIRS = data docs dracut po pyanaconda scripts tests widgets utils EXTRA_DIST = config.rpath COPYING .coveragerc +# Include the "translatable" files from translation-canary for POT updates +# during distcheck +EXTRA_DIST += $(srcdir)/translation-canary/translatable/*.py \ + $(srcdir)/translation-canary/translatable/*.sh + # Files generated for gettext need to be included in the distribution EXTRA_DIST += $(srcdir)/anaconda.po $(srcdir)/anaconda.po: $(srcdir)/anaconda @@ -88,6 +93,7 @@ scratch-bumpver: po-empty fi ; \ ( cd $(srcdir) && scripts/makebumpver --skip-zanata $${opts} ) || exit 1 ; \ $(MAKE) -C po $(PACKAGE_NAME).pot-update + PYTHONPATH=$(srcdir)/translation-canary python3 -m translatable $(srcdir)/po/$(PACKAGE_NAME).pot release: $(MAKE) dist && $(MAKE) tag && git checkout -- $(srcdir)/po/$(PACKAGE_NAME).pot @@ -113,6 +119,7 @@ bumpver: po-pull fi ; \ ( cd $(srcdir) && scripts/makebumpver $${opts} ) || exit 1 ; \ $(MAKE) -C po $(PACKAGE_NAME).pot-update && \ + PYTHONPATH=$(srcdir)/translation-canary python3 -m translatable $(srcdir)/po/$(PACKAGE_NAME).pot && \ zanata push $(ZANATA_PUSH_ARGS) # Install all packages specified as BuildRequires in the Anaconda specfile diff --git a/po/Makevars b/po/Makevars index f52adbe..f6a96d1 100644 --- a/po/Makevars +++ b/po/Makevars @@ -7,6 +7,9 @@ DOMAIN = $(PACKAGE) subdir = po top_builddir = .. +# Wrap xgettext in a script that fails on warnings +XGETTEXT = $(top_srcdir)/translation-canary/translatable/xgettext_werror.sh + # These options get passed to xgettext. XGETTEXT_OPTIONS = --keyword=_ --keyword=N_ --keyword=P_:1,2 --keyword=C_:1c,2 --keyword=CN_:1c,2 --keyword=CP_:1c,2,3 --from-code=UTF-8 diff --git a/tests/Makefile.am b/tests/Makefile.am index be2bdf0..6ea640d 100644 --- a/tests/Makefile.am +++ b/tests/Makefile.am @@ -46,7 +46,6 @@ dist_check_SCRIPTS = $(srcdir)/glade/*.py \ cppcheck/runcppcheck.sh \ testenv.sh \ $(srcdir)/gettext_tests/*.py \ - gettext_tests/gettext_warnings.sh \ storage/run_storage_tests.py \ install/run_install_test.sh \ $(srcdir)/gui/*.ks \ @@ -60,7 +59,6 @@ TESTS = nosetests.sh \ pylint/runpylint.py \ cppcheck/runcppcheck.sh \ gettext_tests/click.py \ - gettext_tests/gettext_warnings.sh \ gettext_tests/gettext_potfiles.py \ gettext_tests/style_guide.py \ gettext_tests/contexts.py \ diff --git a/tests/gettext_tests/gettext_warnings.sh b/tests/gettext_tests/gettext_warnings.sh deleted file mode 100755 index 2974e32..0000000 --- a/tests/gettext_tests/gettext_warnings.sh +++ /dev/null @@ -1,44 +0,0 @@ -#!/bin/sh -e - -if [ -z "$top_srcdir" ]; then - top_srcdir="$(dirname "$0")/../.." - . "${top_srcdir}/tests/testenv.sh" -fi -podir="${top_builddir}/po" -POTFILES="${podir}/POTFILES" - -# Extract XGETTEXT_OPTIONS from po/Makevars -# Makevars is one of our files, so it's in $srcdir -XGETTEXT_OPTIONS="$(sed -n 's/^[[:space:]]*XGETTEXT_OPTIONS[[:space:]]*=[[:space:]]*$.*$/\1/p' \ - "${top_srcdir}/po/Makevars")" - -# Fail if POTFILES doesn't exist, since set -e doesn't catch this for some -# dumb reason that I'm sure has a long and storied history -if [ ! -f "${POTFILES}" ] ; then - echo "POTFILES does not exist" - exit 1 -fi - -status=0 -# For each file in POTFILES, run xgettext and look for warnings -while read -r potfile ; do - # Strip the spaces and trailing backslash - potfile="$(echo "$potfile" | sed 's/^[[:space:]]*$[^[:space:]]*$[[:space:]]*\\\?$/\1/')" - - # $potfile is relative to the po/ directory, $test_potfile is - # relative to this script's working directory - test_potfile="${podir}/${potfile}" - - # If the file doesn't exist, try to make it - if [ ! -f "$test_potfile" ]; then - make -C "${podir}" "${potfile}" || exit 1 - fi - - xgettext_output="$(xgettext ${XGETTEXT_OPTIONS} -o /dev/null "$test_potfile" 2>&1)" || status=1 - if echo "$xgettext_output" | fgrep -q 'warning:' ; then - echo "$xgettext_output" - status=1 - fi -done < "$POTFILES" - -exit "$status" -- To view this commit on github, visit https://github.com/rhinstaller/anaconda/commit/ef40c961d78b3b2d51b5ea4bf116…

1 0

Jump to page:

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

anaconda-patches December 2015