openstack/python-zunclient
Code Issues Proposed changes

Merge "Compile stats on server side"

Browse Source
This commit is contained in:
Jenkins
2017-05-24 16:21:29 +00:00
committed by Gerrit Code Review
parent 0fe93f33c8 be550862ba
commit 35f2f7b0ff
2 changed files with 4 additions and 64 deletions
Download Patch File Download Diff File Expand all files Collapse all files

34
zunclient/osc/v1/containers.py
View File

@@ -809,35 +809,5 @@ class StatsContainer(command.Command):
def take_action(self, parsed_args):
client = _get_client(self, parsed_args)
container = parsed_args.container
res = client.containers.stats(container)
cpu_usage = res['cpu_stats']['cpu_usage']['total_usage']
system_cpu_usage = res['cpu_stats']['system_cpu_usage']
cpu_percent = float(cpu_usage) / float(system_cpu_usage) * 100
mem_usage = res['memory_stats']['usage'] / 1024 / 1024
mem_limit = res['memory_stats']['limit'] / 1024 / 1024
mem_percent = float(mem_usage) / float(mem_limit) * 100
blk_stats = res['blkio_stats']['io_service_bytes_recursive']
io_read = 0
io_write = 0
for item in blk_stats:
if 'Read' == item['op']:
io_read = io_read + item['value']
if 'Write' == item['op']:
io_write = io_write + item['value']
net_stats = res['networks']
net_rxb = 0
net_txb = 0
for k, v in net_stats.items():
net_rxb = net_rxb + v['rx_bytes']
net_txb = net_txb + v['tx_bytes']
stats = {"CONTAINER": container,
"CPU %": cpu_percent,
"MEM USAGE(MiB)": mem_usage,
"MEM LIMIT(MiB)": mem_limit,
"MEM %": mem_percent,
"BLOCK I/O(B)": str(io_read) + "/" + str(io_write),
"NET I/O(B)": str(net_rxb) + "/" + str(net_txb)}
cliutils.print_dict(stats)
stats_info = client.containers.stats(container)
cliutils.print_dict(stats_info)

34
zunclient/v1/containers_shell.py
View File

@@ -564,35 +564,5 @@ def do_cp(cs, args):
help='ID or name of the container to display stats.')
def do_stats(cs, args):
"""Display stats snapshot of the container."""
res = cs.containers.stats(args.container)
cpu_usage = res['cpu_stats']['cpu_usage']['total_usage']
system_cpu_usage = res['cpu_stats']['system_cpu_usage']
cpu_percent = float(cpu_usage) / float(system_cpu_usage) * 100
mem_usage = res['memory_stats']['usage'] / zun_utils.M
mem_limit = res['memory_stats']['limit'] / zun_utils.M
mem_percent = float(mem_usage) / float(mem_limit) * 100
blk_stats = res['blkio_stats']['io_service_bytes_recursive']
io_read = 0
io_write = 0
for item in blk_stats:
if 'Read' == item['op']:
io_read = io_read + item['value']
if 'Write' == item['op']:
io_write = io_write + item['value']
net_stats = res['networks']
net_rxb = 0
net_txb = 0
for k, v in net_stats.items():
net_rxb = net_rxb + v['rx_bytes']
net_txb = net_txb + v['tx_bytes']
stats = {"CONTAINER": args.container,
"CPU %": cpu_percent,
"MEM USAGE(MiB)": mem_usage,
"MEM LIMIT(MiB)": mem_limit,
"MEM %": mem_percent,
"BLOCK I/O(B)": str(io_read) + "/" + str(io_write),
"NET I/O(B)": str(net_rxb) + "/" + str(net_txb)}
utils.print_dict(stats)
stats_info = cs.containers.stats(args.container)
utils.print_dict(stats_info)