From: Mykola Golub <to.my.trociny@gmail.com>
Date: Tue, 5 Dec 2017 13:48:23 +0000 (+0200)
Subject: pybind/rbd: fix metadata functions error handling
X-Git-Tag: v12.2.3~171^2~1
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=2d7bea6148756fd8f3f7e124148d296d4290691f;p=ceph.git

pybind/rbd: fix metadata functions error handling

Fixes: http://tracker.ceph.com/issues/22306
Signed-off-by: Mykola Golub <to.my.trociny@gmail.com>
(cherry picked from commit 2e6872b28eccd10b8bafdadaf3e6049123792022)
---

diff --git a/src/pybind/rbd/rbd.pyx b/src/pybind/rbd/rbd.pyx
index 1d6376b7faf..d422b6076d5 100644
--- a/src/pybind/rbd/rbd.pyx
+++ b/src/pybind/rbd/rbd.pyx
@@ -2684,7 +2684,7 @@ written." % (self.name, ret, length))
                     break
             if ret != 0:
                 raise make_ex(ret, 'error getting metadata %s for image %s' %
-                              (self.key, self.name,))
+                              (key, self.name,))
             return decode_cstr(value)
         finally:
             free(value)
@@ -2708,7 +2708,7 @@ written." % (self.name, ret, length))
 
         if ret != 0:
             raise make_ex(ret, 'error setting metadata %s for image %s' %
-                          (self.key, self.name,))
+                          (key, self.name,))
 
 
     def metadata_remove(self, key):
@@ -2726,7 +2726,7 @@ written." % (self.name, ret, length))
 
         if ret != 0:
             raise make_ex(ret, 'error removing metadata %s for image %s' %
-                          (self.key, self.name,))
+                          (key, self.name,))
 
     def metadata_list(self):
         """