Merge branch 'wip-13504' of https://github.com/trociny/ceph

rbd: API: options on image create

Reviewed-by: Josh Durgin <jdurgin@redhat.com>
Conflicts:
	src/test/librbd/test_librbd.cc (trivial, two tests added at end of file)

diff --cc src/test/librbd/test_librbd.cc
index b53531f0c9ed6ec447b044aa446766feb1a7eafe,c5b6c0b2ddcb7087a0c6699704728fbe2be4f792..74f2c07aa8b4663446b37ea7ea2fc57309ba4dae
--- 1/src/test/librbd/test_librbd.cc
--- 2/src/test/librbd/test_librbd.cc
+++ b/src/test/librbd/test_librbd.cc
@@@ -3313,33 -3307,126 +3313,157 @@@ TEST_F(TestLibRBD, CacheMayCopyOnWrite
    ASSERT_TRUE(expect_bl.contents_equal(read_bl));
  }
  
 +TEST_F(TestLibRBD, FlushEmptyOpsOnExternalSnapshot) {
 +  std::string cache_enabled;
 +  ASSERT_EQ(0, _rados.conf_get("rbd_cache", cache_enabled));
 +  ASSERT_EQ(0, _rados.conf_set("rbd_cache", "false"));
 +  BOOST_SCOPE_EXIT( (cache_enabled) ) {
 +    ASSERT_EQ(0, _rados.conf_set("rbd_cache", cache_enabled.c_str()));
 +  } BOOST_SCOPE_EXIT_END;
 +
 +  librados::IoCtx ioctx;
 +  ASSERT_EQ(0, _rados.ioctx_create(m_pool_name.c_str(), ioctx));
 +
 +  librbd::RBD rbd;
 +  std::string name = get_temp_image_name();
 +  uint64_t size = 1 << 18;
 +  int order = 0;
 +  ASSERT_EQ(0, create_image_pp(rbd, ioctx, name.c_str(), size, &order));
 +
 +  librbd::Image image1;
 +  librbd::Image image2;
 +  ASSERT_EQ(0, rbd.open(ioctx, image1, name.c_str(), NULL));
 +  ASSERT_EQ(0, rbd.open(ioctx, image2, name.c_str(), NULL));
 +  ASSERT_EQ(0, image1.snap_create("snap1"));
 +
 +  librbd::RBD::AioCompletion *read_comp =
 +    new librbd::RBD::AioCompletion(NULL, NULL);
 +  bufferlist read_bl;
 +  image2.aio_read(0, 1024, read_bl, read_comp);
 +  ASSERT_EQ(0, read_comp->wait_for_complete());
 +  read_comp->release();
 +}
