1
diff --git a/curtin/block/clear_holders.py b/curtin/block/clear_holders.py
2
index 9d73b28..a2042d5 100644
3
--- a/curtin/block/clear_holders.py
4
+++ b/curtin/block/clear_holders.py
5
@@ -624,6 +624,9 @@ def start_clear_holders_deps():
6
624
    # all disks and partitions should be sufficient to remove the mdadm
624
    # all disks and partitions should be sufficient to remove the mdadm
7
625
    # metadata
625
    # metadata
8
626
    mdadm.mdadm_assemble(scan=True, ignore_errors=True)
626
    mdadm.mdadm_assemble(scan=True, ignore_errors=True)
9
627
    # scan and activate for logical volumes
10
628
    lvm.lvm_scan()
11
629
    lvm.activate_volgroups()
12
627
    # the bcache module needs to be present to properly detect bcache devs
630
    # the bcache module needs to be present to properly detect bcache devs
13
628
    # on some systems (precise without hwe kernel) it may not be possible to
631
    # on some systems (precise without hwe kernel) it may not be possible to
14
629
    # lad the bcache module bcause it is not present in the kernel. if this
632
    # lad the bcache module bcause it is not present in the kernel. if this
15
diff --git a/curtin/block/lvm.py b/curtin/block/lvm.py
16
index 8643245..eca64f6 100644
17
--- a/curtin/block/lvm.py
18
+++ b/curtin/block/lvm.py
19
@@ -57,14 +57,32 @@ def lvmetad_running():
20
57
                                         '/run/lvmetad.pid'))
57
                                         '/run/lvmetad.pid'))
21
58
58
22
59
59
24
60
def lvm_scan():
60
def activate_volgroups():
25
61
    """
26
62
    Activate available volgroups and logical volumes within.
27
63
28
64
    # found
29
65
    % vgchange -ay
30
66
      1 logical volume(s) in volume group "vg1sdd" now active
31
67
32
68
    # none found (no output)
33
69
    % vgchange -ay
34
70
    """
35
71
36
72
    # vgchange handles syncing with udev by default
37
73
    # see man 8 vgchange and flag --noudevsync
38
74
    out, _ = util.subp(['vgchange', '--activate=y'], capture=True)
39
75
    if out:
40
76
        LOG.info(out)
41
77
42
78
43
79
def lvm_scan(activate=True):
44
61
    """
80
    """
45
62
    run full scan for volgroups, logical volumes and physical volumes
81
    run full scan for volgroups, logical volumes and physical volumes
46
63
    """
82
    """
51
64
    # the lvm tools lvscan, vgscan and pvscan on ubuntu precise do not
83
    # prior to xenial, lvmetad is not packaged, so even if a tool supports
52
65
    # support the flag --cache. the flag is present for the tools in ubuntu
84
    # flag --cache it has no effect. In Xenial and newer the --cache flag is
53
66
    # trusty and later. since lvmetad is used in current releases of
85
    # used (if lvmetad is running) to ensure that the data cached by
50
67
    # ubuntu, the --cache flag is needed to ensure that the data cached by
54
68
    # lvmetad is updated.
86
    # lvmetad is updated.
55
69
87
56
70
    # before appending the cache flag though, check if lvmetad is running. this
88
    # before appending the cache flag though, check if lvmetad is running. this
57
diff --git a/examples/tests/dirty_disks_config.yaml b/examples/tests/dirty_disks_config.yaml
58
index 75d44c3..fb9a0d6 100644
59
--- a/examples/tests/dirty_disks_config.yaml
60
+++ b/examples/tests/dirty_disks_config.yaml
61
@@ -27,6 +27,31 @@ bucket:
62
27
      # disable any rpools to trigger disks with zfs_member label but inactive
27
      # disable any rpools to trigger disks with zfs_member label but inactive
63
28
      # pools
28
      # pools
64
29
      zpool export rpool ||:
29
      zpool export rpool ||:
65
30
  - &lvm_stop |
66
31
      #!/bin/sh
67
32
      # This function disables any existing lvm logical volumes that
