1
=== modified file 'src/maasserver/bootresources.py'
2
--- src/maasserver/bootresources.py	2014-09-25 21:13:55 +0000
3
+++ src/maasserver/bootresources.py	2014-10-28 14:57:44 +0000
4
@@ -21,6 +21,8 @@
5
21
    "SIMPLESTREAMS_URL_REGEXP",
21
    "SIMPLESTREAMS_URL_REGEXP",
6
22
]
22
]
7
23
23
8
24
from datetime import timedelta
9
25
from subprocess import CalledProcessError
10
24
import threading
26
import threading
11
25
import time
27
import time
12
26
28
13
@@ -66,6 +68,7 @@
14
66
from provisioningserver.logger import get_maas_logger
68
from provisioningserver.logger import get_maas_logger
15
67
from provisioningserver.utils.env import environment_variables
69
from provisioningserver.utils.env import environment_variables
16
68
from provisioningserver.utils.fs import tempdir
70
from provisioningserver.utils.fs import tempdir
17
71
from provisioningserver.utils.shell import ExternalProcessError
18
69
from provisioningserver.utils.twisted import synchronous
72
from provisioningserver.utils.twisted import synchronous
19
70
from simplestreams import util as sutil
73
from simplestreams import util as sutil
20
71
from simplestreams.mirrors import (
74
from simplestreams.mirrors import (
21
@@ -76,6 +79,7 @@
22
76
from twisted.application.internet import TimerService
79
from twisted.application.internet import TimerService
23
77
from twisted.internet import reactor
80
from twisted.internet import reactor
24
78
from twisted.internet.threads import deferToThread
81
from twisted.internet.threads import deferToThread
25
82
from twisted.python import log
26
79
83
27
80
84
28
81
maaslog = get_maas_logger("bootresources")
85
maaslog = get_maas_logger("bootresources")
29
@@ -908,6 +912,23 @@
30
908
        lock_thread.join()
912
        lock_thread.join()
31
909
913
32
910
914
33
915
def _import_resources_in_thread(force=False):
34
916
    """Import boot resources in a thread managed by Twisted.
35
917
36
918
    Errors are logged. The returned `Deferred` will never errback so it's safe
37
919
    to use in a `TimerService`, for example.
38
920
    """
39
921
    def coerce_subprocess_failures(failure):
40
922
        failure.trap(CalledProcessError)
41
923
        failure.value.__class__ = ExternalProcessError
42
924
        return failure
43
925
44
926
    d = deferToThread(_import_resources, force=force)
45
927
    d.addErrback(coerce_subprocess_failures)
46
928
    d.addErrback(log.err, "Importing boot resources failed.")
47
929
    return d
48
930
49
931
50
911
def import_resources():
932
def import_resources():
51
912
    """Starts the importing of boot resources.
933
    """Starts the importing of boot resources.
52
913
934
53
@@ -915,7 +936,7 @@
54
915
    doesn't wait for it to be finished, as it can take several minutes to
936
    doesn't wait for it to be finished, as it can take several minutes to
55
916
    complete.
937
    complete.
56
917
    """
938
    """
58
918
    reactor.callFromThread(deferToThread, _import_resources, force=True)
939
    reactor.callFromThread(_import_resources_in_thread, force=True)
59
919
940
60
920
941
61
921
def is_import_resources_running():
942
def is_import_resources_running():
62
@@ -930,6 +951,6 @@
63
930
    though the interval can be overridden by passing it to the constructor.
951
    though the interval can be overridden by passing it to the constructor.
64
931
    """
952
    """
65
932
953
67
933
    def __init__(self, interval=(60 * 60)):
954
    def __init__(self, interval=timedelta(hours=1)):
68
934
        super(ImportResourcesService, self).__init__(
955
        super(ImportResourcesService, self).__init__(
70
935
            interval, deferToThread, _import_resources)
956
            interval.total_seconds(), _import_resources_in_thread)
71
936
957
72
=== modified file 'src/maasserver/models/tests/test_bootsource.py'
73
--- src/maasserver/models/tests/test_bootsource.py	2014-09-30 19:48:33 +0000
74
+++ src/maasserver/models/tests/test_bootsource.py	2014-10-28 14:57:44 +0000
75
@@ -15,6 +15,7 @@
76
15
__all__ = []
15
__all__ = []
77
16
16
78
17
import os
17
import os
79
18
from unittest import skip
80
18
19
81
19
from django.core.exceptions import ValidationError
20
from django.core.exceptions import ValidationError
82
20
from maasserver.bootsources import _cache_boot_sources
21
from maasserver.bootsources import _cache_boot_sources
83
@@ -98,6 +99,9 @@
84
98
            [],
99
            [],
85
99
            boot_source_dict['selections'])
100
            boot_source_dict['selections'])
86
100
101
87
102
    # XXX: GavinPanella 2014-10-28 bug=1376317: This test is fragile, possibly
88
103
    # due to isolation issues.
89
104
    @skip("Possible isolation issues")
90
101
    def test_calls_cache_boot_sources_on_create(self):
105
    def test_calls_cache_boot_sources_on_create(self):
91
102
        mock_callLater = self.patch(reactor, 'callLater')
106
        mock_callLater = self.patch(reactor, 'callLater')