++
+ TEST_F(TestLibRBD, TestImageOptions)
+ {
+   rados_ioctx_t ioctx;
+   rados_ioctx_create(_cluster, m_pool_name.c_str(), &ioctx);
+ 
+   //make create image options
+   uint64_t features = RBD_FEATURE_LAYERING | RBD_FEATURE_STRIPINGV2 ;
+   uint64_t order = 0;
+   uint64_t stripe_unit = 65536;
+   uint64_t stripe_count = 16;
+   rbd_image_options_t opts;
+   rbd_image_options_create(&opts);
+   ASSERT_EQ(0, rbd_image_options_set_uint64(opts, RBD_IMAGE_OPTION_FORMAT,
+         2));
+   ASSERT_EQ(0, rbd_image_options_set_uint64(opts, RBD_IMAGE_OPTION_FEATURES,
+         features));
+   ASSERT_EQ(0, rbd_image_options_set_uint64(opts, RBD_IMAGE_OPTION_ORDER,
+         order));
+   ASSERT_EQ(0, rbd_image_options_set_uint64(opts, RBD_IMAGE_OPTION_STRIPE_UNIT,
+         stripe_unit));
+   ASSERT_EQ(0, rbd_image_options_set_uint64(opts, RBD_IMAGE_OPTION_STRIPE_COUNT,
+         stripe_count));
+ 
+   std::string parent_name = get_temp_image_name();
+ 
+   // make parent
+   ASSERT_EQ(0, rbd_create4(ioctx, parent_name.c_str(), 4<<20, opts));
+ 
+   // check order is returned in opts
+   ASSERT_EQ(0, rbd_image_options_get_uint64(opts, RBD_IMAGE_OPTION_ORDER,
+         &order));
+   ASSERT_NE((uint64_t)0, order);
+ 
+   // write some data to parent
+   rbd_image_t parent;
+   ASSERT_EQ(0, rbd_open(ioctx, parent_name.c_str(), &parent, NULL));
+   char *data = (char *)"testdata";
+   ASSERT_EQ((ssize_t)strlen(data), rbd_write(parent, 0, strlen(data), data));
+   ASSERT_EQ((ssize_t)strlen(data), rbd_write(parent, 12, strlen(data), data));
+ 
+   // create a snapshot, reopen as the parent we're interested in
+   ASSERT_EQ(0, rbd_snap_create(parent, "parent_snap"));
+   ASSERT_EQ(0, rbd_close(parent));
+   ASSERT_EQ(0, rbd_open(ioctx, parent_name.c_str(), &parent, "parent_snap"));
+ 
+   // clone
+   std::string child_name = get_temp_image_name();
+   ASSERT_EQ(0, rbd_snap_protect(parent, "parent_snap"));
+   ASSERT_EQ(0, rbd_clone3(ioctx, parent_name.c_str(), "parent_snap", ioctx,
+         child_name.c_str(), opts));
+ 
+   // copy
+   std::string copy1_name = get_temp_image_name();
+   ASSERT_EQ(0, rbd_copy3(parent, ioctx, copy1_name.c_str(), opts));
+   std::string copy2_name = get_temp_image_name();
+   ASSERT_EQ(0, rbd_copy_with_progress3(parent, ioctx, copy2_name.c_str(), opts,
+         print_progress_percent, NULL));
+ 
+   ASSERT_EQ(0, rbd_close(parent));
+ 
+   rbd_image_options_destroy(opts);
+ 
+   rados_ioctx_destroy(ioctx);
+ }
+ 
+ TEST_F(TestLibRBD, TestImageOptionsPP)
+ {
+   librados::IoCtx ioctx;
+   ASSERT_EQ(0, _rados.ioctx_create(m_pool_name.c_str(), ioctx));
+ 
+   //make create image options
+   uint64_t features = RBD_FEATURE_LAYERING | RBD_FEATURE_STRIPINGV2 ;
+   uint64_t order = 0;
+   uint64_t stripe_unit = 65536;
+   uint64_t stripe_count = 16;
+   librbd::ImageOptions opts;
+   ASSERT_EQ(0, opts.set(RBD_IMAGE_OPTION_FORMAT, static_cast<uint64_t>(2)));
+   ASSERT_EQ(0, opts.set(RBD_IMAGE_OPTION_FEATURES, features));
+   ASSERT_EQ(0, opts.set(RBD_IMAGE_OPTION_ORDER, order));
+   ASSERT_EQ(0, opts.set(RBD_IMAGE_OPTION_STRIPE_UNIT, stripe_unit));
+   ASSERT_EQ(0, opts.set(RBD_IMAGE_OPTION_STRIPE_COUNT, stripe_count));
+ 
+   librbd::RBD rbd;
+   std::string parent_name = get_temp_image_name();
+ 
+   // make parent
+   ASSERT_EQ(0, rbd.create4(ioctx, parent_name.c_str(), 4<<20, opts));
+ 
+   // check order is returned in opts
+   ASSERT_EQ(0, opts.get(RBD_IMAGE_OPTION_ORDER, &order));
+   ASSERT_NE((uint64_t)0, order);
+ 
+   // write some data to parent
+   librbd::Image parent;
+   ASSERT_EQ(0, rbd.open(ioctx, parent, parent_name.c_str(), NULL));
+ 
+   ssize_t len = 1024;
+   bufferlist bl;
+   bl.append(buffer::create(len));
+   bl.zero();
+   ASSERT_EQ(len, parent.write(0, len, bl));
+   ASSERT_EQ(len, parent.write(len, len, bl));
+ 
+   // create a snapshot, reopen as the parent we're interested in
+   ASSERT_EQ(0, parent.snap_create("parent_snap"));
+   ASSERT_EQ(0, parent.close());
+   ASSERT_EQ(0, rbd.open(ioctx, parent, parent_name.c_str(), "parent_snap"));
+ 
+   // clone
+   std::string child_name = get_temp_image_name();
+   ASSERT_EQ(0, parent.snap_protect("parent_snap"));
+   ASSERT_EQ(0, rbd.clone3(ioctx, parent_name.c_str(), "parent_snap", ioctx,
+         child_name.c_str(), opts));
+ 
+   // copy
+   std::string copy1_name = get_temp_image_name();
+   ASSERT_EQ(0, parent.copy3(ioctx, copy1_name.c_str(), opts));
+   std::string copy2_name = get_temp_image_name();
+   PrintProgress pp;
+   ASSERT_EQ(0, parent.copy_with_progress3(ioctx, copy2_name.c_str(), opts, pp));
+ 
+   ASSERT_EQ(0, parent.close());
+ }