68
33
      # have been created during the early storage config stage
69
34
      # and simulates the effect of booting into a system with existing
70
35
      # (but inactive) lvm configuration.
71
36
      for vg in `pvdisplay -C --separator = -o vg_name --noheadings`; do
72
37
         vgchange -an $vg ||:
73
38
      done
74
39
      # disable the automatic pvscan, we want to test that curtin
75
40
      # can find/enable logical volumes without this service
76
41
      command -v systemctl && systemctl mask lvm2-pvscan\@.service
77
42
      # remove any existing metadata written from early disk config
78
43
      rm -rf /etc/lvm/archive /etc/lvm/backup
79
44
  - &mdadm_stop  |
80
45
      #!/bin/sh
81
46
      # This function disables any existing raid devices which may
82
47
      # have been created during the early storage config stage
83
48
      # and simulates the effect of booting into a system with existing
84
49
      # but inactive mdadm configuration.
85
50
      for md in /dev/md*; do
86
51
          mdadm --stop $md ||:
87
52
      done
88
53
      # remove any existing metadata written from early disk config
89
54
      rm -f /etc/mdadm/mdadm.conf
90
30
55
91
31
early_commands:
56
early_commands:
92
32
  # running block-meta custom from the install environment
57
  # running block-meta custom from the install environment
93
@@ -34,9 +59,11 @@ early_commands:
94
34
  # the disks exactly as in this config before the rest of the install
59
  # the disks exactly as in this config before the rest of the install
95
35
  # will just blow it all away.  We have clean out other environment
60
  # will just blow it all away.  We have clean out other environment
96
36
  # that could unintentionally mess things up.
61
  # that could unintentionally mess things up.
98
37
  blockmeta: [env, -u, OUTPUT_FSTAB,
62
  01-blockmeta: [env, -u, OUTPUT_FSTAB,
99
38
              TARGET_MOUNT_POINT=/tmp/my.bdir/target,
63
              TARGET_MOUNT_POINT=/tmp/my.bdir/target,
100
39
              WORKING_DIR=/tmp/my.bdir/work.d, 
64
              WORKING_DIR=/tmp/my.bdir/work.d, 
101
40
              curtin, --showtrace, -v, block-meta, --umount, custom]
65
              curtin, --showtrace, -v, block-meta, --umount, custom]
104
41
  enable_swaps: [sh, -c, *swapon]
66
  02-enable_swaps: [sh, -c, *swapon]
105
42
  disable_rpool: [sh, -c, *zpool_export]
67
  03-disable_rpool: [sh, -c, *zpool_export]
106
68
  04-lvm_stop: [sh, -c, *lvm_stop]
107
69
  05-mdadm_stop: [sh, -c, *mdadm_stop]
108
diff --git a/examples/tests/lvmoverraid.yaml b/examples/tests/lvmoverraid.yaml
109
43
new file mode 100644
70
new file mode 100644
110
index 0000000..a1d41e9
111
--- /dev/null
112
+++ b/examples/tests/lvmoverraid.yaml
113
@@ -0,0 +1,98 @@
114
1
storage:
115
2
    config:
116
3
    -   grub_device: true
117
4
        id: disk-0
118
5
        model: QEMU_HARDDISK
119
6
        name: 'main_disk'
120
7
        serial: disk-a
121
8
        preserve: false
122
9
        ptable: gpt
123
10
        type: disk
124
11
        wipe: superblock
125
12
    -   grub_device: false
126
13
        id: disk-2
127
14
        name: 'disk-2'
128
15
        serial: disk-b
129
16
        preserve: false
130
17
        type: disk
131
18
        wipe: superblock
132
19
    -   grub_device: false
133
20
        id: disk-1
134
21
        name: 'disk-1'
135
22
        serial: disk-c
136
23
        preserve: false
137
24
        type: disk
138
25
        wipe: superblock
139
26
    -   grub_device: false
140
27
        id: disk-3
141
28
        name: 'disk-3'
142
29
        serial: disk-d
143
30
        preserve: false
144
31
        type: disk
145
32
        wipe: superblock
