librbd: add preliminary methods for rebuilding object map

Signed-off-by: Jason Dillaman <dillaman@redhat.com>

diff --git a/src/librbd/internal.cc b/src/librbd/internal.cc
index 9ef8c972c6d6de004c5ff37bd164448e46d890dc..900c06ffcdde59e28fa7f29a74ae25554fdc80d2 100644 (file)
--- a/src/librbd/internal.cc
+++ b/src/librbd/internal.cc
@@ -2703,6 +2703,69 @@ reprotect_and_return_err:
     return 0;
   }
 
+  int rebuild_object_map(ImageCtx *ictx, ProgressContext &prog_ctx) {
+    CephContext *cct = ictx->cct;
+    ldout(cct, 10) << "rebuild_object_map" << dendl;
+
+    int r = ictx_check(ictx);
+    if (r < 0) {
+      return r;
+    }
+
+    {
+      RWLock::RLocker snap_locker(ictx->snap_lock);
+      if (ictx->read_only || ictx->snap_id != CEPH_NOSNAP) {
+        return -EROFS;
+      }
+    }
+
+    uint64_t request_id = ictx->async_request_seq.inc();
+    do {
+      C_SaferCond ctx;
+      {
+        RWLock::RLocker l(ictx->owner_lock);
+        while (ictx->image_watcher->is_lock_supported()) {
+          r = prepare_image_update(ictx);
+          if (r < 0) {
+            return -EROFS;
+          } else if (ictx->image_watcher->is_lock_owner()) {
+           break;
+         }
+
+          r = ictx->image_watcher->notify_rebuild_object_map(request_id,
+                                                             prog_ctx);
+          if (r != -ETIMEDOUT && r != -ERESTART) {
+            return r;
+          }
+          ldout(ictx->cct, 5) << "rebuild object map timed out notifying lock "
+                              << "owner" << dendl;
+        }
+
+        r = async_rebuild_object_map(ictx, &ctx, prog_ctx);
+        if (r < 0) {
+         return r;
+        }
+      }
+
+      r = ctx.wait();
+      if (r == -ERESTART) {
+       ldout(ictx->cct, 5) << "rebuild object map interrupted: restarting"
+                            << dendl;
+      }
+    } while (r == -ERESTART);
+
+    // TODO rebuild snapshots
+
+    ldout(cct, 10) << "rebuild object map finished" << dendl;
+    return r;
+  }
+
+  int async_rebuild_object_map(ImageCtx *ictx, Context *ctx,
+                               ProgressContext &prog_ctx) {
+    // TODO rebuild image HEAD
+    return 0;
+  }
+
   int list_lockers(ImageCtx *ictx,
                   std::list<locker_t> *lockers,
                   bool *exclusive,

diff --git a/src/librbd/internal.h b/src/librbd/internal.h
index aa472a98af3ecf40c6375603525ba4d6989e921b..33107313f1d372623fb503e955265263dc196d9b 100644 (file)
--- a/src/librbd/internal.h
+++ b/src/librbd/internal.h
@@ -137,6 +137,8 @@ namespace librbd {
                   const char *buf);
   int flatten(ImageCtx *ictx, ProgressContext &prog_ctx);
 
+  int rebuild_object_map(ImageCtx *ictx, ProgressContext &prog_ctx);
+
   /* cooperative locking */
   int list_lockers(ImageCtx *ictx,
                   std::list<locker_t> *locks,
@@ -196,6 +198,8 @@ namespace librbd {
                   ProgressContext &prog_ctx);
   void async_resize_helper(ImageCtx *ictx, Context *ctx, uint64_t new_size,
                            ProgressContext& prog_ctx);
+  int async_rebuild_object_map(ImageCtx *ictx, Context *ctx,
+                               ProgressContext &prog_ctx);
 
   int aio_write(ImageCtx *ictx, uint64_t off, size_t len, const char *buf,
                AioCompletion *c, int op_flags);