Merge lp:~raharper/curtin/new-bionic-upstream-snapshot-v1 into lp:~curtin-dev/curtin/bionic

[Ryan Harper]

* New upstream snapshot.
  - Drop Precise from vmtest
  - clear_holders: bcache log IO/OS exceptions but do not raise
  - vmtest: Support newer qemu and multipath.
  - block: enable control over exclusive_open use when wiping volumes
  - block: handle wiping bcache parts (LP: #1718699)
  - vmtests: Defer ArtfulNetworkMtu SkipbyDate to 2018
  - bcache: accept sysfs write failure in shutdown handler if path missing
    (LP: #1700564)
  - vmtest: Rephrase a message about no disks to be less scary
  - block_meta: use block.wipe_volume(mode=superblock) to clear MBR/GPT tables
    (LP: #1722322)

=== modified file 'curtin/block/__init__.py'
--- curtin/block/__init__.py	2017-08-03 19:48:07 +0000
+++ curtin/block/__init__.py	2017-11-07 18:32:47 +0000
@@ -776,17 +776,21 @@
 
 
 @contextmanager
-def exclusive_open(path):
+def exclusive_open(path, exclusive=True):
     """
-    Obtain an exclusive file-handle to the file/device specified
+    Obtain an exclusive file-handle to the file/device specified unless
+    caller specifics exclusive=False.
     """
     mode = 'rb+'
     fd = None
     if not os.path.exists(path):
         raise ValueError("No such file at path: %s" % path)
 
+    flags = os.O_RDWR
+    if exclusive:
+        flags += os.O_EXCL
     try:
-        fd = os.open(path, os.O_RDWR | os.O_EXCL)
+        fd = os.open(path, flags)
         try:
             fd_needs_closing = True
             with os.fdopen(fd, mode) as fo:
@@ -875,7 +879,8 @@
     return zero_file_at_offsets(path, offsets, buflen=buflen, count=count)
 
 
-def zero_file_at_offsets(path, offsets, buflen=1024, count=1024, strict=False):
+def zero_file_at_offsets(path, offsets, buflen=1024, count=1024, strict=False,
+                         exclusive=True):
     """
     write zeros to file at specified offsets
     """
@@ -890,7 +895,8 @@
     tot = buflen * count
     msg_vals = {'path': path, 'tot': buflen * count}
 
-    with exclusive_open(path) as fp:
+    # allow caller to control if we require exclusive open
+    with exclusive_open(path, exclusive=exclusive) as fp:
         # get the size by seeking to end.
         fp.seek(0, 2)
         size = fp.tell()
 
=== modified file 'curtin/block/clear_holders.py'
--- curtin/block/clear_holders.py	2017-06-12 19:43:55 +0000
+++ curtin/block/clear_holders.py	2017-11-07 18:32:47 +0000
@@ -93,6 +93,24 @@
     return path
 
 
+def maybe_stop_bcache_device(device):
+    """Attempt to stop the provided device_path or raise unexpected errors."""
+    bcache_stop = os.path.join(device, 'stop')
+    try:
+        util.write_file(bcache_stop, '1', mode=None)
+    except (IOError, OSError) as e:
+        # Note: if we get any exceptions in the above exception classes
+        # it is a result of attempting to write "1" into the sysfs path
+        # The range of errors changes depending on when we race with
+        # the kernel asynchronously removing the sysfs path. Therefore
+        # we log the exception errno we got, but do not re-raise as
+        # the calling process is watching whether the same sysfs path
+        # is being removed;  if it fails to go away then we'll have
+        # a log of the exceptions to debug.
+        LOG.debug('Error writing to bcache stop file %s, device removed: %s',
+                  bcache_stop, e)
+
+
 def shutdown_bcache(device):
     """
     Shut down bcache for specified bcache device
@@ -132,8 +150,7 @@
                  os.path.basename(bcache_cache_sysfs))
     else:
         LOG.info('stopping bcache cacheset at: %s', bcache_cache_sysfs)
-        util.write_file(os.path.join(bcache_cache_sysfs, 'stop'),
-                        '1', mode=None)
+        maybe_stop_bcache_device(bcache_cache_sysfs)
         try:
             util.wait_for_removal(bcache_cache_sysfs, retries=removal_retries)
         except OSError:
@@ -162,8 +179,7 @@
         return
     else:
         LOG.info('stopping bcache backing device at: %s', bcache_block_sysfs)
-        util.write_file(os.path.join(bcache_block_sysfs, 'stop'),
-                        '1', mode=None)
+        maybe_stop_bcache_device(bcache_block_sysfs)
         try:
             # wait for them all to go away
             for dev in [device, bcache_block_sysfs] + slave_paths:
@@ -244,6 +260,19 @@
         LOG.info("extended partitions do not need wiping, so skipping: '%s'",
                  blockdev)
     else:
+        # some volumes will be claimed by the bcache layer but do not surface
+        # an actual /dev/bcacheN device which owns the parts (backing, cache)
+        # The result is that some volumes cannot be wiped while bcache claims
+        # the device.  Resolve this by stopping bcache layer on those volumes
+        # if present.
+        for bcache_path in ['bcache', 'bcache/set']:
+            stop_path = os.path.join(device, bcache_path)
+            if os.path.exists(stop_path):
+                LOG.debug('Attempting to release bcache layer from device: %s',
+                          device)
+                maybe_stop_bcache_device(stop_path)
+                continue
+
         retries = [1, 3, 5, 7]
         LOG.info('wiping superblock on %s', blockdev)
         for attempt, wait in enumerate(retries):
 
=== modified file 'curtin/commands/block_meta.py'
--- curtin/commands/block_meta.py	2017-06-12 19:43:55 +0000
+++ curtin/commands/block_meta.py	2017-11-07 18:32:47 +0000
@@ -384,7 +384,11 @@
             LOG.info("labeling device: '%s' with '%s' partition table", disk,
                      ptable)
             if ptable == "gpt":
-                util.subp(["sgdisk", "--clear", disk])
+                # Wipe both MBR and GPT that may be present on the disk.
+                # N.B.: wipe_volume wipes 1M at front and end of the disk.
+                # This could destroy disk data in filesystems that lived
+                # there.
+                block.wipe_volume(disk, mode='superblock')
             elif ptable in _dos_names:
                 util.subp(["parted", disk, "--script", "mklabel", "msdos"])
             else:
@@ -544,6 +548,24 @@
              info.get('id'), device, disk_ptable)
     LOG.debug("partnum: %s offset_sectors: %s length_sectors: %s",
               partnumber, offset_sectors, length_sectors)
+
+    # Wipe the partition if told to do so, do not wipe dos extended partitions
+    # as this may damage the extended partition table
+    if config.value_as_boolean(info.get('wipe')):
+        LOG.info("Preparing partition location on disk %s", disk)
+        if info.get('flag') == "extended":
+            LOG.warn("extended partitions do not need wiping, so skipping: "
+                     "'%s'" % info.get('id'))
+        else:
+            # wipe the start of the new partition first by zeroing 1M at the
+            # length of the previous partition
+            wipe_offset = int(offset_sectors * logical_block_size_bytes)
+            LOG.debug('Wiping 1M on %s at offset %s', disk, wipe_offset)
+            # We don't require exclusive access as we're wiping data at an
+            # offset and the current holder maybe part of the current storage
+            # configuration.
+            block.zero_file_at_offsets(disk, [wipe_offset], exclusive=False)
+
     if disk_ptable == "msdos":
         if flag in ["extended", "logical", "primary"]:
             partition_type = flag
@@ -565,25 +587,6 @@
     else:
         raise ValueError("parent partition has invalid partition table")
 
-    # check if we've triggered hidden metadata like md, lvm or bcache
-    part_kname = get_path_to_storage_volume(info.get('id'), storage_config)
-    holders = clear_holders.get_holders(part_kname)
-    if len(holders) > 0:
-        LOG.debug('Detected block holders on partition %s: %s', part_kname,
-                  holders)
-        clear_holders.clear_holders(part_kname)
-        clear_holders.assert_clear(part_kname)
-
-    # Wipe the partition if told to do so, do not wipe dos extended partitions
-    # as this may damage the extended partition table
-    if config.value_as_boolean(info.get('wipe')):
-        if info.get('flag') == "extended":
-            LOG.warn("extended partitions do not need wiping, so skipping: "
-                     "'%s'" % info.get('id'))
-        else:
-            block.wipe_volume(
-                get_path_to_storage_volume(info.get('id'), storage_config),
-                mode=info.get('wipe'))
     # Make the name if needed
     if storage_config.get(device).get('name') and partition_type != 'extended':
         make_dname(info.get('id'), storage_config)
 
=== modified file 'curtin/commands/block_wipe.py'
--- curtin/commands/block_wipe.py	2016-09-29 18:31:02 +0000
+++ curtin/commands/block_wipe.py	2017-11-07 18:32:47 +0000
@@ -18,11 +18,15 @@
 import sys
 import curtin.block as block
 from . import populate_one_subcmd
+from .. import log
+
+LOG = log.LOG
 
 
 def wipe_main(args):
     for blockdev in args.devices:
         try:
+            LOG.debug('Wiping volume %s with mode=%s', blockdev, args.mode)
             block.wipe_volume(blockdev, mode=args.mode)
         except Exception as e:
             sys.stderr.write(
 
=== modified file 'curtin/commands/clear_holders.py'
--- curtin/commands/clear_holders.py	2016-09-29 18:31:02 +0000
+++ curtin/commands/clear_holders.py	2017-11-07 18:32:47 +0000
@@ -28,7 +28,7 @@
         raise ValueError('invalid devices specified')
     block.clear_holders.start_clear_holders_deps()
     block.clear_holders.clear_holders(args.devices, try_preserve=args.preserve)
-    if args.try_preserve:
+    if args.preserve:
         print('ran clear_holders attempting to preserve data. however, '
               'hotplug support for some devices may cause holders to restart ')
     block.clear_holders.assert_clear(args.devices)
 
=== modified file 'debian/changelog'
--- debian/changelog	2017-10-06 02:22:45 +0000
+++ debian/changelog	2017-11-07 18:32:47 +0000
@@ -1,3 +1,20 @@
+curtin (0.1.0~bzr541-0ubuntu1) bionic; urgency=medium
+
+  * New upstream snapshot.
+    - Drop Precise from vmtest
+    - clear_holders: bcache log IO/OS exceptions but do not raise
+    - vmtest: Support newer qemu and multipath.
+    - block: enable control over exclusive_open use when wiping volumes
+    - block: handle wiping bcache parts (LP: #1718699)
+    - vmtests: Defer ArtfulNetworkMtu SkipbyDate to 2018
+    - bcache: accept sysfs write failure in shutdown handler if path missing
+      (LP: #1700564)
+    - vmtest: Rephrase a message about no disks to be less scary
+    - block_meta: use block.wipe_volume(mode=superblock) to clear MBR/GPT tables
+      (LP: #1722322)
+
+ -- Ryan Harper <[e-mail]>  Tue, 07 Nov 2017 11:13:00 -0600
+
 curtin (0.1.0~bzr532-0ubuntu1) artful; urgency=medium
 
   * New upstream snapshot.
 
=== added file 'examples/tests/bcache-wipe-xfs.yaml'
--- examples/tests/bcache-wipe-xfs.yaml	1970-01-01 00:00:00 +0000
+++ examples/tests/bcache-wipe-xfs.yaml	2017-11-07 18:32:47 +0000
@@ -0,0 +1,74 @@
+showtrace: true
+
+early_commands:
+  # Create a partitioned disk with bcache metadata in one of the partitions.
+  # Then, wipe the partition table.  This leaves "buried" bcache data that
+  # would be seen as soon as the disk was partitioned and cause problems
+  # for curtin's use of the disk.
+  # This config recreates issue LP: #1718699
+  00_blockmeta: [env, -u, OUTPUT_FSTAB, TARGET_MOUNT_POINT=/tmp/my.bdir/target,
+              WORKING_DIR=/tmp/my.bdir/work.d, curtin, --showtrace, -v,
+              block-meta, --umount, custom]
+  01_clear_holders: [curtin, clear-holders, --preserve, /dev/vdb]
+  02_quick_erase: [curtin, block-wipe, --mode, superblock, /dev/vdb]
+
+storage:
+  config:
+  - grub_device: true
+    id: vdb
+    name: vdb
+    path: /dev/vdb
+    ptable: msdos
+    type: disk
+    wipe: superblock
+  - id: vdc
+    name: vdc
+    path: /dev/vdc
+    type: disk
+    wipe: superblock
+  - device: vdb
+    id: vdb-part1
+    name: vdb-part1
+    number: 1
+    offset: 4194304B
+    size: 3997171712B
+    type: partition
+    uuid: 1d112703-1ff7-49fb-9655-741016e216bf
+    wipe: superblock
+  - device: vdb
+    id: vdb-part2
+    name: vdb-part2
+    number: 2
+    size: 3997171712B
+    type: partition
+    uuid: ec219a2e-c4a5-4623-b66a-965da2c6c1f1
+    wipe: superblock
+  - backing_device: vdc
+    cache_device: vdb-part2
+    cache_mode: writeback
+    id: bcache0
+    name: bcache0
+    type: bcache
+  - fstype: ext4
+    id: vdb-part1_format
+    label: ''
+    type: format
+    uuid: 0687dc8f-c089-4f30-8603-0ddf646a5dd7
+    volume: vdb-part1
+  - fstype: xfs
+    id: bcache0_format
+    label: ''
+    type: format
+    uuid: c40a45b2-1f12-454e-a0ec-784eb4ded4e6
+    volume: bcache0
+  - device: vdb-part1_format
+    id: vdb-part1_mount
+    options: ''
+    path: /
+    type: mount
+  - device: bcache0_format
+    id: bcache0_mount
+    options: ''
+    path: /var/lib/ceph-bcache/test-disk
+    type: mount
+  version: 1
 
=== modified file 'examples/tests/uefi_basic.yaml'
--- examples/tests/uefi_basic.yaml	2016-08-05 20:47:14 +0000
+++ examples/tests/uefi_basic.yaml	2017-11-07 18:32:47 +0000
@@ -1,4 +1,12 @@
 showtrace: true
+
+early_commands:
+  # Recreate and test LP:1722322
+  # Make one disk dirty with an MBR and a storage configuration
+  # GPT and don't supply wipe: superblock.  This will exercise
+  # curtin use of sgdisk --zap-all instead of --clear (GPT only)
+  blockmeta: ["parted", /dev/vdc, "--script", "mklabel", "msdos"]
+
 storage:
   config:
   - id: id_disk0
@@ -55,4 +63,19 @@
     id: id_efi_mount
     path: /boot/efi
     type: mount
+  - id: pnum_disk
+    type: disk
+    path: /dev/vdc
+    name: pnum_disk
+    ptable: gpt
+  - id: pnum_disk_p1
+    type: partition
+    number: 1
+    size: 1GB
+    device: pnum_disk
+  - id: pnum_disk_p2
+    type: partition
+    number: 10
+    size: 1GB
+    device: pnum_disk
   version: 1
 
=== modified file 'tests/unittests/test_clear_holders.py'
--- tests/unittests/test_clear_holders.py	2017-08-03 19:48:07 +0000
+++ tests/unittests/test_clear_holders.py	2017-11-07 18:32:47 +0000
@@ -1,3 +1,4 @@
+import errno
 import mock
 import os
 import textwrap
@@ -329,6 +330,52 @@
             mock.call(cset, retries=self.remove_retries)
         ])
 
+    # test bcache shutdown with 'stop' sysfs write failure
+    @mock.patch('curtin.block.clear_holders.udev.udevadm_settle')
+    @mock.patch('curtin.block.clear_holders.get_bcache_sys_path')
+    @mock.patch('curtin.block.clear_holders.util')
+    @mock.patch('curtin.block.clear_holders.os')
+    @mock.patch('curtin.block.clear_holders.LOG')
+    @mock.patch('curtin.block.clear_holders.get_bcache_using_dev')
+    def test_shutdown_bcache_stop_sysfs_write_fails(self, mock_get_bcache,
+                                                    mock_log, mock_os,
+                                                    mock_util,
+                                                    mock_get_bcache_block,
+                                                    mock_udevadm_settle):
+        """Test writes sysfs write failures pass if file not present"""
+        device = "/sys/class/block/null"
+        mock_os.path.exists.side_effect = iter([
+                True,   # backing device exists
+                True,   # cset device not present (already removed)
+                False,  # backing device is removed with cset
+                False,  # bcache/stop sysfs is missing (already removed)
+        ])
+        cset = '/sys/fs/bcache/fake'
+        mock_get_bcache.return_value = cset
+        mock_get_bcache_block.return_value = device + '/bcache'
+        mock_os.path.join.side_effect = os.path.join
+
+        # make writes to sysfs fail
+        mock_util.write_file.side_effect = IOError(errno.ENOENT,
+                                                   "File not found")
+
+        clear_holders.shutdown_bcache(device)
+
+        self.assertEqual(2, len(mock_log.info.call_args_list))
+        self.assertEqual(3, len(mock_os.path.exists.call_args_list))
+        self.assertEqual(1, len(mock_get_bcache.call_args_list))
+        self.assertEqual(1, len(mock_get_bcache_block.call_args_list))
+        self.assertEqual(1, len(mock_util.write_file.call_args_list))
+        self.assertEqual(1, len(mock_util.wait_for_removal.call_args_list))
+
+        mock_get_bcache.assert_called_with(device, strict=False)
+        mock_util.write_file.assert_has_calls([
+            mock.call(cset + '/stop', '1', mode=None),
+        ])
+        mock_util.wait_for_removal.assert_has_calls([
+            mock.call(cset, retries=self.remove_retries)
+        ])
+
     @mock.patch('curtin.block.clear_holders.LOG')
     @mock.patch('curtin.block.clear_holders.block.sys_block_path')
     @mock.patch('curtin.block.clear_holders.lvm')
@@ -531,6 +578,41 @@
         for tree, result in test_trees_and_results:
             self.assertEqual(clear_holders.format_holders_tree(tree), result)
 
+    @mock.patch('curtin.block.clear_holders.util.write_file')
+    def test_maybe_stop_bcache_device_raises_errors(self, m_write_file):
+        """Non-IO/OS exceptions are raised by maybe_stop_bcache_device."""
+        m_write_file.side_effect = ValueError('Crazy Value Error')
+        with self.assertRaises(ValueError) as cm:
+            clear_holders.maybe_stop_bcache_device('does/not/matter')
+        self.assertEqual('Crazy Value Error', str(cm.exception))
+        self.assertEqual(
+            mock.call('does/not/matter/stop', '1', mode=None),
+            m_write_file.call_args)
+
+    @mock.patch('curtin.block.clear_holders.LOG')
+    @mock.patch('curtin.block.clear_holders.util.write_file')
+    def test_maybe_stop_bcache_device_handles_oserror(self, m_write_file,
+                                                      m_log):
+        """When OSError.NOENT is raised, log the condition and move on."""
+        m_write_file.side_effect = OSError(errno.ENOENT, 'Expected oserror')
+        clear_holders.maybe_stop_bcache_device('does/not/matter')
+        self.assertEqual(
+            'Error writing to bcache stop file %s, device removed: %s',
+            m_log.debug.call_args[0][0])
+        self.assertEqual('does/not/matter/stop', m_log.debug.call_args[0][1])
+
+    @mock.patch('curtin.block.clear_holders.LOG')
+    @mock.patch('curtin.block.clear_holders.util.write_file')
+    def test_maybe_stop_bcache_device_handles_ioerror(self, m_write_file,
+                                                      m_log):
+        """When IOError.NOENT is raised, log the condition and move on."""
+        m_write_file.side_effect = IOError(errno.ENOENT, 'Expected ioerror')
+        clear_holders.maybe_stop_bcache_device('does/not/matter')
+        self.assertEqual(
+            'Error writing to bcache stop file %s, device removed: %s',
+            m_log.debug.call_args[0][0])
+        self.assertEqual('does/not/matter/stop', m_log.debug.call_args[0][1])
+
     def test_get_holder_types(self):
         """test clear_holders.get_holder_types"""
         test_trees_and_results = [
 
=== modified file 'tests/unittests/test_commands_block_meta.py'
--- tests/unittests/test_commands_block_meta.py	2017-08-03 19:48:07 +0000
+++ tests/unittests/test_commands_block_meta.py	2017-11-07 18:32:47 +0000
@@ -130,6 +130,8 @@
                        'mock_clear_holders')
         self.add_patch('curtin.block.clear_holders.assert_clear',
                        'mock_assert_clear')
+        self.add_patch('curtin.block.zero_file_at_offsets',
+                       'mock_block_zero_file')
 
         self.target = "my_target"
         self.config = {
@@ -177,32 +179,26 @@
         self.mock_clear_holders.assert_called_with(disk)
         self.mock_assert_clear.assert_called_with(disk)
 
-    def test_partition_handler_calls_clear_holder(self):
+    def test_partition_handler_wipes_at_partition_offset(self):
+        """ Test wiping partition at offset prior to creating partition"""
         disk_info = self.storage_config.get('sda')
         part_info = self.storage_config.get('sda-part1')
         disk_kname = disk_info.get('path')
         part_kname = disk_kname + '1'
         self.mock_getpath.side_effect = iter([
-            disk_info.get('id'),
-            part_kname,
-            part_kname,
+            disk_kname,
             part_kname,
         ])
-
         self.mock_block_get_part_table_type.return_value = 'dos'
         kname = 'xxx'
         self.mock_block_path_to_kname.return_value = kname
         self.mock_block_sys_block_path.return_value = '/sys/class/block/xxx'
-        self.mock_subp.side_effect = iter([
-            ("", 0),  # parted mkpart
-            ("", 0),  # ??
-        ])
-        holders = ['md1']
-        self.mock_get_holders.return_value = holders
 
         block_meta.partition_handler(part_info, self.storage_config)
 
-        print("clear_holders: %s" % self.mock_clear_holders.call_args_list)
-        print("assert_clear: %s" % self.mock_assert_clear.call_args_list)
-        self.mock_clear_holders.assert_called_with(part_kname)
-        self.mock_assert_clear.assert_called_with(part_kname)
+        part_offset = 2048 * 512
+        self.mock_block_zero_file.assert_called_with(disk_kname, [part_offset],
+                                                     exclusive=False)
+        self.mock_subp.assert_called_with(['parted', disk_kname, '--script',
+                                           'mkpart', 'primary', '2048s',
+                                           '1001471s'], capture=True)
 
=== modified file 'tests/vmtests/__init__.py'
--- tests/vmtests/__init__.py	2017-10-06 02:20:08 +0000
+++ tests/vmtests/__init__.py	2017-11-07 18:32:47 +0000
@@ -699,9 +699,6 @@
             logger.info('Detected centos, adding default config %s',
                         centos_default)
 
-        if cls.multipath:
-            disks = disks * cls.multipath_num_paths
-
         # set reporting logger
         cls.reporting_log = os.path.join(cls.td.logs, 'webhooks-events.json')
         reporting_logger = CaptureReporting(cls.reporting_log)
@@ -727,7 +724,7 @@
                 }))
         configs.append(reporting_config)
 
-        cmd.extend(uefi_flags + netdevs + disks +
+        cmd.extend(uefi_flags + netdevs + cls.mpath_diskargs(disks) +
                    [ftypes['vmtest.root-image'], "--kernel=%s" %
                        ftypes['boot-kernel'], "--initrd=%s" %
                     ftypes['boot-initrd'], "--", "curtin", "-vv", "install"] +
@@ -825,11 +822,6 @@
         # unlike NVMe disks, we do not want to configure the iSCSI disks
         # via KVM, which would use qemu's iSCSI target layer.
 
-        if cls.multipath:
-            target_disks = target_disks * cls.multipath_num_paths
-            extra_disks = extra_disks * cls.multipath_num_paths
-            nvme_disks = nvme_disks * cls.multipath_num_paths
-
         # output disk is always virtio-blk, with serial of output_disk.img
         output_disk = '--disk={},driver={},format={},{},{}'.format(
             cls.td.output_disk, 'virtio-blk',
@@ -840,11 +832,9 @@
         # create xkvm cmd
         cmd = (["tools/xkvm", "-v", dowait] +
                uefi_flags + netdevs +
-               target_disks + extra_disks + nvme_disks +
-               ["--", "-drive",
-                "file=%s,if=virtio,media=cdrom" % cls.td.seed_disk,
-                "-smp",  cls.get_config_smp(),
-                "-m", "1024"])
+               cls.mpath_diskargs(target_disks + extra_disks + nvme_disks) +
+               ["--disk=file=%s,if=virtio,media=cdrom" % cls.td.seed_disk] +
+               ["--", "-smp",  cls.get_config_smp(), "-m", "1024"])
 
         if not cls.interactive:
             if cls.arch == 's390x':
@@ -1007,6 +997,15 @@
         # prepending ./ makes '/root/file' or 'root/file' work as expected.
         return os.path.normpath(os.path.join(cls.td.collect, "./" + path))
 
+    @classmethod
+    def mpath_diskargs(cls, disks):
+        """make multipath versions of --disk args in disks."""
+        if not cls.multipath:
+            return disks
+        opt = ",file.locking=off"
+        return ([d if d == "--disk" else d + opt for d in disks] *
+                cls.multipath_num_paths)
+
     # Misc functions that are useful for many tests
     def output_files_exist(self, files):
         logger.debug('checking files exist: %s', files)
@@ -1459,7 +1458,7 @@
         logger.info('Taring %s disks sparsely to %s', len(disks), outfile)
         util.subp(cmd, capture=True)
     else:
-        logger.error('Failed to find "disks" dir under tmpdir: %s', tmpdir)
+        logger.debug('No "disks" dir found in tmpdir: %s', tmpdir)
 
 
 def boot_log_wrap(name, func, cmd, console_log, timeout, purpose):
 
=== modified file 'tests/vmtests/releases.py'
--- tests/vmtests/releases.py	2017-08-03 19:48:07 +0000
+++ tests/vmtests/releases.py	2017-11-07 18:32:47 +0000
@@ -39,15 +39,6 @@
     target_release = "centos66"
 
 
-class _PreciseBase(_UbuntuBase):
-    release = "precise"
-
-
-class _PreciseHWET(_UbuntuBase):
-    release = "precise"
-    krel = "trusty"
-
-
 class _TrustyBase(_UbuntuBase):
     release = "trusty"
 
@@ -90,8 +81,6 @@
 
 
 class _Releases(object):
-    precise = _PreciseBase
-    precise_hwe_t = _PreciseHWET
     trusty = _TrustyBase
     trusty_hwe_u = _TrustyHWEU
     trusty_hwe_v = _TrustyHWEV
 
=== modified file 'tests/vmtests/test_basic.py'
--- tests/vmtests/test_basic.py	2017-08-03 19:48:07 +0000
+++ tests/vmtests/test_basic.py	2017-11-07 18:32:47 +0000
@@ -137,49 +137,6 @@
         self.assertEqual(source_version, installed_version)
 
 
-class PreciseTestBasic(relbase.precise, TestBasicAbs):
-    __test__ = True
-
-    collect_scripts = [textwrap.dedent("""
-        cd OUTPUT_COLLECT_D
-        blkid -o export /dev/vda > blkid_output_vda
-        blkid -o export /dev/vda1 > blkid_output_vda1
-        blkid -o export /dev/vda2 > blkid_output_vda2
-        f="btrfs_uuid_vdd"
-        btrfs-show /dev/vdd | awk '/uuid/ {print $4}' > $f
-        cat /proc/partitions > proc_partitions
-        ls -al /dev/disk/by-uuid/ > ls_uuid
-        cat /etc/fstab > fstab
-        mkdir -p /dev/disk/by-dname
-        ls /dev/disk/by-dname/ > ls_dname
-        find /etc/network/interfaces.d > find_interfacesd
-
-        v=""
-        out=$(apt-config shell v Acquire::HTTP::Proxy)
-        eval "$out"
-        echo "$v" > apt-proxy
-        """)]
-
-    def test_whole_disk_format(self):
-        # confirm the whole disk format is the expected device
-        btrfs_uuid = self.load_collect_file("btrfs_uuid_vdd").strip()
-
-        self.assertTrue(btrfs_uuid is not None)
-        self.assertEqual(len(btrfs_uuid), 36)
-
-        # extract uuid from ls_uuid by kname
-        kname_uuid = self._kname_to_uuid('vdd')
-
-        # compare them
-        self.assertEqual(kname_uuid, btrfs_uuid)
-
-    def test_ptable(self):
-        print("test_ptable does not work for Precise")
-
-    def test_dname(self):
-        print("test_dname does not work for Precise")
-
-
 class TrustyTestBasic(relbase.trusty, TestBasicAbs):
     __test__ = True
 
@@ -193,11 +150,6 @@
         print("test_ptable does not work for Trusty")
 
 
-class PreciseHWETTestBasic(relbase.precise_hwe_t, PreciseTestBasic):
-    # FIXME: off due to test_whole_disk_format failing
-    __test__ = False
-
-
 class TrustyHWEXTestBasic(relbase.trusty_hwe_x, TrustyTestBasic):
     __test__ = True
 
 
=== modified file 'tests/vmtests/test_bcache_basic.py'
--- tests/vmtests/test_bcache_basic.py	2017-08-03 19:48:07 +0000
+++ tests/vmtests/test_bcache_basic.py	2017-11-07 18:32:47 +0000
@@ -43,10 +43,6 @@
         self.check_file_regex("cmdline", r"root=UUID=")
 
 
-class PreciseHWETBcacheBasic(relbase.precise_hwe_t, TestBcacheBasic):
-    __test__ = True
-
-
 class TrustyBcacheBasic(relbase.trusty, TestBcacheBasic):
     __test__ = False  # covered by test_raid5_bcache
 
 
=== added file 'tests/vmtests/test_bcache_bug1718699.py'
--- tests/vmtests/test_bcache_bug1718699.py	1970-01-01 00:00:00 +0000
+++ tests/vmtests/test_bcache_bug1718699.py	2017-11-07 18:32:47 +0000
@@ -0,0 +1,21 @@
+from .releases import base_vm_classes as relbase
+from .test_bcache_basic import TestBcacheBasic
+
+
+class TestBcacheBug1718699(TestBcacheBasic):
+    conf_file = "examples/tests/bcache-wipe-xfs.yaml"
+    dirty_disks = False
+    nr_cpus = 2
+    extra_disks = ['10G']
+
+
+class XenialTestBcacheBug1718699(relbase.xenial, TestBcacheBug1718699):
+    __test__ = True
+
+
+class ZestyTestBcacheBug1718699(relbase.zesty, TestBcacheBug1718699):
+    __test__ = True
+
+
+class ArtfulTestBcacheBug1718699(relbase.artful, TestBcacheBug1718699):
+    __test__ = True
 
=== modified file 'tests/vmtests/test_iscsi.py'
--- tests/vmtests/test_iscsi.py	2017-08-03 19:48:07 +0000
+++ tests/vmtests/test_iscsi.py	2017-11-07 18:32:47 +0000
@@ -47,10 +47,6 @@
                              (testfile, expected_content, content))
 
 
-class PreciseTestIscsiBasic(relbase.precise, TestBasicIscsiAbs):
-    __test__ = True
-
-
 class TrustyTestIscsiBasic(relbase.trusty, TestBasicIscsiAbs):
     __test__ = True
 
 
=== modified file 'tests/vmtests/test_lvm.py'
--- tests/vmtests/test_lvm.py	2017-08-03 19:48:07 +0000
+++ tests/vmtests/test_lvm.py	2017-11-07 18:32:47 +0000
@@ -48,14 +48,6 @@
             raise SkipTest("test_dname does not work for %s" % self.release)
 
 
-class PreciseTestLvm(relbase.precise, TestLvmAbs):
-    __test__ = True
-
-
-class PreciseHWETTestLvm(relbase.precise_hwe_t, PreciseTestLvm):
-    __test__ = True
-
-
 class TrustyTestLvm(relbase.trusty, TestLvmAbs):
     __test__ = True
 
 
=== modified file 'tests/vmtests/test_lvm_iscsi.py'
--- tests/vmtests/test_lvm_iscsi.py	2017-10-06 02:20:08 +0000
+++ tests/vmtests/test_lvm_iscsi.py	2017-11-07 18:32:47 +0000
@@ -47,10 +47,6 @@
         self.check_file_strippedline("pvs", "vg2=/dev/sdb6")
 
 
-class PreciseTestIscsiLvm(relbase.precise, TestLvmIscsiAbs):
-    __test__ = True
-
-
 class TrustyTestIscsiLvm(relbase.trusty, TestLvmIscsiAbs):
     __test__ = True
 
 
=== modified file 'tests/vmtests/test_mdadm_iscsi.py'
--- tests/vmtests/test_mdadm_iscsi.py	2017-10-06 02:20:08 +0000
+++ tests/vmtests/test_mdadm_iscsi.py	2017-11-07 18:32:47 +0000
@@ -22,10 +22,6 @@
         """)]
 
 
-class PreciseTestIscsiMdadm(relbase.precise, TestMdadmIscsiAbs):
-    __test__ = True
-
-
 class TrustyTestIscsiMdadm(relbase.trusty, TestMdadmIscsiAbs):
     __test__ = True
 
 
=== modified file 'tests/vmtests/test_network.py'
--- tests/vmtests/test_network.py	2017-10-06 02:20:08 +0000
+++ tests/vmtests/test_network.py	2017-11-07 18:32:47 +0000
@@ -449,11 +449,6 @@
         pass
 
 
-class PreciseHWETTestNetworkBasic(relbase.precise_hwe_t, TestNetworkBasicAbs):
-    # FIXME: off due to hang at test: Starting execute cloud user/final scripts
-    __test__ = False
-
-
 class TrustyTestNetworkBasic(relbase.trusty, TestNetworkBasicAbs):
     __test__ = True
 
 
=== modified file 'tests/vmtests/test_network_alias.py'
--- tests/vmtests/test_network_alias.py	2017-08-03 19:48:07 +0000
+++ tests/vmtests/test_network_alias.py	2017-11-07 18:32:47 +0000
@@ -41,11 +41,6 @@
     __test__ = True
 
 
-class PreciseHWETTestNetworkAlias(relbase.precise_hwe_t, TestNetworkAliasAbs):
-    # FIXME: off due to hang at test: Starting execute cloud user/final scripts
-    __test__ = True
-
-
 class TrustyTestNetworkAlias(relbase.trusty, TestNetworkAliasAbs):
     __test__ = True
 
 
=== modified file 'tests/vmtests/test_network_bonding.py'
--- tests/vmtests/test_network_bonding.py	2017-10-06 02:20:08 +0000
+++ tests/vmtests/test_network_bonding.py	2017-11-07 18:32:47 +0000
@@ -38,14 +38,6 @@
         pass
 
 
-class PreciseHWETTestBonding(relbase.precise_hwe_t, TestNetworkBondingAbs):
-    __test__ = True
-
-    def test_ifenslave_installed(self):
-        self.assertIn("ifenslave-2.6", self.debian_packages,
-                      "ifenslave deb not installed")
-
-
 class TrustyTestBonding(relbase.trusty, TestNetworkBondingAbs):
     __test__ = False
 
 
=== modified file 'tests/vmtests/test_network_enisource.py'
--- tests/vmtests/test_network_enisource.py	2017-10-06 02:20:08 +0000
+++ tests/vmtests/test_network_enisource.py	2017-11-07 18:32:47 +0000
@@ -79,12 +79,6 @@
         self.assertEqual(_nocidr(expected_address), _nocidr(actual_address))
 
 
-class PreciseTestNetworkENISource(relbase.precise, TestNetworkENISource):
-    __test__ = False
-    # not working, still debugging though; possible older ifupdown doesn't
-    # like the multiple iface method.
-
-
 class TrustyTestNetworkENISource(relbase.trusty, TestNetworkENISource):
     __test__ = True
 
 
=== modified file 'tests/vmtests/test_network_ipv6.py'
--- tests/vmtests/test_network_ipv6.py	2017-10-06 02:20:08 +0000
+++ tests/vmtests/test_network_ipv6.py	2017-11-07 18:32:47 +0000
@@ -40,11 +40,6 @@
         pass
 
 
-class PreciseHWETTestNetwork(relbase.precise_hwe_t, TestNetworkIPV6Abs):
-    # FIXME: off due to hang at test: Starting execute cloud user/final scripts
-    __test__ = False
-
-
 class TrustyTestNetworkIPV6(relbase.trusty, TestNetworkIPV6Abs):
     __test__ = True
 
 
=== modified file 'tests/vmtests/test_network_ipv6_enisource.py'
--- tests/vmtests/test_network_ipv6_enisource.py	2017-10-06 02:20:08 +0000
+++ tests/vmtests/test_network_ipv6_enisource.py	2017-11-07 18:32:47 +0000
@@ -12,13 +12,6 @@
         pass
 
 
-class PreciseTestNetworkIPV6ENISource(relbase.precise,
-                                      TestNetworkIPV6ENISource):
-    __test__ = False
-    # not working, still debugging though; possible older ifupdown doesn't
-    # like the multiple iface method.
-
-
 class TrustyTestNetworkIPV6ENISource(relbase.trusty, TestNetworkIPV6ENISource):
     __test__ = True
 
 
=== modified file 'tests/vmtests/test_network_ipv6_static.py'
--- tests/vmtests/test_network_ipv6_static.py	2017-08-03 19:48:07 +0000
+++ tests/vmtests/test_network_ipv6_static.py	2017-11-07 18:32:47 +0000
@@ -13,11 +13,6 @@
     conf_file = "examples/tests/basic_network_static_ipv6.yaml"
 
 
-class PreciseHWETTestNetworkIPV6Static(relbase.precise_hwe_t,
-                                       TestNetworkIPV6StaticAbs):
-    __test__ = True
-
-
 class TrustyTestNetworkIPV6Static(relbase.trusty, TestNetworkIPV6StaticAbs):
     __test__ = True
 
 
=== modified file 'tests/vmtests/test_network_ipv6_vlan.py'
--- tests/vmtests/test_network_ipv6_vlan.py	2017-10-06 02:20:08 +0000
+++ tests/vmtests/test_network_ipv6_vlan.py	2017-11-07 18:32:47 +0000
@@ -12,22 +12,6 @@
     conf_file = "examples/tests/vlan_network_ipv6.yaml"
 
 
-class PreciseTestNetworkIPV6Vlan(relbase.precise, TestNetworkIPV6VlanAbs):
-    __test__ = True
-
-    # precise ip -d link show output is different (of course)
-    def test_vlan_enabled(self):
-
-        # we must have at least one
-        self.assertGreaterEqual(len(self.get_vlans()), 1)
-
-        # did they get configured?
-        for vlan in self.get_vlans():
-            link_file = "ip_link_show_" + vlan['name']
-            vlan_msg = "vlan id " + str(vlan['vlan_id'])
-            self.check_file_regex(link_file, vlan_msg)
-
-
 class TrustyTestNetworkIPV6Vlan(relbase.trusty, TestNetworkIPV6VlanAbs):
     __test__ = True
 
 
=== modified file 'tests/vmtests/test_network_mtu.py'
--- tests/vmtests/test_network_mtu.py	2017-10-06 02:20:08 +0000
+++ tests/vmtests/test_network_mtu.py	2017-11-07 18:32:47 +0000
@@ -155,11 +155,6 @@
         pass
 
 
-class PreciseHWETTestNetworkMtu(relbase.precise_hwe_t, TestNetworkMtuAbs):
-    # FIXME: Precise mtu / ipv6 is buggy
-    __test__ = False
-
-
 class TrustyTestNetworkMtu(relbase.trusty, TestNetworkMtuAbs):
     __test__ = True
 
@@ -203,7 +198,7 @@
     @classmethod
     def setUpClass(cls):
         cls.skip_by_date(cls.__name__, cls.release, "1671951",
-                         fixby=(2017, 10, 20), removeby=(2018, 1, 23))
+                         fixby=(2018, 1, 20), removeby=(2018, 2, 23))
         super().setUpClass()
 
 
 
=== modified file 'tests/vmtests/test_network_static.py'
--- tests/vmtests/test_network_static.py	2017-08-03 19:48:07 +0000
+++ tests/vmtests/test_network_static.py	2017-11-07 18:32:47 +0000
@@ -28,12 +28,6 @@
         pass
 
 
-class PreciseHWETTestNetworkStatic(relbase.precise_hwe_t,
-                                   TestNetworkStaticAbs):
-    # FIXME: off due to hang at test: Starting execute cloud user/final scripts
-    __test__ = False
-
-
 class TrustyTestNetworkStatic(relbase.trusty, TestNetworkStaticAbs):
     __test__ = True
 
 
=== modified file 'tests/vmtests/test_network_static_routes.py'
--- tests/vmtests/test_network_static_routes.py	2017-08-03 19:48:07 +0000
+++ tests/vmtests/test_network_static_routes.py	2017-11-07 18:32:47 +0000
@@ -16,12 +16,6 @@
     conf_file = "examples/tests/network_static_routes.yaml"
 
 
-class PreciseHWETTestNetworkStaticRoutes(relbase.precise_hwe_t,
-                                         TestNetworkStaticRoutesAbs):
-    # FIXME: off due to hang at test: Starting execute cloud user/final scripts
-    __test__ = False
-
-
 class TrustyTestNetworkStaticRoutes(relbase.trusty,
                                     TestNetworkStaticRoutesAbs):
     __test__ = True
 
