openstack/aodh
Code Issues Proposed changes

Use the module units to refer bytes type

Browse Source 
Change-Id: I7d3e1b93fcbd7d60593d44bb86899fb43dc69003
This commit is contained in:
Shuangtai Tian 2014-02-19 18:46:25 +08:00
parent 4c6941a0ac
commit 8000a62030
3 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
ceilometer/collector.py
View File

@ -26,6 +26,7 @@ from ceilometer.openstack.common import log
from ceilometer.openstack.common.rpc import dispatcher as rpc_dispatcher from ceilometer.openstack.common.rpc import dispatcher as rpc_dispatcher
from ceilometer.openstack.common.rpc import service as rpc_service from ceilometer.openstack.common.rpc import service as rpc_service
from ceilometer.openstack.common import service as os_service from ceilometer.openstack.common import service as os_service
from ceilometer.openstack.common import units
from ceilometer import service from ceilometer import service
OPTS = [ OPTS = [
@ -70,7 +71,7 @@ class CollectorService(service.DispatchedService, rpc_service.Service):
while self.udp_run: while self.udp_run:
# NOTE(jd) Arbitrary limit of 64K because that ought to be # NOTE(jd) Arbitrary limit of 64K because that ought to be
# enough for anybody. # enough for anybody.
data, source = udp.recvfrom(64 * 1024) data, source = udp.recvfrom(64 * units.Ki)
try: try:
sample = msgpack.loads(data) sample = msgpack.loads(data)
except Exception: except Exception:

8
ceilometer/compute/virt/hyperv/inspector.py
View File

@ -21,6 +21,7 @@ from oslo.config import cfg
from ceilometer.compute.virt.hyperv import utilsv2 from ceilometer.compute.virt.hyperv import utilsv2
from ceilometer.compute.virt import inspector as virt_inspector from ceilometer.compute.virt import inspector as virt_inspector
from ceilometer.openstack.common import log from ceilometer.openstack.common import log
from ceilometer.openstack.common import units
CONF = cfg.CONF CONF = cfg.CONF
LOG = log.getLogger(__name__) LOG = log.getLogger(__name__)
@ -46,8 +47,7 @@ class HyperVInspector(virt_inspector.Inspector):
cpu_percent_used = (cpu_clock_used / cpu_percent_used = (cpu_clock_used /
float(host_cpu_clock * cpu_count)) float(host_cpu_clock * cpu_count))
# Nanoseconds # Nanoseconds
cpu_time = (long(uptime * cpu_percent_used) * cpu_time = (long(uptime * cpu_percent_used) * units.k)
1000)
return virt_inspector.CPUStats(number=cpu_count, time=cpu_time) return virt_inspector.CPUStats(number=cpu_count, time=cpu_time)
@ -77,9 +77,9 @@ class HyperVInspector(virt_inspector.Inspector):
stats = virt_inspector.DiskStats( stats = virt_inspector.DiskStats(
read_requests=0, read_requests=0,
# Return bytes # Return bytes
read_bytes=disk_metrics['read_mb'] * 1024, read_bytes=disk_metrics['read_mb'] * units.Ki,
write_requests=0, write_requests=0,
write_bytes=disk_metrics['write_mb'] * 1024, write_bytes=disk_metrics['write_mb'] * units.Ki,
errors=0) errors=0)
yield (disk, stats) yield (disk, stats)

3
ceilometer/utils.py
View File

@ -23,6 +23,7 @@ import datetime
import decimal import decimal
from ceilometer.openstack.common import timeutils from ceilometer.openstack.common import timeutils
from ceilometer.openstack.common import units
def recursive_keypairs(d, separator=':'): def recursive_keypairs(d, separator=':'):
@ -73,7 +74,7 @@ def decimal_to_dt(dec):
return None return None
integer = int(dec) integer = int(dec)
micro = (dec - decimal.Decimal(integer)) * decimal.Decimal(1000000) micro = (dec - decimal.Decimal(integer)) * decimal.Decimal(units.M)
daittyme = datetime.datetime.utcfromtimestamp(integer) daittyme = datetime.datetime.utcfromtimestamp(integer)
return daittyme.replace(microsecond=int(round(micro))) return daittyme.replace(microsecond=int(round(micro)))