Skip to content
GitLab
Menu
Projects
Groups
Snippets
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Menu
Open sidebar
Simone Rossi
main
Commits
b0932ad8
Commit
b0932ad8
authored
Nov 06, 2017
by
Daniele Venzano
Browse files
Fix resource limits set from the web interface
parent
251e0281
Changes
1
Hide whitespace changes
Inline
Side-by-side
zoe_api/web/zapp_shop.py
View file @
b0932ad8
...
...
@@ -146,24 +146,34 @@ class ZAppStartWeb(ZoeRequestHandler):
if
service
[
'name'
]
==
param
.
name
:
service
[
'command'
]
=
self
.
get_argument
(
argument_name
)
break
elif
param
.
kind
==
'resource_memory_min'
and
role
==
"admin"
or
(
role
!=
"guest"
and
(
role
==
"user"
and
not
get_conf
().
no_user_edit_limits_web
)):
for
service
in
app_descr
[
'services'
]:
if
service
[
'name'
]
==
param
.
name
:
if
self
.
get_argument
(
argument_name
)
>=
get_conf
().
max_memory_limit
*
(
1024
**
3
):
val
=
get_conf
().
max_memory_limit
*
(
1024
**
3
)
else
:
val
=
self
.
get_argument
(
argument_name
)
service
[
"resources"
][
"memory"
][
"min"
]
=
val
break
elif
param
.
kind
==
'resource_cores_min'
and
role
==
"admin"
or
(
role
!=
"guest"
and
(
role
==
"user"
and
not
get_conf
().
no_user_edit_limits_web
)):
for
service
in
app_descr
[
'services'
]:
if
service
[
'name'
]
==
param
.
name
:
if
self
.
get_argument
(
argument_name
)
>=
get_conf
().
max_core_limit
:
val
=
get_conf
().
max_core_limit
else
:
val
=
self
.
get_argument
(
argument_name
)
service
[
"resources"
][
"cores"
][
"min"
]
=
val
break
else
:
log
.
warning
(
'Unknown parameter kind: {}, ignoring...'
.
format
(
param
.
kind
))
if
role
==
"admin"
or
(
role
!=
"guest"
and
(
role
==
"user"
and
not
get_conf
().
no_user_edit_limits_web
)):
for
service
in
app_descr
[
'services'
]:
argument_name
=
service
[
'name'
]
+
'-resource_memory_min'
try
:
self
.
get_argument
(
argument_name
)
except
MissingArgumentError
:
pass
else
:
if
float
(
self
.
get_argument
(
argument_name
))
>=
get_conf
().
max_memory_limit
:
val
=
int
(
get_conf
().
max_memory_limit
*
(
1024
**
3
))
else
:
val
=
int
(
float
(
self
.
get_argument
(
argument_name
))
*
(
1024
**
3
))
service
[
"resources"
][
"memory"
][
"min"
]
=
val
argument_name
=
service
[
'name'
]
+
'-resource_cores_min'
try
:
self
.
get_argument
(
argument_name
)
except
MissingArgumentError
:
pass
else
:
if
float
(
self
.
get_argument
(
argument_name
))
>=
get_conf
().
max_core_limit
:
val
=
get_conf
().
max_core_limit
else
:
val
=
float
(
self
.
get_argument
(
argument_name
))
service
[
"resources"
][
"cores"
][
"min"
]
=
val
break
return
app_descr
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