openstack/cinder
Code Issues Proposed changes

Merge "PY3: Ensure rados.Object.read/write use byte data" into stable/rocky

Browse Source
This commit is contained in:
Zuul
2018-10-29 17:34:18 +00:00
committed by Gerrit Code Review
parent 91f00dd8e7 8280fa0df6
commit 43d6c50b73
2 changed files with 13 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
cinder/backup/drivers/ceph.py
View File

@@ -136,7 +136,7 @@ class VolumeMetadataBackup(object):
msg = _("Metadata backup object '%s' already exists") % self.name msg = _("Metadata backup object '%s' already exists") % self.name
raise exception.VolumeMetadataBackupExists(msg) raise exception.VolumeMetadataBackupExists(msg)
meta_obj.write(json_meta) meta_obj.write(json_meta.encode('utf-8'))
def get(self): def get(self):
"""Get metadata backup object. """Get metadata backup object.
@@ -149,7 +149,7 @@ class VolumeMetadataBackup(object):
LOG.debug("Metadata backup object %s does not exist", self.name) LOG.debug("Metadata backup object %s does not exist", self.name)
return None return None
return meta_obj.read() return meta_obj.read().decode('utf-8')
def remove_if_exists(self): def remove_if_exists(self):
meta_obj = eventlet.tpool.Proxy(rados.Object(self._client.ioctx, meta_obj = eventlet.tpool.Proxy(rados.Object(self._client.ioctx,

19
cinder/tests/unit/backup/drivers/test_backup_ceph.py
View File

@@ -1271,7 +1271,7 @@ class BackupCephTestCase(test.TestCase):
glance_tag = driver.BackupMetadataAPI.TYPE_TAG_VOL_GLANCE_META glance_tag = driver.BackupMetadataAPI.TYPE_TAG_VOL_GLANCE_META
return jsonutils.dumps({base_tag: {'image_name': 'image.base'}, return jsonutils.dumps({base_tag: {'image_name': 'image.base'},
glance_tag: {'image_name': 'image.glance'}, glance_tag: {'image_name': 'image.glance'},
'version': version}) 'version': version}).encode('utf-8')
self.mock_rados.Object.return_value.read.side_effect = mock_read self.mock_rados.Object.return_value.read.side_effect = mock_read
@@ -1347,7 +1347,7 @@ class BackupCephTestCase(test.TestCase):
glance_tag = driver.BackupMetadataAPI.TYPE_TAG_VOL_GLANCE_META glance_tag = driver.BackupMetadataAPI.TYPE_TAG_VOL_GLANCE_META
return jsonutils.dumps({base_tag: {'image_name': 'image.base'}, return jsonutils.dumps({base_tag: {'image_name': 'image.base'},
glance_tag: {'image_name': 'image.glance'}, glance_tag: {'image_name': 'image.glance'},
'version': 3}) 'version': 3}).encode('utf-8')
self.mock_rados.Object.return_value.read.side_effect = mock_read self.mock_rados.Object.return_value.read.side_effect = mock_read
with mock.patch.object(ceph.VolumeMetadataBackup, '_exists') as \ with mock.patch.object(ceph.VolumeMetadataBackup, '_exists') as \
@@ -1457,12 +1457,14 @@ class VolumeMetadataBackupTestCase(test.TestCase):
self.mb.get = mock.Mock() self.mb.get = mock.Mock()
self.mb.get.side_effect = mock_read self.mb.get.side_effect = mock_read
serialized_meta_1 = jsonutils.dumps({'foo': 'bar'})
serialized_meta_2 = jsonutils.dumps({'doo': 'dah'})
with mock.patch.object(ceph.VolumeMetadataBackup, 'set') as mock_write: with mock.patch.object(ceph.VolumeMetadataBackup, 'set') as mock_write:
mock_write.side_effect = _mock_write mock_write.side_effect = _mock_write
self.mb.set({'foo': 'bar'}) self.mb.set(serialized_meta_1)
self.assertEqual({'foo': 'bar'}, self.mb.get()) self.assertEqual(serialized_meta_1, self.mb.get())
self.assertTrue(self.mb.get.called) self.assertTrue(self.mb.get.called)
self.mb._exists = mock.Mock() self.mb._exists = mock.Mock()
@@ -1470,15 +1472,15 @@ class VolumeMetadataBackupTestCase(test.TestCase):
# use the unmocked set() method. # use the unmocked set() method.
self.assertRaises(exception.VolumeMetadataBackupExists, self.assertRaises(exception.VolumeMetadataBackupExists,
self.mb.set, {'doo': 'dah'}) self.mb.set, serialized_meta_2)
# check the meta obj state has not changed. # check the meta obj state has not changed.
self.assertEqual({'foo': 'bar'}, self.mb.get()) self.assertEqual(serialized_meta_1, self.mb.get())
self.assertEqual(['write', 'read', 'read'], called) self.assertEqual(['write', 'read', 'read'], called)
self.mb._exists.return_value = False self.mb._exists.return_value = False
self.mb.set({'doo': 'dah'}) self.mb.set(serialized_meta_2)
self.assertNotEqual(thread_dict['thread'], self.assertNotEqual(thread_dict['thread'],
threading.current_thread) threading.current_thread)
@@ -1486,7 +1488,8 @@ class VolumeMetadataBackupTestCase(test.TestCase):
def test_get(self): def test_get(self):
self.mock_rados.Object.return_value.stat.side_effect = ( self.mock_rados.Object.return_value.stat.side_effect = (
self.mock_rados.ObjectNotFound) self.mock_rados.ObjectNotFound)
self.mock_rados.Object.return_value.read.return_value = 'meta' self.mock_rados.Object.return_value.read.return_value = (
'meta'.encode('utf-8'))
self.assertIsNone(self.mb.get()) self.assertIsNone(self.mb.get())
self.mock_rados.Object.return_value.stat.side_effect = None self.mock_rados.Object.return_value.stat.side_effect = None
self.assertEqual('meta', self.mb.get()) self.assertEqual('meta', self.mb.get())