matthew/sonic-buildimage
Archived
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[201911][procdockerstatsd] Add missing unit conversion (#7157)

Browse Source 
Fixing same issue in 201911 as mention here #7151
This commit is contained in:
pra-moh 2021-03-26 10:24:02 -07:00 committed by GitHub
parent fd22b3bcee
commit afe548b61a
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 12 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
files/image_config/procdockerstatsd/procdockerstatsd
View File

@ -69,8 +69,11 @@ class ProcDockerStats(daemon_base.DaemonBase):
UNITS_B = 'B' UNITS_B = 'B'
UNITS_KB = 'KB' UNITS_KB = 'KB'
UNITS_MB = 'MB' UNITS_MB = 'MB'
UNITS_GB = 'GB'
UNITS_GB = 'TB'
UNITS_MiB = 'MiB' UNITS_MiB = 'MiB'
UNITS_GiB = 'GiB' UNITS_GiB = 'GiB'
UNITS_TiB = 'TiB'
res = re.match(r'(\d+\.?\d*)([a-zA-Z]+)', value) res = re.match(r'(\d+\.?\d*)([a-zA-Z]+)', value)
value = float(res.groups()[0]) value = float(res.groups()[0])
@ -79,11 +82,17 @@ class ProcDockerStats(daemon_base.DaemonBase):
if units.lower() == UNITS_KB.lower(): if units.lower() == UNITS_KB.lower():
value *= 1000 value *= 1000
elif units.lower() == UNITS_MB.lower(): elif units.lower() == UNITS_MB.lower():
value *= (1000 * 1000) value *= (1000 ** 2)
elif units.lower() == UNITS_GB.lower():
value *= (1000 ** 3)
elif units.lower() == UNITS_TB.lower():
value *= (1000 ** 4)
elif units.lower() == UNITS_MiB.lower(): elif units.lower() == UNITS_MiB.lower():
value *= (1024 * 1024) value *= (1024 ** 2)
elif units.lower() == UNITS_GiB.lower(): elif units.lower() == UNITS_GiB.lower():
value *= (1024 * 1024 * 1024) value *= (1024 ** 3)
elif units.lower() == UNITS_TiB.lower():
value *= (1024 ** 4)
return int(round(value)) return int(round(value))
@ -204,4 +213,3 @@ def main():
if __name__ == '__main__': if __name__ == '__main__':
main() main()