]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph.git/commitdiff
rbd: comment/msg cleanup 19280/head
authorsongweibin <song.weibin@zte.com.cn>
Tue, 5 Dec 2017 04:14:21 +0000 (12:14 +0800)
committersongweibin <song.weibin@zte.com.cn>
Tue, 5 Dec 2017 08:42:32 +0000 (16:42 +0800)
Signed-off-by: songweibin <song.weibin@zte.com.cn>
src/cls/journal/cls_journal.cc
src/pybind/rbd/rbd.pyx

index c0bd76138678e00e2d79cd7c7383bb7846610518..673bc04228b15d366fdab8b91f3c0bc31472a97b 100644 (file)
@@ -388,7 +388,7 @@ int journal_get_order(cls_method_context_t hctx, bufferlist *in,
  * none
  *
  * Output:
- * order (uint8_t)
+ * splay_width (uint8_t)
  * @returns 0 on success, negative error code on failure
  */
 int journal_get_splay_width(cls_method_context_t hctx, bufferlist *in,
index 949504a34d2bcfa8ff57f100dfeae28379215980..a15e47b70c7d13892b38aac05aa56bd67b9faf8b 100644 (file)
@@ -980,7 +980,7 @@ class RBD(object):
         with nogil:
             ret = rbd_trash_get(_ioctx, _image_id, &c_info)
         if ret != 0:
-            raise make_ex(ret, 'error restoring image from trash')
+            raise make_ex(ret, 'error retrieving image from trash')
 
         __source_string = ['USER', 'MIRRORING']
         info = {