=== modified file 'tests/vmtests/test_network_vlan.py'
--- tests/vmtests/test_network_vlan.py	2017-10-06 02:20:08 +0000
+++ tests/vmtests/test_network_vlan.py	2017-11-07 18:32:47 +0000
@@ -68,22 +68,6 @@
         pass
 
 
-class PreciseTestNetworkVlan(relbase.precise, TestNetworkVlanAbs):
-    __test__ = True
-
-    # precise ip -d link show output is different (of course)
-    def test_vlan_enabled(self):
-
-        # we must have at least one
-        self.assertGreaterEqual(len(self.get_vlans()), 1)
-
-        # did they get configured?
-        for vlan in self.get_vlans():
-            link_file = "ip_link_show_" + vlan['name']
-            vlan_msg = "vlan id " + str(vlan['vlan_id'])
-            self.check_file_regex(link_file, vlan_msg)
-
-
 class TrustyTestNetworkVlan(relbase.trusty, TestNetworkVlanAbs):
     __test__ = True
 
 
=== modified file 'tests/vmtests/test_nvme.py'
--- tests/vmtests/test_nvme.py	2017-08-03 19:48:07 +0000
+++ tests/vmtests/test_nvme.py	2017-11-07 18:32:47 +0000
@@ -53,11 +53,6 @@
             self.check_file_strippedline("ls_dev_nvme", "/dev/nvme1")
 
 
