1
=== modified file 'curtin/block/iscsi.py'
2
--- curtin/block/iscsi.py	2017-08-31 19:22:08 +0000
3
+++ curtin/block/iscsi.py	2017-09-12 21:16:54 +0000
4
@@ -195,6 +195,15 @@
5
195
    return target_nodes_location
195
    return target_nodes_location
6
196
196
7
197
197
8
198
def restart_iscsi_service():
9
199
    LOG.info('restarting iscsi service')
10
200
    if util.uses_systemd():
11
201
        cmd = ['systemctl', 'reload-or-restart', 'open-iscsi']
12
202
    else:
13
203
        cmd = ['service', 'open-iscsi', 'restart']
14
204
    util.subp(cmd, capture=True)
15
205
16
206
17
198
def save_iscsi_config(iscsi_disk):
207
def save_iscsi_config(iscsi_disk):
18
199
    state = util.load_command_environment()
208
    state = util.load_command_environment()
19
200
    # A nodes directory will be created in the same directory as the
209
    # A nodes directory will be created in the same directory as the
20
201
210
21
=== modified file 'curtin/commands/install.py'
22
--- curtin/commands/install.py	2017-08-31 18:41:35 +0000
23
+++ curtin/commands/install.py	2017-09-12 21:16:54 +0000
24
@@ -479,11 +479,23 @@
25
479
            copy_install_log(logfile, workingd.target, log_target_path)
479
            copy_install_log(logfile, workingd.target, log_target_path)
26
480
        # unmount everything (including iscsi disks)
480
        # unmount everything (including iscsi disks)
27
481
        util.do_umount(workingd.target, recursive=True)
481
        util.do_umount(workingd.target, recursive=True)
33
482
        # disconnect configured iscsi disks
482
34
483
        LOG.info("Disconnecting iscsi targets (if present)")
483
        # The open-iscsi service in the ephemeral environment handles
35
484
        for iscsi_disk in iscsi.get_iscsi_disks_from_config(cfg):
484
        # disconnecting active sessions.  On Artful release the systemd
36
485
            LOG.info("Attempting to disconnect %s", iscsi_disk)
485
        # unit file has conditionals that are not met at boot time and
37
486
            iscsi_disk.disconnect()
486
        # results in open-iscsi service not being started; This breaks
38
487
        # shutdown on Artful releases.
39
488
        # Additionally, in release < Artful, if the storage configuration
40
489
        # is layered, like RAID over iscsi volumes, then disconnecting iscsi
41
490
        # sessions before stopping the raid device hangs.
42
491
        # As it turns out, letting the open-iscsi service take down the
43
492
        # session last is the cleanest way to handle all releases regardless
44
493
        # of what may be layered on top of the iscsi disks.
45
494
        #
46
495
        # Check if storage configuration has iscsi volumes and if so ensure
47
496
        # iscsi service is active before exiting install
48
497
        if iscsi.get_iscsi_disks_from_config(cfg):
49
498
            iscsi.restart_iscsi_service()
50
487
499
51
488
        shutil.rmtree(workingd.top)
500
        shutil.rmtree(workingd.top)
52
489
501
53
490
502
54
=== modified file 'curtin/util.py'
55
--- curtin/util.py	2017-06-26 16:48:30 +0000
56
+++ curtin/util.py	2017-09-12 21:16:54 +0000
57
@@ -58,6 +58,7 @@
58
58
_INSTALLED_MAIN = '/usr/bin/curtin'
58
_INSTALLED_MAIN = '/usr/bin/curtin'
59
59
59
60
60
_LSB_RELEASE = {}
60
_LSB_RELEASE = {}
61
61
_USES_SYSTEMD = None
62
61
_HAS_UNSHARE_PID = None
62
_HAS_UNSHARE_PID = None
63
62
63
64
63
_DNS_REDIRECT_IP = None
64
_DNS_REDIRECT_IP = None
65
@@ -1400,4 +1401,17 @@
66
1400
    return data
1401
    return data
67
1401
1402
68
1402
1403
69
1404
def uses_systemd():
70
1405
    """ Check if current enviroment uses systemd by testing if
71
1406
        /run/systemd/system is a directory; only present if
72
1407
        systemd is available on running system.
73
1408
    """
74
1409
75
1410
    global _USES_SYSTEMD
76
1411
    if _USES_SYSTEMD is None:
77
1412
        _USES_SYSTEMD = os.path.isdir('/run/systemd/system')