146
33
    -   grub_device: false
147
34
        id: disk-4
148
35
        name: 'disk-4'
149
36
        serial: disk-e
150
37
        preserve: false
151
38
        type: disk
152
39
        wipe: superblock
153
40
    -   device: disk-0
154
41
        flag: bios_grub
155
42
        id: part-0
156
43
        preserve: false
157
44
        size: 1048576
158
45
        type: partition
159
46
    -   device: disk-0
160
47
        flag: ''
161
48
        id: part-1
162
49
        preserve: false
163
50
        size: 4G
164
51
        type: partition
165
52
    -   devices:
166
53
        - disk-2
167
54
        - disk-1
168
55
        id: raid-0
169
56
        name: md0
170
57
        raidlevel: 1
171
58
        spare_devices: []
172
59
        type: raid
173
60
    -   devices:
174
61
        - disk-3
175
62
        - disk-4
176
63
        id: raid-1
177
64
        name: md1
178
65
        raidlevel: 1
179
66
        spare_devices: []
180
67
        type: raid
181
68
    -   devices:
182
69
        - raid-0
183
70
        - raid-1
184
71
        id: vg-0
185
72
        name: vg0
186
73
        type: lvm_volgroup
187
74
    -   id: lv-0
188
75
        name: lv-0
189
76
        size: 3G
190
77
        type: lvm_partition
191
78
        volgroup: vg-0
192
79
    -   fstype: ext4
193
80
        id: fs-0
194
81
        preserve: false
195
82
        type: format
196
83
        volume: part-1
197
84
    -   fstype: ext4
198
85
        id: fs-1
199
86
        preserve: false
200
87
        type: format
201
88
        volume: lv-0
202
89
    -   device: fs-0
203
90
        id: mount-0
204
91
        path: /
205
92
        type: mount
206
93
    -   device: fs-1
207
94
        id: mount-1
208
95
        path: /home
209
96
        type: mount
210
97
    version: 1
211
98
212
diff --git a/tests/unittests/test_block_lvm.py b/tests/unittests/test_block_lvm.py
213
index 341f2fa..22fb064 100644
214
--- a/tests/unittests/test_block_lvm.py
215
+++ b/tests/unittests/test_block_lvm.py
216
@@ -75,24 +75,24 @@ class TestBlockLvm(CiTestCase):
217
75
    @mock.patch('curtin.block.lvm.util')
75
    @mock.patch('curtin.block.lvm.util')
218
76
    def test_lvm_scan(self, mock_util, mock_lvmetad):
76
    def test_lvm_scan(self, mock_util, mock_lvmetad):
219
77
        """check that lvm_scan formats commands correctly for each release"""
77
        """check that lvm_scan formats commands correctly for each release"""
220
78
        cmds = [['pvscan'], ['vgscan', '--mknodes']]
221
78
        for (count, (codename, lvmetad_status, use_cache)) in enumerate(
79
        for (count, (codename, lvmetad_status, use_cache)) in enumerate(
226
79
                [('precise', False, False), ('precise', True, False),
80
                [('precise', False, False),
227
80
                 ('trusty', False, False), ('trusty', True, True),
81
                 ('trusty', False, False),
224
81
                 ('vivid', False, False), ('vivid', True, True),
225
82
                 ('wily', False, False), ('wily', True, True),
228
83
                 ('xenial', False, False), ('xenial', True, True),
82
                 ('xenial', False, False), ('xenial', True, True),
229
84
                 ('yakkety', True, True), ('UNAVAILABLE', True, True),
230
85
                 (None, True, True), (None, False, False)]):
83
                 (None, True, True), (None, False, False)]):
231
86
            mock_util.lsb_release.return_value = {'codename': codename}
84
            mock_util.lsb_release.return_value = {'codename': codename}
232
87
            mock_lvmetad.return_value = lvmetad_status
85
            mock_lvmetad.return_value = lvmetad_status
233
88
            lvm.lvm_scan()
86
            lvm.lvm_scan()
242
89
            self.assertEqual(
87
            expected = [cmd for cmd in cmds]
243
90
                len(mock_util.subp.call_args_list), 2 * (count + 1))
88
            for cmd in expected:
244
91
            for (expected, actual) in zip(
89
                if lvmetad_status:
245
92
                    [['pvscan'], ['vgscan', '--mknodes']],
90
                    cmd.append('--cache')
246
93
                    mock_util.subp.call_args_list[2 * count:2 * count + 2]):
91
247
94
                if use_cache:
92
            calls = [mock.call(cmd, capture=True) for cmd in expected]
248
95
                    expected.append('--cache')
93
            self.assertEqual(len(expected), len(mock_util.subp.call_args_list))
249
96
                self.assertEqual(mock.call(expected, capture=True), actual)
94
            mock_util.subp.has_calls(calls)
250
95
            mock_util.subp.reset_mock()
251
96
252
97
97
253
98
# vi: ts=4 expandtab syntax=python
98
# vi: ts=4 expandtab syntax=python
254
diff --git a/tests/unittests/test_clear_holders.py b/tests/unittests/test_clear_holders.py
255
index 6c29171..21f76be 100644
256
--- a/tests/unittests/test_clear_holders.py
257
+++ b/tests/unittests/test_clear_holders.py
258
@@ -779,10 +779,12 @@ class TestClearHolders(CiTestCase):
259
779
        mock_gen_holders_tree.return_value = self.example_holders_trees[1][1]
779
        mock_gen_holders_tree.return_value = self.example_holders_trees[1][1]
260
780
        clear_holders.assert_clear(device)
780
        clear_holders.assert_clear(device)
261
781
781
262
782
    @mock.patch('curtin.block.clear_holders.lvm')
263
782
    @mock.patch('curtin.block.clear_holders.zfs')
783
    @mock.patch('curtin.block.clear_holders.zfs')
264
783
    @mock.patch('curtin.block.clear_holders.mdadm')
784
    @mock.patch('curtin.block.clear_holders.mdadm')
265
784
    @mock.patch('curtin.block.clear_holders.util')
785
    @mock.patch('curtin.block.clear_holders.util')
267
785
    def test_start_clear_holders_deps(self, mock_util, mock_mdadm, mock_zfs):
786
    def test_start_clear_holders_deps(self, mock_util, mock_mdadm, mock_zfs,
268
787
                                      mock_lvm):
269
786
        mock_zfs.zfs_supported.return_value = True
788
        mock_zfs.zfs_supported.return_value = True
270
787
        clear_holders.start_clear_holders_deps()
789
        clear_holders.start_clear_holders_deps()
