Merge remote-tracking branch 'origin/3.10-devel' into 3.10-release

Author: vojtechtrefny

.packit.yaml

@@ -4,7 +4,7 @@ actions:
     - 'git config user.email "blivet-ci@example.com"'
     - 'git config user.name "Blivet CI"'
     # merge the release branch to get correct version in spec
-    - 'git merge --ff origin/3.9-release'
+    - 'git merge --ff origin/3.10-release'
     # bump release to 99 to always be ahead of Fedora builds
     - 'bash -c "sed -i -r \"s/Release:(\s*)\S+/Release: 99%{?dist}/\" python-blivet.spec"'
   get-current-version:
@@ -30,7 +30,7 @@ jobs:
   trigger: commit
   owner: "@storage"
   project: blivet-daily
-  branch: 3.9-devel
+  branch: 3.10-devel
   preserve_project: true
 
 srpm_build_deps:

blivet/actionlist.py

@@ -22,7 +22,6 @@
 
 import copy
 from functools import wraps
-from six import add_metaclass
 
 from .callbacks import callbacks as _callbacks
 from .deviceaction import ActionCreateDevice
@@ -53,8 +52,7 @@ def wrapped_func(obj, *args, **kwargs):
     return run_func_with_flag_attr_set
 
 
-@add_metaclass(SynchronizedMeta)
-class ActionList(object):
+class ActionList(object, metaclass=SynchronizedMeta):
     _unsynchronized_methods = ['process']
 
     def __init__(self, addfunc=None, removefunc=None):

blivet/blivet.py

@@ -25,7 +25,6 @@
 import contextlib
 import time
 import functools
-import six
 
 from .storage_log import log_method_call, log_exception_info
 from .devices import BTRFSSubVolumeDevice, BTRFSVolumeDevice
@@ -62,8 +61,7 @@
 FSTAB_PATH = ""
 
 
-@six.add_metaclass(SynchronizedMeta)
-class Blivet(object):
+class Blivet(object, metaclass=SynchronizedMeta):
 
     """ Top-level class for managing storage configuration. """
 

blivet/deviceaction.py

@@ -22,8 +22,6 @@
 
 import copy
 
-from six import add_metaclass
-
 from . import util
 from . import udev
 from .errors import DependencyError, PartitioningError
@@ -108,8 +106,7 @@ def resize_type_from_string(type_string):
             return k
 
 
-@add_metaclass(SynchronizedMeta)
-class DeviceAction(util.ObjectID):
+class DeviceAction(util.ObjectID, metaclass=SynchronizedMeta):
 
     """ An action that will be carried out in the future on a Device.
 
@@ -295,10 +292,7 @@ def _to_string(self):
         return s
 
     def __str__(self):
-        return util.stringize(self._to_string())
-
-    def __unicode__(self):
-        return util.unicodeize(self._to_string())
+        return self._to_string()
 
     def requires(self, action):
         """ Return True if self requires action. """

blivet/devicefactory.py

@@ -20,8 +20,6 @@
 # Red Hat Author(s): David Lehman <dlehman@redhat.com>
 #
 
-from six import raise_from
-
 from .storage_log import log_method_call
 from .errors import DeviceFactoryError, StorageError
 from .devices import BTRFSDevice, DiskDevice
@@ -746,7 +744,7 @@ def _create_device(self):
         except (StorageError, blockdev.BlockDevError) as e:
             log.error("device post-create method failed: %s", e)
             self.storage.destroy_device(device)
-            raise_from(StorageError(e), e)
+            raise StorageError(e) from e
         else:
             if not device.size:
                 self.storage.destroy_device(device)
@@ -941,7 +939,7 @@ def configure(self):
                 self._revert_devicetree()
 
             if not isinstance(e, (StorageError, OverflowError)):
-                raise_from(DeviceFactoryError(e), e)
+                raise DeviceFactoryError(e) from e
 
             raise
 
@@ -2189,7 +2187,7 @@ def _create_device(self):
         except (StorageError, blockdev.BlockDevError) as e:
             log.error("device post-create method failed: %s", e)
             self.storage.destroy_device(device)
-            raise_from(StorageError(e), e)
+            raise StorageError(e) from e
         else:
             if not device.size:
                 self.storage.destroy_device(device)

blivet/devicelibs/raid.py

@@ -23,8 +23,6 @@
 
 import abc
 
-from six import add_metaclass
-
 from ..errors import RaidError
 from ..size import Size
 
@@ -38,8 +36,7 @@ def div_up(a, b):
     return (a + (b - 1)) // b
 
 
-@add_metaclass(abc.ABCMeta)
-class RAIDLevel(object):
+class RAIDLevel(object, metaclass=abc.ABCMeta):
 
     """An abstract class which is the parent of all classes which represent
        a RAID level.
@@ -77,8 +74,7 @@ def __deepcopy__(self, memo):
         return self
 
 