-class PreciseTestNvme(relbase.precise, TestNvmeAbs):
-    __test__ = False
-    # Precise kernel doesn't have NVME support, with TrustyHWE it would
-
-
 class TrustyTestNvme(relbase.trusty, TestNvmeAbs):
     __test__ = True
 
 
=== modified file 'tests/vmtests/test_raid5_bcache.py'
--- tests/vmtests/test_raid5_bcache.py	2017-08-03 19:48:07 +0000
+++ tests/vmtests/test_raid5_bcache.py	2017-11-07 18:32:47 +0000
@@ -65,11 +65,6 @@
         self.check_file_regex("bcache_cache_mode", r"\[writeback\]")
 
 
-class PreciseHWETTestRaid5Bcache(relbase.precise_hwe_t, TestMdadmBcacheAbs):
-    # FIXME: off due to failing install: RUN_ARRAY failed: Invalid argument
-    __test__ = False
-
-
 class TrustyTestRaid5Bcache(relbase.trusty, TestMdadmBcacheAbs):
     __test__ = True
     # FIXME(LP: #1523037): dname does not work on trusty, so we cannot expect
 
=== modified file 'tests/vmtests/test_uefi_basic.py'
--- tests/vmtests/test_uefi_basic.py	2017-08-03 19:48:07 +0000
+++ tests/vmtests/test_uefi_basic.py	2017-11-07 18:32:47 +0000
@@ -9,7 +9,7 @@
     interactive = False
     arch_skip = ["s390x"]
     conf_file = "examples/tests/uefi_basic.yaml"
