RepoMirrors/ceph
1
0
Fork 0
mirror of https://github.com/ceph/ceph synced 2025-01-19 01:21:49 +00:00
Code Issues Packages Projects Releases Wiki Activity

mgr: replace iteritems with six.iteritems (crash)

Browse Source 
Fixes: http://tracker.ceph.com/issues/24779
Signed-off-by: Nathan Cutler <ncutler@suse.com>
This commit is contained in:
Nathan Cutler 2018-07-05 17:33:45 +02:00
parent ab001e1342
commit 9aa1d49583
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/pybind/mgr/crash/module.py
View File

@ -2,6 +2,7 @@ from mgr_module import MgrModule
import datetime
import errno
import json
import six
DATEFMT = '%Y-%m-%d %H:%M:%S.%f'
@ -82,7 +83,7 @@ class Module(MgrModule):
keeptime = datetime.timedelta(days=keep)
for key, meta in self.get_store_prefix('crash/').iteritems():
for key, meta in six.iteritems(self.get_store_prefix('crash/')):
meta = json.loads(meta)
stamp = self.time_from_string(meta['timestamp'])
if stamp <= now - keeptime:
@ -116,7 +117,7 @@ class Module(MgrModule):
'idlist': list()
}
for key, meta in self.get_store_prefix('crash/').iteritems():
for key, meta in six.iteritems(self.get_store_prefix('crash/')):
total += 1
meta = json.loads(meta)
stamp = self.time_from_string(meta['timestamp'])