271
788
        mock_mdadm.mdadm_assemble.assert_called_with(
790
        mock_mdadm.mdadm_assemble.assert_called_with(
272
@@ -790,11 +792,12 @@ class TestClearHolders(CiTestCase):
273
790
        mock_util.load_kernel_module.assert_has_calls([
792
        mock_util.load_kernel_module.assert_has_calls([
274
791
                mock.call('bcache'), mock.call('zfs')])
793
                mock.call('bcache'), mock.call('zfs')])
275
792
794
276
795
    @mock.patch('curtin.block.clear_holders.lvm')
277
793
    @mock.patch('curtin.block.clear_holders.zfs')
796
    @mock.patch('curtin.block.clear_holders.zfs')
278
794
    @mock.patch('curtin.block.clear_holders.mdadm')
797
    @mock.patch('curtin.block.clear_holders.mdadm')
279
795
    @mock.patch('curtin.block.clear_holders.util')
798
    @mock.patch('curtin.block.clear_holders.util')
280
796
    def test_start_clear_holders_deps_nozfs(self, mock_util, mock_mdadm,
799
    def test_start_clear_holders_deps_nozfs(self, mock_util, mock_mdadm,
282
797
                                            mock_zfs):
800
                                            mock_zfs, mock_lvm):
283
798
        """test that we skip zfs modprobe on unsupported platforms"""
801
        """test that we skip zfs modprobe on unsupported platforms"""
284
799
        mock_zfs.zfs_supported.return_value = False
802
        mock_zfs.zfs_supported.return_value = False
285
800
        clear_holders.start_clear_holders_deps()
803
        clear_holders.start_clear_holders_deps()
286
diff --git a/tests/vmtests/test_lvm_raid.py b/tests/vmtests/test_lvm_raid.py
287
801
new file mode 100644
804
new file mode 100644
288
index 0000000..0c50941
289
--- /dev/null
290
+++ b/tests/vmtests/test_lvm_raid.py
291
@@ -0,0 +1,50 @@
292
1
# This file is part of curtin. See LICENSE file for copyright and license info.
293
2
294
3
from .releases import base_vm_classes as relbase
295
4
from .test_mdadm_bcache import TestMdadmAbs
296
5
from .test_lvm import TestLvmAbs
297
6
298
7
import textwrap
299
8
300
9
301
10
class TestLvmOverRaidAbs(TestMdadmAbs, TestLvmAbs):
302
11
    conf_file = "examples/tests/lvmoverraid.yaml"
303
12
    active_mdadm = "2"
304
13
    nr_cpus = 2
305
14
    dirty_disks = True
306
15
    extra_disks = ['10G'] * 4
307
16
308
17
    collect_scripts = TestLvmAbs.collect_scripts
309
18
    collect_scripts += TestMdadmAbs.collect_scripts + [textwrap.dedent("""
310
19
        cd OUTPUT_COLLECT_D
311
20
        ls -al /dev/md* > dev_md
312
21
        cp -a /etc/mdadm etc_mdadm
313
22
        cp -a /etc/lvm etc_lvm
314
23
        """)]
315
24
316
25
    fstab_expected = {
317
26
        '/dev/vg1/lv1': '/srv/data',
318
27
        '/dev/vg1/lv2': '/srv/backup',
319
28
    }
320
29
    disk_to_check = [('main_disk', 1),
321
30
                     ('md0', 0),
322
31
                     ('md1', 0)]
323
32
324
33
    def test_lvs(self):
325
34
        self.check_file_strippedline("lvs", "lv-0=vg0")
326
35
327
36
    def test_pvs(self):
328
37
        self.check_file_strippedline("pvs", "vg0=/dev/md0")
329
38
        self.check_file_strippedline("pvs", "vg0=/dev/md1")
330
39
331
40
332
41
class CosmicTestLvmOverRaid(relbase.cosmic, TestLvmOverRaidAbs):
333
42
    __test__ = True
334
43
335
44
336
45
class BionicTestLvmOverRaid(relbase.bionic, TestLvmOverRaidAbs):
337
46
    __test__ = True
338
47
339
48
340
49
class XenialGATestLvmOverRaid(relbase.xenial_ga, TestLvmOverRaidAbs):
341
50
    __test__ = True
342
diff --git a/tests/vmtests/test_lvm_root.py b/tests/vmtests/test_lvm_root.py
343
index 8ca69d4..bc8b047 100644
344
--- a/tests/vmtests/test_lvm_root.py
345
+++ b/tests/vmtests/test_lvm_root.py
346
@@ -113,7 +113,7 @@ class XenialTestUefiLvmRootXfs(relbase.xenial, TestUefiLvmRootAbs):
347
113
    }
113
    }
348
114
114
349
115
115
351
116
@VMBaseClass.skip_by_date("1652822", fixby="2019-06-01")
116
@VMBaseClass.skip_by_date("1652822", fixby="2019-06-01", install=False)
352
117
class XenialTestUefiLvmRootXfsBootXfs(relbase.xenial, TestUefiLvmRootAbs):
117
class XenialTestUefiLvmRootXfsBootXfs(relbase.xenial, TestUefiLvmRootAbs):
353
118
    """This tests xfs root and xfs boot with uefi.
118
    """This tests xfs root and xfs boot with uefi.
354
119
119
Reviewer	Review Type	Date Requested	Status
Server Team CI bot	continuous-integration		Approve on 2018-08-17
Scott Moser (community)		2018-07-26	Approve on 2018-08-17
Review via email: mp+351384@code.launchpad.net