1
diff --git a/src/maasserver/utils/tests/test_views.py b/src/maasserver/utils/tests/test_views.py
2
index e456a1e..f53dfd4 100644
3
--- a/src/maasserver/utils/tests/test_views.py
4
+++ b/src/maasserver/utils/tests/test_views.py
5
@@ -382,6 +382,7 @@ class TestWebApplicationHandler(SerializationFailureTestCase):
6
382
            MockCallsMatch(call(request), call(request), call(request)),
382
            MockCallsMatch(call(request), call(request), call(request)),
7
383
        )
383
        )
8
384
        self.assertIsInstance(response, HttpResponseConflict)
384
        self.assertIsInstance(response, HttpResponseConflict)
9
385
        self.expectThat(response["Retry-After"], Equals("5"))
10
385
        self.expectThat(response.status_code, Equals(http.client.CONFLICT))
386
        self.expectThat(response.status_code, Equals(http.client.CONFLICT))
11
386
        self.expectThat(
387
        self.expectThat(
12
387
            response.reason_phrase,
388
            response.reason_phrase,
13
diff --git a/src/maasserver/utils/views.py b/src/maasserver/utils/views.py
14
index 18b67b9..e20c5e1 100644
15
--- a/src/maasserver/utils/views.py
16
+++ b/src/maasserver/utils/views.py
17
@@ -38,6 +38,8 @@ from provisioningserver.utils.twisted import retries
18
38
38
19
39
logger = logging.getLogger(__name__)
39
logger = logging.getLogger(__name__)
20
40
40
21
41
RETRY_AFTER_CONFLICT = 5
22
42
23
41
43
24
42
class InternalErrorResponse(BaseException):
44
class InternalErrorResponse(BaseException):
25
43
    """Exception raised to exit the transaction context.
45
    """Exception raised to exit the transaction context.
26
@@ -149,6 +151,9 @@ class HttpResponseConflict(MAASDjangoTemplateResponse):
27
149
151
28
150
    def __init__(self, response=None, exc_info=None):
152
    def __init__(self, response=None, exc_info=None):
29
151
        super().__init__(response=response)
153
        super().__init__(response=response)
30
154
        # Responses with status code 409 should be retried by the clients
31
155
        # see https://bugs.launchpad.net/maas/+bug/2034014/comments/6 for more information
32
156
        self["Retry-After"] = RETRY_AFTER_CONFLICT
33
152
        self.exc_info = exc_info
157
        self.exc_info = exc_info
34
153
158
35
154
159
Reviewer	Date Requested	Status
Jack Lloyd-Walters	2023-09-07	Approve on 2023-09-08
MAAS Lander		Approve on 2023-09-08
Review via email: mp+450867@code.launchpad.net