]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph.git/commitdiff
mgr/volumes: fix py2 compat issue 33122/head
authorRamana Raja <rraja@redhat.com>
Tue, 11 Feb 2020 10:49:09 +0000 (05:49 -0500)
committerRamana Raja <rraja@redhat.com>
Wed, 12 Feb 2020 10:12:00 +0000 (05:12 -0500)
Fix the following issue seen while upstream teuthology testing,
 File "/usr/share/ceph/mgr/volumes/fs/operations/versions/subvolume_base.py", line 98, in load_config
   self.metadata_mgr = MetadataManager(self.fs, self.legacy_config_path, 0o640)
 File "/usr/share/ceph/mgr/volumes/fs/operations/versions/subvolume_base.py", line 73, in legacy_config_path
   meta_config = "{0}.meta".format(m.digest().hex())
 AttributeError: 'str' object has no attribute 'hex'

This issue is not observed in master/octopus, as it only supports
py3.

Signed-off-by: Ramana Raja <rraja@redhat.com>
src/pybind/mgr/volumes/fs/operations/versions/subvolume_base.py

index 466db0f6eb9a6d38593079db917e189a85588519..7a3c9ee360307a256835714716cb522d8ee86dda 100644 (file)
@@ -70,7 +70,7 @@ class SubvolumeBase(object):
     def legacy_config_path(self):
         m = md5()
         m.update(self.base_path)
-        meta_config = "{0}.meta".format(m.digest().hex())
+        meta_config = "{0}.meta".format(m.hexdigest())
         return os.path.join(self.legacy_dir, meta_config.encode('utf-8'))
 
     @property