Skip to content

Commit 534617a

Browse files
author
lijianguo
committed
chore(volumes): modify the volume size
1 parent 0184d26 commit 534617a

3 files changed

Lines changed: 13 additions & 3 deletions

File tree

rootfs/api/models/volume.py

Lines changed: 11 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,6 +42,16 @@ def delete(self, *args, **kwargs):
4242
# Delete from DB
4343
return super(Volume, self).delete(*args, **kwargs)
4444

45+
@staticmethod
46+
def _get_size(size):
47+
""" Format volume limit value """
48+
if size[-2:-1].isalpha() and size[-1].isalpha():
49+
size = size[:-1]
50+
51+
if size[-1].isalpha():
52+
size = size.upper() + "i"
53+
return size
54+
4555
def attach(self):
4656
try:
4757
self._scheduler.pvc.get(self.app.id, self.name)
@@ -52,7 +62,7 @@ def attach(self):
5262
logger.info(e)
5363
try:
5464
kwargs = {
55-
"size": self.size,
65+
"size": self._get_size(self.size),
5666
"storage_class": settings.DRYCC_APP_STORAGE_CLASS,
5767
}
5868
self._scheduler.pvc.create(self.app.id, self.name, **kwargs)

rootfs/api/serializers.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -666,7 +666,7 @@ def validate_size(data):
666666
raise serializers.ValidationError(
667667
"Volume size limit format: <number><unit> or <number><unit>/<number><unit>, "
668668
"where unit = B, K, M or G")
669-
return data
669+
return data.upper()
670670

671671
@staticmethod
672672
def validate_path(data):

rootfs/scheduler/resources/pod.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -281,7 +281,7 @@ def _get_termination_grace_period(kwargs):
281281
return timeout_global if timeout_local is None else int(timeout_local)
282282

283283
@staticmethod
284-
def _get_memory(size, ):
284+
def _get_memory(size):
285285
""" Format memory limit value """
286286
if size[-2:-1].isalpha() and size[-1].isalpha():
287287
size = size[:-1]

0 commit comments

Comments
 (0)