1
=== modified file 'curtin/block/mdadm.py'
2
--- curtin/block/mdadm.py	2017-05-12 21:06:28 +0000
3
+++ curtin/block/mdadm.py	2017-09-07 16:10:35 +0000
4
@@ -273,7 +273,11 @@
5
273
            LOG.debug('%s/sync_max = %s', sync_action, val)
273
            LOG.debug('%s/sync_max = %s', sync_action, val)
6
274
            if val != "idle":
274
            if val != "idle":
7
275
                LOG.debug("mdadm: setting array sync_action=idle")
275
                LOG.debug("mdadm: setting array sync_action=idle")
9
276
                util.write_file(sync_action, content="idle")
276
                try:
10
277
                    util.write_file(sync_action, content="idle")
11
278
                except (IOError, OSError) as e:
12
279
                    LOG.debug("mdadm: (non-fatal) write to %s failed %s",
13
280
                              sync_action, e)
14
277
281
15
278
            # Setting the sync_{max,min} may can help prevent the array from
282
            # Setting the sync_{max,min} may can help prevent the array from
16
279
            # changing back to 'resync' which may prevent the array from being
283
            # changing back to 'resync' which may prevent the array from being
17
@@ -283,11 +287,11 @@
18
283
            if val != "0":
287
            if val != "0":
19
284
                LOG.debug("mdadm: setting array sync_{min,max}=0")
288
                LOG.debug("mdadm: setting array sync_{min,max}=0")
20
285
                try:
289
                try:
26
286
                    util.write_file(sync_max, content="0")
290
                    for sync_file in [sync_max, sync_min]:
27
287
                    util.write_file(sync_min, content="0")
291
                        util.write_file(sync_file, content="0")
28
288
                except IOError:
292
                except (IOError, OSError) as e:
29
289
                    LOG.warning('mdadm: failed to set sync_{max,min} values')
293
                    LOG.debug('mdadm: (non-fatal) write to %s failed %s',
30
290
                    pass
294
                              sync_file, e)
31
291
295
32
292
            # one wonders why this command doesn't do any of the above itself?
296
            # one wonders why this command doesn't do any of the above itself?
33
293
            out, err = util.subp(["mdadm", "--manage", "--stop", devpath],
297
            out, err = util.subp(["mdadm", "--manage", "--stop", devpath],
34
294
298
35
=== modified file 'tests/vmtests/test_mdadm_bcache.py'
36
--- tests/vmtests/test_mdadm_bcache.py	2017-08-02 15:46:35 +0000
37
+++ tests/vmtests/test_mdadm_bcache.py	2017-09-07 16:10:35 +0000
38
@@ -413,6 +413,9 @@
39
413
    # we have to avoid a systemd hang due to the way it handles dmcrypt
413
    # we have to avoid a systemd hang due to the way it handles dmcrypt
40
414
    extra_kern_args = "--- luks=no"
414
    extra_kern_args = "--- luks=no"
41
415
    active_mdadm = "4"
415
    active_mdadm = "4"
42
416
    # running in dirty mode catches some race/errors with mdadm_stop
43
417
    nr_cpus = 2
44
418
    dirty_disks = True
45
416
    # initialize secondary disk
419
    # initialize secondary disk
46
417
    extra_disks = ['5G', '5G', '5G']
420
    extra_disks = ['5G', '5G', '5G']
47
418
    disk_to_check = [('main_disk', 1),
421
    disk_to_check = [('main_disk', 1),
Status:	Merged
Merged at revision:	525
Proposed branch:	lp:~raharper/curtin/trunk.fix-lvm-over-raid
Merge into:	lp:~curtin-dev/curtin/trunk
Diff against target:	47 lines (+13/-6) 2 files modified curtin/block/mdadm.py (+10/-6) tests/vmtests/test_mdadm_bcache.py (+3/-0)
To merge this branch:	bzr merge lp:~raharper/curtin/trunk.fix-lvm-over-raid
Related bugs:	Link a bug report
Reviewer	Review Type	Date Requested	Status
Scott Moser (community)			Approve on 2017-09-07
Chad Smith		2017-08-28	Approve on 2017-09-07
Server Team CI bot	continuous-integration		Approve on 2017-09-07
Review via email: mp+329765@code.launchpad.net