-    extra_disks = []
+    extra_disks = ['4G']
     uefi = True
     disk_to_check = [('main_disk', 1), ('main_disk', 2), ('main_disk', 3)]
     collect_scripts = [textwrap.dedent("""
@@ -76,16 +76,6 @@
             self.assertEqual(self.disk_block_size, size)
 
 
-class PreciseUefiTestBasic(relbase.precise, TestBasicAbs):
-    __test__ = True
-
-    def test_ptable(self):
-        print("test_ptable does not work for Precise")
-
-    def test_dname(self):
-        print("test_dname does not work for Precise")
-
-
 class TrustyUefiTestBasic(relbase.trusty, TestBasicAbs):
     __test__ = True
 
@@ -115,10 +105,6 @@
     __test__ = True
 
 
-class PreciseUefiTestBasic4k(PreciseUefiTestBasic):
-    disk_block_size = 4096
-
-
 class TrustyUefiTestBasic4k(TrustyUefiTestBasic):
     disk_block_size = 4096
 
 
=== modified file 'tools/launch'
--- tools/launch	2017-08-03 19:48:07 +0000
+++ tools/launch	2017-11-07 18:32:47 +0000
@@ -583,11 +583,10 @@
               bs_args="${bs_args},physical_block_size=$phybs"
               bs_args="${bs_args},min_io_size=$logbs"
 
-        disk_args=( "${disk_args[@]}" "-drive"
-            "file=${src},if=none,cache=unsafe,format=$fmt,id=drv${id},index=$id" )
-
-        disk_args=( "${disk_args[@]}" "-device"
-            "${driver},drive=drv${id},${bs_args}${devopts}" )
+        t="file=${src},if=none,cache=unsafe,format=$fmt,"
+        t="${t}id=drv${id},index=$id,"
+        t="${t}driver=${driver},${bs_args}${devopts}"
+        disk_args[${#disk_args[@]}]="--disk=$t"
 
     done
 
@@ -754,7 +753,7 @@
         seed="${TEMP_D}/seed.img"
         cloud-localds "$seed" "$udata" "$mdata" ||
             { error "failed cloud-localds"; return 1; }
-        seedargs=( "-drive" "file=${seed},if=virtio,media=cdrom" )
+        seedargs=( "--disk=file=${seed},if=virtio,media=cdrom" )
     fi
 
     local netargs
@@ -779,13 +778,14 @@
         fi
     fi
     # -monitor stdio
+    local bootdisk="--disk=file=$bootimg,id=boot,index=1,cache=unsafe"
     cmd=(
-        xkvm "${pt[@]}" "${netargs[@]}" --
+        xkvm "${pt[@]}" "${netargs[@]}" 
+        "$bootdisk"
+        "${disk_args[@]}"
+        --
         -smp ${smp}
         -m ${mem} ${serial_args} ${video}
-        -drive "file=$bootimg,if=none,cache=unsafe,format=qcow2,id=boot,index=0"
-        -device "virtio-blk,drive=boot"
-        "${disk_args[@]}"
         "${seedargs[@]}"
         )
 
 
=== modified file 'tools/xkvm'
--- tools/xkvm	2016-12-02 02:04:27 +0000
+++ tools/xkvm	2017-11-07 18:32:47 +0000
@@ -11,6 +11,8 @@
 # OVS_CLEANUP gets populated with bridge:devname pairs used with ovs
 OVS_CLEANUP=( )
 MAC_PREFIX="52:54:00:12:34"
+# allow this to be set externally.
+_QEMU_SUPPORTS_FILE_LOCKING="${_QEMU_SUPPORTS_FILE_LOCKING}"
 KVM="kvm"
 declare -A KVM_DEVOPTS
 
@@ -119,6 +121,21 @@
     return 1
 }
 
+qemu_supports_file_locking() {
+    # hackily check if qemu has file.locking in -drive params (LP: #1716028)
+    if [ -z "$_QEMU_SUPPORTS_FILE_LOCKING" ]; then
+        # The only way we could find to check presense of file.locking is
+        # qmp (query-qmp-schema).  Simply checking if the virtio-blk driver
+        # supports 'share-rw' is expected to be equivalent and simpler.
+        isdevopt virtio-blk share-rw &&
+            _QEMU_SUPPORTS_FILE_LOCKING=true ||
+            _QEMU_SUPPORTS_FILE_LOCKING=false
+        debug 1 "qemu supports file locking = ${_QEMU_SUPPORTS_FILE_LOCKING}"
+    fi
+    [ "$_QEMU_SUPPORTS_FILE_LOCKING" = "true" ]
+    return
+}
+
 padmac() {
     # return a full mac, given a subset.
     # assume whatever is input is the last portion to be
@@ -443,7 +460,7 @@
             out=$(LANG=C qemu-img info "$file") &&
                 fmt=$(echo "$out" | awk '$0 ~ /^file format:/ { print $3 }') ||
                 { error "failed to determine format of $file"; return 1; }
-        else
+        elif [ -z "$fmt" ]; then
             fmt=raw
         fi
         if [ -z "$driver" ]; then
@@ -470,6 +487,12 @@
                 id=*|if=*|driver=*|$file|file=*) continue;;
                 fmt=*|format=*) continue;;
                 serial=*|bus=*|unit=*|index=*) continue;;
+                file.locking=*)
+                    qemu_supports_file_locking || {
+                        debug 2 "qemu has no file locking." \
+                            "Dropping '$tok' from: $cur"
+                        continue
+                    };;
             esac
             isdevopt "$driver" "$tok" && devopts="${devopts},$tok" ||
                 diskopts="${diskopts},${tok}"