Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
S
slapos.core
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Roque
slapos.core
Commits
47d81bef
Commit
47d81bef
authored
Feb 27, 2023
by
Xavier Thompson
Browse files
Options
Browse Files
Download
Plain Diff
Proxy: Fix unready forwarded requests causing crash
See merge request
!490
parents
88a0dc7a
88260036
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
6 additions
and
1 deletion
+6
-1
slapos/proxy/views.py
slapos/proxy/views.py
+5
-0
slapos/slap/slap.py
slapos/slap/slap.py
+1
-1
No files found.
slapos/proxy/views.py
View file @
47d81bef
...
...
@@ -714,6 +714,11 @@ def forwardRequestToExternalMaster(master_url, request_form):
partition
.
_master_url
=
master_url
# type: ignore
partition
.
_connection_helper
=
None
partition
.
_software_release_document
=
request_form
[
'software_release'
]
# type: ignore
if
partition
.
_request_dict
is
not
None
:
# ResourceNotReady
abort
(
408
)
return
dumps
(
partition
)
def
getAllocatedInstance
(
partition_reference
):
...
...
slapos/slap/slap.py
View file @
47d81bef
...
...
@@ -469,7 +469,7 @@ class ComputerPartition(SlapRequester):
self
.
_updateTransactionFile
(
partition_reference
=
None
)
def
__getinitargs__
(
self
):
return
(
self
.
_computer_id
,
self
.
_partition_id
,
)
return
(
self
.
_computer_id
,
self
.
_partition_id
,
self
.
_request_dict
)
def
_updateTransactionFile
(
self
,
partition_reference
=
None
):
"""
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment