Merge "Fix python3 compatibility of rbd get_fsid" into stable/rockyrocky-em0.26.2stable/rocky

1 files changed, 13 insertions, 1 deletions

diff --git a/glance_store/_drivers/rbd.py b/glance_store/_drivers/rbd.py
index 74e929b..9d48661 100644
--- a/glance_store/_drivers/rbd.py
+++ b/glance_store/_drivers/rbd.py
@@ -24,6 +24,7 @@ import logging
 import math
 
 from oslo_config import cfg
+from oslo_utils import encodeutils
 from oslo_utils import units
 from six.moves import urllib
 
@@ -469,7 +470,18 @@ class Store(driver.Store):
                                  rados_id=self.user) as conn:
             fsid = None
             if hasattr(conn, 'get_fsid'):
-                fsid = conn.get_fsid()
+                # Librados's get_fsid is represented as binary
+                # in py3 instead of str as it is in py2.
+                # This is causing problems with ceph.
+                # Decode binary to str fixes these issues.
+                # Fix with encodeutils.safe_decode CAN BE REMOVED
+                # after librados's fix will be stable.
+                #
+                # More informations:
+                # https://bugs.launchpad.net/glance-store/+bug/1816721
+                # https://bugs.launchpad.net/cinder/+bug/1816468
+                # https://tracker.ceph.com/issues/38381
+                fsid = encodeutils.safe_decode(conn.get_fsid())
             with conn.open_ioctx(self.pool) as ioctx:
                 order = int(math.log(self.WRITE_CHUNKSIZE, 2))
                 LOG.debug('creating image %s with order %d and size %d',