Merge remote-tracking branch 'origin/jewel'

mathslinux · Dec 24, 2015 · c485d29 · c485d29
2 parents f8c4d04 + a297608
commit c485d29
Show file tree

Hide file tree

Showing 5 changed files with 8 additions and 3 deletions.
diff --git a/src/librbd/ImageCtx.cc b/src/librbd/ImageCtx.cc
@@ -213,6 +213,8 @@ struct C_InvalidateCache : public Context {
     }
     delete[] format_string;
 
+    md_ctx.aio_flush();
+    data_ctx.aio_flush();
     op_work_queue->drain();
     aio_work_queue->drain();
 

diff --git a/src/librbd/image/RefreshRequest.cc b/src/librbd/image/RefreshRequest.cc
@@ -275,6 +275,7 @@ Context *RefreshRequest<I>::handle_v2_get_flags(int *result) {
   }
   if (*result == -EOPNOTSUPP) {
     // Older OSD doesn't support RBD flags, need to assume the worst
+    *result = 0;
     ldout(cct, 10) << "OSD does not support RBD flags, disabling object map "
                    << "optimizations" << dendl;
     m_flags = RBD_FLAG_OBJECT_MAP_INVALID;

diff --git a/src/librbd/internal.cc b/src/librbd/internal.cc
@@ -840,7 +840,7 @@ int validate_pool(IoCtx &io_ctx, CephContext *cct) {
                                            snap_name),
                                boost::bind(&ImageWatcher::notify_snap_remove,
                                            ictx->image_watcher, snap_name));
-      if (r < 0 && r != -EEXIST) {
+      if (r < 0 && r != -ENOENT) {
         return r;
       }
     } else {

diff --git a/src/librbd/operation/SnapshotRemoveRequest.cc b/src/librbd/operation/SnapshotRemoveRequest.cc
@@ -196,8 +196,8 @@ void SnapshotRemoveRequest<I>::send_release_snap_id() {
   m_state = STATE_RELEASE_SNAP_ID;
 
   // TODO add async version of selfmanaged_snap_remove
-  image_ctx.md_ctx.selfmanaged_snap_remove(m_snap_id);
-  this->async_complete(0);
+  int r = image_ctx.md_ctx.selfmanaged_snap_remove(m_snap_id);
+  this->async_complete(r);
 }
 
 template <typename I>

diff --git a/src/test/librbd/mock/MockImageCtx.h b/src/test/librbd/mock/MockImageCtx.h
@@ -57,6 +57,8 @@ struct MockImageCtx {
 
   ~MockImageCtx() {
     wait_for_async_requests();
+    image_ctx->md_ctx.aio_flush();
+    image_ctx->data_ctx.aio_flush();
     image_ctx->op_work_queue->drain();
     delete image_watcher;
     delete op_work_queue;