RepoMirrors/ceph
1
0
Fork 0
mirror of https://github.com/ceph/ceph synced 2025-04-04 15:36:24 +00:00
Code Issues Packages Projects Releases Wiki Activity

pybind/rbd: always parse timestamps in UTC

Browse Source 
Fixes: http://tracker.ceph.com/issues/23609

Signed-off-by: Ricardo Dias <rdias@suse.com>
This commit is contained in:
Ricardo Dias 2018-03-27 15:05:01 +01:00
parent e127ec64b4
commit 08cee16d0a
No known key found for this signature in database
GPG Key ID: 74390C579BD37B68
1 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/pybind/rbd/rbd.pyx
View File

@ -1141,8 +1141,8 @@ class RBD(object):
'id' : decode_cstr(c_info.id), 'id' : decode_cstr(c_info.id),
'name' : decode_cstr(c_info.name), 'name' : decode_cstr(c_info.name),
'source' : __source_string[c_info.source], 'source' : __source_string[c_info.source],
'deletion_time' : datetime.fromtimestamp(c_info.deletion_time), 'deletion_time' : datetime.utcfromtimestamp(c_info.deletion_time),
'deferment_end_time' : datetime.fromtimestamp(c_info.deferment_end_time) 'deferment_end_time' : datetime.utcfromtimestamp(c_info.deferment_end_time)
} }
rbd_trash_get_cleanup(&c_info) rbd_trash_get_cleanup(&c_info)
return info return info
@ -1548,7 +1548,7 @@ cdef class MirrorImageStatusIterator(object):
}, },
'state' : self.images[i].state, 'state' : self.images[i].state,
'description' : decode_cstr(self.images[i].description), 'description' : decode_cstr(self.images[i].description),
'last_update' : datetime.fromtimestamp(self.images[i].last_update), 'last_update' : datetime.utcfromtimestamp(self.images[i].last_update),
'up' : self.images[i].up, 'up' : self.images[i].up,
} }
if self.size < self.max_read: if self.size < self.max_read:
@ -2499,7 +2499,7 @@ cdef class Image(object):
ret = rbd_snap_get_timestamp(self.image, _snap_id, &timestamp) ret = rbd_snap_get_timestamp(self.image, _snap_id, &timestamp)
if ret != 0: if ret != 0:
raise make_ex(ret, 'error getting snapshot timestamp for image: %s, snap_id: %d' % (self.name, snap_id)) raise make_ex(ret, 'error getting snapshot timestamp for image: %s, snap_id: %d' % (self.name, snap_id))
return datetime.fromtimestamp(timestamp.tv_sec) return datetime.utcfromtimestamp(timestamp.tv_sec)
def remove_snap_limit(self): def remove_snap_limit(self):
""" """
@ -2745,7 +2745,7 @@ written." % (self.name, ret, length))
ret = rbd_get_create_timestamp(self.image, &timestamp) ret = rbd_get_create_timestamp(self.image, &timestamp)
if ret != 0: if ret != 0:
raise make_ex(ret, 'error getting create timestamp for image: %s' % (self.name)) raise make_ex(ret, 'error getting create timestamp for image: %s' % (self.name))
return datetime.fromtimestamp(timestamp.tv_sec) return datetime.utcfromtimestamp(timestamp.tv_sec)
def flatten(self): def flatten(self):
""" """
@ -3081,7 +3081,7 @@ written." % (self.name, ret, length))
}, },
'state' : c_status.state, 'state' : c_status.state,
'description' : decode_cstr(c_status.description), 'description' : decode_cstr(c_status.description),
'last_update' : datetime.fromtimestamp(c_status.last_update), 'last_update' : datetime.utcfromtimestamp(c_status.last_update),
'up' : c_status.up, 'up' : c_status.up,
} }
free(c_status.name) free(c_status.name)
@ -3572,8 +3572,8 @@ cdef class TrashIterator(object):
'id' : decode_cstr(self.entries[i].id), 'id' : decode_cstr(self.entries[i].id),
'name' : decode_cstr(self.entries[i].name), 'name' : decode_cstr(self.entries[i].name),
'source' : TrashIterator.__source_string[self.entries[i].source], 'source' : TrashIterator.__source_string[self.entries[i].source],
'deletion_time' : datetime.fromtimestamp(self.entries[i].deletion_time), 'deletion_time' : datetime.utcfromtimestamp(self.entries[i].deletion_time),
'deferment_end_time' : datetime.fromtimestamp(self.entries[i].deferment_end_time) 'deferment_end_time' : datetime.utcfromtimestamp(self.entries[i].deferment_end_time)
} }
def __dealloc__(self): def __dealloc__(self):