-@add_metaclass(abc.ABCMeta)
-class RAIDn(RAIDLevel):
+class RAIDn(RAIDLevel, metaclass=abc.ABCMeta):
 
     """An abstract class which is the parent of classes which represent a
        numeric RAID level. A better word would be classification, since 'level'

blivet/devicelibs/stratis.py

@@ -46,6 +46,8 @@
 
 STRATIS_FS_SIZE = Size("1 TiB")
 
+STRATIS_CALL_TIMEOUT = 120 * 1000  # 120 s (used by stratis-cli by default) in ms
+
 
 safe_name_characters = "0-9a-zA-Z._-"
 
@@ -60,7 +62,7 @@ def pool_used(dev_sizes, encrypted=False):
     if encrypted:
         cmd.append("--encrypted")
 
-    rc, out = util.run_program_and_capture_output(cmd)
+    rc, out = util.run_program_and_capture_output(cmd, stderr_to_stdout=True)
     if rc:
         raise StratisError("Failed to predict usage for stratis pool")
 
@@ -78,7 +80,8 @@ def filesystem_md_size(fs_size):
 
     rc, out = util.run_program_and_capture_output([availability.STRATISPREDICTUSAGE_APP.name, "filesystem",
                                                    "--filesystem-size",
-                                                   str(fs_size.get_bytes())])
+                                                   str(fs_size.get_bytes())],
+                                                  stderr_to_stdout=True)
     if rc:
         raise StratisError("Failed to predict usage for stratis filesystem: %s" % out)
 
@@ -107,7 +110,8 @@ def remove_pool(pool_uuid):
                                                      STRATIS_PATH,
                                                      STRATIS_MANAGER_INTF,
                                                      "DestroyPool",
-                                                     GLib.Variant("(o)", (pool_info.object_path,)))
+                                                     GLib.Variant("(o)", (pool_info.object_path,)),
+                                                     timeout=STRATIS_CALL_TIMEOUT)
     except safe_dbus.DBusCallError as e:
         raise StratisError("Failed to remove stratis pool: %s" % str(e))
     else:
@@ -135,7 +139,8 @@ def remove_filesystem(pool_uuid, fs_uuid):
                                                      pool_info.object_path,
                                                      STRATIS_POOL_INTF,
                                                      "DestroyFilesystems",
-                                                     GLib.Variant("(ao)", ([fs_info.object_path],)))
+                                                     GLib.Variant("(ao)", ([fs_info.object_path],)),
+                                                     timeout=STRATIS_CALL_TIMEOUT)
     except safe_dbus.DBusCallError as e:
         raise StratisError("Failed to remove stratis filesystem: %s" % str(e))
     else:
@@ -172,7 +177,7 @@ def set_key(key_desc, passphrase, key_file):
             os.close(write)
 
 
-def unlock_pool(pool_uuid):
+def unlock_pool(pool_uuid, method):
     if not availability.STRATIS_DBUS.available:
         raise StratisError("Stratis DBus service not available")
 
@@ -181,15 +186,15 @@ def unlock_pool(pool_uuid):
                                                       STRATIS_PATH,
                                                       STRATIS_MANAGER_INTF,
                                                       "UnlockPool",
-                                                      GLib.Variant("(ss)", (pool_uuid, "keyring")))
+                                                      GLib.Variant("(ss)", (pool_uuid, method)))
     except safe_dbus.DBusCallError as e:
         raise StratisError("Failed to unlock pool: %s" % str(e))
     else:
         if not succ:
             raise StratisError("Failed to unlock pool: %s" % err)
 
 
-def create_pool(name, devices, encrypted, passphrase, key_file):
+def create_pool(name, devices, encrypted, passphrase, key_file, clevis):
     if not availability.STRATIS_DBUS.available:
         raise StratisError("Stratis DBus service not available")
 
@@ -202,10 +207,18 @@ def create_pool(name, devices, encrypted, passphrase, key_file):
         key_desc = "blivet-%s" % name  # XXX what would be a good key description?
         set_key(key_desc, passphrase, key_file)
         key_opt = GLib.Variant("(bs)", (True, key_desc))
+        if clevis:
+            clevis_config = {"url": clevis.tang_url}
+            if clevis.tang_thumbprint:
+                clevis_config["thp"] = clevis.tang_thumbprint
+            else:
+                clevis_config["stratis:tang:trust_url"] = True
+            clevis_opt = GLib.Variant("(b(ss))", (True, (clevis.pin, json.dumps(clevis_config))))
+        else:
+            clevis_opt = GLib.Variant("(b(ss))", (False, ("", "")))
     else:
         key_opt = GLib.Variant("(bs)", (False, ""))
-
-    clevis_opt = GLib.Variant("(b(ss))", (False, ("", "")))
+        clevis_opt = GLib.Variant("(b(ss))", (False, ("", "")))
 
     try:
         ((succ, _paths), rc, err) = safe_dbus.call_sync(STRATIS_SERVICE,
@@ -214,7 +227,8 @@ def create_pool(name, devices, encrypted, passphrase, key_file):
                                                         "CreatePool",
                                                         GLib.Variant("(s(bq)as(bs)(b(ss)))", (name, raid_opt,
                                                                                               devices, key_opt,
-                                                                                              clevis_opt)))
+                                                                                              clevis_opt)),
+                                                        timeout=STRATIS_CALL_TIMEOUT)
     except safe_dbus.DBusCallError as e:
         raise StratisError("Failed to create stratis pool: %s" % str(e))
     else:
@@ -246,7 +260,34 @@ def create_filesystem(name, pool_uuid, fs_size=None):
                                                         pool_info.object_path,
                                                         STRATIS_POOL_INTF,
                                                         "CreateFilesystems",
-                                                        GLib.Variant("(a(s(bs)))", ([GLib.Variant("(s(bs))", (name, size_opt))],)))
+                                                        GLib.Variant("(a(s(bs)))", ([GLib.Variant("(s(bs))", (name, size_opt))],)),
+                                                        timeout=STRATIS_CALL_TIMEOUT)
+    except safe_dbus.DBusCallError as e:
+        raise StratisError("Failed to create stratis filesystem on '%s': %s" % (pool_info.name, str(e)))
+    else:
+        if not succ:
+            raise StratisError("Failed to create stratis filesystem on '%s': %s (%d)" % (pool_info.name, err, rc))
+
+    # repopulate the stratis info cache so the new filesystem will be added
+    stratis_info.drop_cache()
+
+
+def add_device(pool_uuid, device):
+    if not availability.STRATIS_DBUS.available:
+        raise StratisError("Stratis DBus service not available")
+
+    # repopulate the stratis info cache just to be sure all values are still valid
+    stratis_info.drop_cache()
+
+    pool_info = stratis_info.pools[pool_uuid]
+
+    try:
+        ((succ, _paths), rc, err) = safe_dbus.call_sync(STRATIS_SERVICE,
+                                                        pool_info.object_path,
+                                                        STRATIS_POOL_INTF,
+                                                        "AddDataDevs",
+                                                        GLib.Variant("(as)", ([device],)),
+                                                        timeout=STRATIS_CALL_TIMEOUT)
     except safe_dbus.DBusCallError as e:
         raise StratisError("Failed to create stratis filesystem on '%s': %s" % (pool_info.name, str(e)))
     else:

blivet/devices/__init__.py

@@ -25,7 +25,7 @@
 from .disk import DiskDevice, DiskFile, MultipathDevice, iScsiDiskDevice, FcoeDiskDevice, DASDDevice, ZFCPDiskDevice, NVMeNamespaceDevice, NVMeFabricsNamespaceDevice
 from .partition import PartitionDevice
 from .dm import DMDevice, DMLinearDevice, DMCryptDevice, DMIntegrityDevice, DM_MAJORS
-from .luks import LUKSDevice, IntegrityDevice
+from .luks import LUKSDevice, IntegrityDevice, BITLKDevice
 from .lvm import LVMVolumeGroupDevice, LVMLogicalVolumeDevice
 from .md import MDBiosRaidArrayDevice, MDContainerDevice, MDRaidArrayDevice, MD_MAJORS
 from .btrfs import BTRFSDevice, BTRFSVolumeDevice, BTRFSSubVolumeDevice, BTRFSSnapShotDevice

blivet/devices/cache.py

@@ -24,12 +24,10 @@
 
 """
 