78
1413
79
1414
    return _USES_SYSTEMD
80
1415
81
1416
82
1403
# vi: ts=4 expandtab syntax=python
1417
# vi: ts=4 expandtab syntax=python
83
1404
1418
84
=== modified file 'tests/unittests/test_util.py'
85
--- tests/unittests/test_util.py	2017-08-03 19:31:49 +0000
86
+++ tests/unittests/test_util.py	2017-09-12 21:16:54 +0000
87
@@ -851,4 +851,55 @@
88
851
        }, observed)
851
        }, observed)
89
852
852
90
853
853
91
854
class TestUsesSystemd(CiTestCase):
92
855
93
856
    def setUp(self):
94
857
        super(TestUsesSystemd, self).setUp()
95
858
        self._reset_cache()
96
859
        self.add_patch('curtin.util.os.path.isdir', 'mock_isdir')
97
860
98
861
    def _reset_cache(self):
99
862
        util._USES_SYSTEMD = None
100
863
101
864
    def test_uses_systemd_on_systemd(self):
102
865
        """ Test that uses_systemd returns True if sdpath is a dir """
103
866
        # systemd_enabled
104
867
        self.mock_isdir.return_value = True
105
868
        result = util.uses_systemd()
106
869
        self.assertEqual(True, result)
107
870
        self.assertEqual(1, len(self.mock_isdir.call_args_list))
108
871
109
872
    def test_uses_systemd_cached(self):
110
873
        """Test that we cache the uses_systemd result"""
111
874
112
875
        # reset_cache should ensure it's unset
113
876
        self.assertEqual(None, util._USES_SYSTEMD)
114
877
115
878
        # systemd enabled
116
879
        self.mock_isdir.return_value = True
117
880
118
881
        # first time
119
882
        first_result = util.uses_systemd()
120
883
121
884
        # check the cache value
122
885
        self.assertEqual(first_result, util._USES_SYSTEMD)
123
886
124
887
        # second time
125
888
        second_result = util.uses_systemd()
126
889
127
890
        # results should match between tries
128
891
        self.assertEqual(True, first_result)
129
892
        self.assertEqual(True, second_result)
130
893
131
894
        # isdir should only be called once
132
895
        self.assertEqual(1, len(self.mock_isdir.call_args_list))
133
896
134
897
    def test_uses_systemd_on_non_systemd(self):
135
898
        """ Test that uses_systemd returns False if sdpath is not a dir """
136
899
        # systemd not available
137
900
        self.mock_isdir.return_value = False
138
901
        result = util.uses_systemd()
139
902
        self.assertEqual(False, result)
140
903
141
904
142
854
# vi: ts=4 expandtab syntax=python
905
# vi: ts=4 expandtab syntax=python
143
855
906
144
=== modified file 'tests/vmtests/test_mdadm_iscsi.py'
145
--- tests/vmtests/test_mdadm_iscsi.py	2017-08-02 15:46:35 +0000
146
+++ tests/vmtests/test_mdadm_iscsi.py	2017-09-12 21:16:54 +0000
147
@@ -36,3 +36,7 @@
148
36
36
149
37
class ZestyTestIscsiMdadm(relbase.zesty, TestMdadmIscsiAbs):
37
class ZestyTestIscsiMdadm(relbase.zesty, TestMdadmIscsiAbs):
150
38
    __test__ = True
38
    __test__ = True
151
39
152
40
153
41
class ArtfulTestIscsiMdadm(relbase.artful, TestMdadmIscsiAbs):
154
42
    __test__ = True
Status:	Merged
Merged at revision:	526
Proposed branch:	lp:~raharper/curtin/trunk.fix-raid-over-iscsi
Merge into:	lp:~curtin-dev/curtin/trunk
Diff against target:	154 lines (+95/-5) 5 files modified curtin/block/iscsi.py (+9/-0) curtin/commands/install.py (+17/-5) curtin/util.py (+14/-0) tests/unittests/test_util.py (+51/-0) tests/vmtests/test_mdadm_iscsi.py (+4/-0)
To merge this branch:	bzr merge lp:~raharper/curtin/trunk.fix-raid-over-iscsi
Related bugs:	Link a bug report
Reviewer	Review Type	Date Requested	Status
Server Team CI bot	continuous-integration		Approve on 2017-09-12
Scott Moser (community)		2017-09-06	Approve on 2017-09-12
Review via email: mp+330309@code.launchpad.net