92
103
        BootSource.objects.create(
107
        BootSource.objects.create(
93
104
108
94
=== modified file 'src/maasserver/tests/test_bootresources.py'
95
--- src/maasserver/tests/test_bootresources.py	2014-09-24 16:41:33 +0000
96
+++ src/maasserver/tests/test_bootresources.py	2014-10-28 14:57:44 +0000
97
@@ -19,6 +19,7 @@
98
19
from os import environ
19
from os import environ
99
20
from random import randint
20
from random import randint
100
21
from StringIO import StringIO
21
from StringIO import StringIO
101
22
from subprocess import CalledProcessError
102
22
23
103
23
from django.core.urlresolvers import reverse
24
from django.core.urlresolvers import reverse
104
24
from django.db import (
25
from django.db import (
105
@@ -63,7 +64,11 @@
106
63
    sentinel,
64
    sentinel,
107
64
    )
65
    )
108
65
from provisioningserver.import_images.product_mapping import ProductMapping
66
from provisioningserver.import_images.product_mapping import ProductMapping
109
67
from provisioningserver.rpc.testing import TwistedLoggerFixture
110
68
from testtools.deferredruntest import extract_result
111
66
from testtools.matchers import ContainsAll
69
from testtools.matchers import ContainsAll
112
70
from twisted.application.internet import TimerService
113
71
from twisted.internet.defer import fail
114
67
72
115
68
73
116
69
def make_boot_resource_file_with_stream():
74
def make_boot_resource_file_with_stream():
117
@@ -1105,3 +1110,73 @@
118
1105
        self.assertThat(
1110
        self.assertThat(
119
1106
            nodegroup.objects.import_boot_images_on_accepted_clusters,
1111
            nodegroup.objects.import_boot_images_on_accepted_clusters,
120
1107
            MockCalledOnceWith())
1112
            MockCalledOnceWith())
121
1113
122
1114
123
1115
class TestImportResourcesInThread(MAASTestCase):
124
1116
    """Tests for `_import_resources_in_thread`."""
125
1117
126
1118
    def test__defers__import_resources_to_thread(self):
127
1119
        deferToThread = self.patch(bootresources, "deferToThread")
128
1120
        bootresources._import_resources_in_thread(force=sentinel.force)
129
1121
        self.assertThat(
130
1122
            deferToThread, MockCalledOnceWith(
131
1123
                bootresources._import_resources, force=sentinel.force))
132
1124
133
1125
    def tests__defaults_force_to_False(self):
134
1126
        deferToThread = self.patch(bootresources, "deferToThread")
135
1127
        bootresources._import_resources_in_thread()
136
1128
        self.assertThat(
137
1129
            deferToThread, MockCalledOnceWith(
138
1130
                bootresources._import_resources, force=False))
139
1131
140
1132
    def test__logs_errors_and_does_not_errback(self):
141
1133
        logger = self.useFixture(TwistedLoggerFixture())
142
1134
        exception_type = factory.make_exception_type()
143
1135
        deferToThread = self.patch(bootresources, "deferToThread")
144
1136
        deferToThread.return_value = fail(exception_type())
145
1137
        d = bootresources._import_resources_in_thread(force=sentinel.force)
146
1138
        self.assertIsNone(extract_result(d))
147
1139
        self.assertDocTestMatches(
148
1140
            """\
149
1141
            Importing boot resources failed.
150
1142
            Traceback (most recent call last):
151
1143
            ...
152
1144
            """,
153
1145
            logger.output)
154
1146
155
1147
    def test__logs_subprocess_output_on_error(self):
156
1148
        logger = self.useFixture(TwistedLoggerFixture())
157
1149
        exception = CalledProcessError(
158
1150
            2, [factory.make_name("command")],
159
1151
            factory.make_name("output"))
160
1152
        deferToThread = self.patch(bootresources, "deferToThread")
161
1153
        deferToThread.return_value = fail(exception)
162
1154
        d = bootresources._import_resources_in_thread(force=sentinel.force)
163
1155
        self.assertIsNone(extract_result(d))
164
1156
        self.assertDocTestMatches(
165
1157
            """\
166
1158
            Importing boot resources failed.
167
1159
            Traceback (most recent call last):
168
1160
            Failure: subprocess.CalledProcessError:
169
1161
              Command `command-...` returned non-zero exit status 2:
170
1162
            output-...
171
1163
            """,
172
1164
            logger.output)
173
1165
174
1166
175
1167
class TestImportResourcesService(MAASTestCase):
176
1168
    """Tests for `ImportResourcesService`."""
177
1169
178
1170
    def test__is_a_TimerService(self):
179
1171
        service = bootresources.ImportResourcesService()
180
1172
        self.assertIsInstance(service, TimerService)
181
1173
182
1174
    def test__runs_once_an_hour(self):
183
1175
        service = bootresources.ImportResourcesService()
184
1176
        self.assertEqual(3600, service.step)
185
1177
186
1178
    def test__calls__import_resources_in_thread(self):
187
1179
        service = bootresources.ImportResourcesService()
188
1180
        self.assertEqual(
189
1181
            (bootresources._import_resources_in_thread, (), {}),
190
1182
            service.call)
Reviewer	Review Type	Date Requested	Status
Christian Reis (community)		2014-10-28	Approve on 2014-10-28
Review via email: mp+239854@code.launchpad.net