-from six import add_metaclass
 import abc
 
 
-@add_metaclass(abc.ABCMeta)
-class Cache(object):
+class Cache(object, metaclass=abc.ABCMeta):
 
     """Abstract base class for cache objects providing the cache-related
     functionality on cached devices. Instances of this class are not expected to
@@ -74,8 +72,7 @@ def detach(self):
         """
 
 
-@add_metaclass(abc.ABCMeta)
-class CacheStats(object):
+class CacheStats(object, metaclass=abc.ABCMeta):
 
     """Abstract base class for common statistics of caches (cached
     devices). Inheriting classes are expected to add (cache-)type-specific
@@ -109,8 +106,7 @@ def misses(self):
         """number of misses"""
 
 
-@add_metaclass(abc.ABCMeta)
-class CacheRequest(object):
+class CacheRequest(object, metaclass=abc.ABCMeta):
 
     """Abstract base class for cache requests specifying cache parameters for a
     cached device

blivet/devices/container.py

@@ -21,8 +21,6 @@
 
 import abc
 
-from six import add_metaclass
-
 from .. import errors
 from ..storage_log import log_method_call
 from ..formats import get_device_format_class
@@ -34,8 +32,7 @@
 from .storage import StorageDevice
 
 
-@add_metaclass(SynchronizedABCMeta)
-class ContainerDevice(StorageDevice):
+class ContainerDevice(StorageDevice, metaclass=SynchronizedABCMeta):
 
     """ A device that aggregates a set of member devices.