Comment 2 for bug 1388181

Revision history for this message
OpenStack Infra (hudson-openstack) wrote : Fix merged to ceilometer (master)

Reviewed: https://review.openstack.org/132387
Committed: https://git.openstack.org/cgit/openstack/ceilometer/commit/?id=fa982d1bf5fe6c9657fe4a2c5eb48c65bdac26da
Submitter: Jenkins
Branch: master

commit fa982d1bf5fe6c9657fe4a2c5eb48c65bdac26da
Author: ZhiQiang Fan <email address hidden>
Date: Sat Nov 1 14:40:43 2014 +0800

    Fix storage.hbase.util.prepare_key() for 32-bits system

    storage.hbase.utils.timestamp() will return long type object on 32-bits
    system, which will cause exception in ceilometer/alarm/storage/impl_hbase.py:
    'long' object has no attribute 'encode'.
    Then developers on 32-bits system will never get local test passed.

    This patch changes type check in prepare_keys() from int to six.integer_types,
    which will work for both 32-bits and 64-bits system, python2 and python3
    environment.

    Note: no test code is added, because jenkins runs on 64-bits system. Reviewers
    can download code and verify it on 32-bits system.

    Change-Id: I57729ff67efe6d6036fe698e3d86491f9ed4600c
    Closes-Bug: #1388181