From: Matt Benjamin <mbenjamin@redhat.com>
Date: Wed, 6 Jan 2016 15:24:23 +0000 (-0500)
Subject: librgw: split nfsns bucket and object create blocks
X-Git-Tag: v10.1.0~382^2~63
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=603f245ea3ab06dc1ca6df79f27d152cbaa4a684;p=ceph.git

librgw: split nfsns bucket and object create blocks

Helps to see the respective timings.

Signed-off-by: Matt Benjamin <mbenjamin@redhat.com>
---

diff --git a/src/test/librgw_file_nfsns.cc b/src/test/librgw_file_nfsns.cc
index 24b9582d78627..7d6dbb3b7054a 100644
--- a/src/test/librgw_file_nfsns.cc
+++ b/src/test/librgw_file_nfsns.cc
@@ -205,7 +205,7 @@ TEST(LibRGW, ENUMERATE1) {
   }
 }
 
-TEST(LibRGW, MARKER1_SETUP)
+TEST(LibRGW, MARKER1_SETUP_BUCKET)
 {
   /* "large" directory enumeration test.  this one deals only with
    * file objects */
@@ -220,6 +220,17 @@ TEST(LibRGW, MARKER1_SETUP)
 
     ret = rgw_mkdir(fs, bucket_fh, marker_dir.c_str(), 755, &st, &marker_fh);
     ASSERT_EQ(ret, 0);
+  }
+}
+
+TEST(LibRGW, MARKER1_SETUP_OBJECTS)
+{
+  /* "large" directory enumeration test.  this one deals only with
+   * file objects */
+
+  if (do_marker1) {
+    struct stat st;
+    int ret;
 
     for (int ix = 0; ix < marker_nobjs; ++ix) {
       std::string object_name("f_");