Migrate image manip fns to image.cc

Author: IsaacKhor

meson.build

@@ -17,7 +17,7 @@ add_project_arguments('-Wno-unused-parameter', language: 'cpp')
 
 if get_option('buildtype') == 'debug'
 	add_project_arguments('-fno-inline', language: 'cpp')
-	add_project_arguments('-DLOGLV=1', language: 'cpp')
+	add_project_arguments('-DLOGLV=0', language: 'cpp')
 endif
 
 subdir('src')

src/image.cc

@@ -563,3 +563,60 @@ request *lsvd_image::flush(std::function<void(int)> cb)
 {
     return new flush_request(this, cb);
 }
+
+int lsvd_image::create_new(std::string name, usize size, rados_ioctx_t io)
+{
+    auto be = make_rados_backend(io);
+    auto parser = object_reader(be);
+
+    uuid_t uuid;
+    uuid_generate_random(uuid);
+
+    vec<byte> buf(4096);
+    vec<seqnum_t> ckpts;
+    vec<clone_base> clones;
+    serialise_superblock(buf, ckpts, clones, uuid, size);
+
+    return be->write(name, buf.data(), buf.size());
+}
+
+int lsvd_image::get_uuid(str name, uuid_t &uuid, rados_ioctx_t io)
+{
+    auto be = make_rados_backend(io);
+    auto parser = object_reader(be);
+    auto osb = parser.read_superblock(name);
+    PR_RET_IF(!osb, -EEXIST, "Could not read superblock '{}'", name);
+
+    uuid_copy(uuid, osb->uuid);
+    return 0;
+}
+
+int lsvd_image::delete_image(std::string name, rados_ioctx_t io)
+{
+    auto be = make_rados_backend(io);
+    auto parser = object_reader(be);
+    auto osb = parser.read_superblock(name);
+    PR_RET_IF(!osb, -EEXIST, "Could not read superblock '{}'", name);
+    auto sb = *osb;
+
+    seqnum_t seq;
+    for (auto ckpt : sb.ckpts) {
+        auto rc = be->delete_obj(oname(name, ckpt));
+        PR_RET_IF(rc < 0, rc, "Failed to delete checkpoint '{}'", ckpt);
+        seq = ckpt;
+    }
+
+    for (int n = 0; n < 16; seq++, n++)
+        if (be->delete_obj(oname(name, seq)) >= 0)
+            n = 0;
+
+    // delete the superblock last so we can recover from partial deletion
+    return be->delete_obj(name);
+}
+
+int lsvd_image::clone_image(std::string oldname, std::string newname,
+                            rados_ioctx_t io)
+{
+    UNIMPLEMENTED();
+    return -1;
+}

src/image.h

@@ -101,8 +101,8 @@ class lsvd_image
 
     // Image management
     // They all return 0 on success, -errno on failure
-    static int create_new(std::string name, rados_ioctx_t io);
-    static int get_uuid(std::string name, rados_ioctx_t io);
+    static int create_new(std::string name, usize size, rados_ioctx_t io);
+    static int get_uuid(std::string name, uuid_t &uuid, rados_ioctx_t io);
     static int delete_image(std::string name, rados_ioctx_t io);
     static int clone_image(std::string oldname, std::string newname,
                            rados_ioctx_t io);

src/liblsvd.cc

@@ -226,27 +226,13 @@ std::pair<std::string, std::string> split_string(std::string s,
 extern "C" int rbd_create(rados_ioctx_t io, const char *name, uint64_t size,
                           int *order)
 {
-    lsvd_config cfg;
-    if (cfg.read() < 0)
-        return -1;
-    auto objstore = make_rados_backend(io);
-    auto rv = translate_create_image(objstore, name, size);
-    return rv;
+    return lsvd_image::create_new(name, size, io);
 }
 
 extern "C" int rbd_clone(rados_ioctx_t io, const char *source_img,
                          const char *dest_img)
 {
-    lsvd_config cfg;
-    if (cfg.read() < 0) {
-        throw std::runtime_error("Failed to read config");
-        return -1;
-    }
-
-    auto objstore = make_rados_backend(io);
-    auto rv = translate_clone_image(objstore, source_img, dest_img);
-
-    return rv;
+    return lsvd_image::clone_image(source_img, dest_img, io);
 }
 
 /* remove all objects and cache file.
@@ -256,20 +242,7 @@ extern "C" int rbd_clone(rados_ioctx_t io, const char *source_img,
  */
 extern "C" int rbd_remove(rados_ioctx_t io, const char *name)
 {
-    lsvd_config cfg;
-    auto rv = cfg.read();
-    if (rv < 0)
-        return rv;
-    auto objstore = make_rados_backend(io);
-    uuid_t uu;
-    if ((rv = translate_get_uuid(objstore, name, uu)) < 0)
-        return rv;
-    auto rcache_file = cfg.cache_filename(uu, name, LSVD_CFG_READ);
-    unlink(rcache_file.c_str());
-    auto wcache_file = cfg.cache_filename(uu, name, LSVD_CFG_WRITE);
-    unlink(wcache_file.c_str());
-    rv = translate_remove_image(objstore, name);
-    return rv;
+    return lsvd_image::delete_image(name, io);
 }
 
 extern "C" void rbd_uuid(rbd_image_t image, uuid_t *uuid)