From: Sage Weil <sage@redhat.com>
Date: Tue, 29 Jul 2014 18:16:24 +0000 (-0700)
Subject: Merge remote-tracking branch 'gh/next'
X-Git-Tag: v0.84~45
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=9461d8e6ad01538950f837d83ce14a4ea47c129e;p=ceph.git

Merge remote-tracking branch 'gh/next'
---

9461d8e6ad01538950f837d83ce14a4ea47c129e
diff --cc src/test/librados/tier.cc
index 897eef9e294c,c740961e1deb..953a765c0082
--- a/src/test/librados/tier.cc
+++ b/src/test/librados/tier.cc
@@@ -2064,13 -2045,15 +2064,15 @@@ TEST_F(LibRadosTwoPoolsPP, HitSetWrite
    // wait for maps to settle
    cluster.wait_for_latest_osdmap();
  
 -  ioctx.set_namespace("");
 +  cache_ioctx.set_namespace("");
  
+   int num = 200;
+ 
    // do a bunch of writes
-   for (int i=0; i<1000; ++i) {
+   for (int i=0; i<num; ++i) {
      bufferlist bl;
      bl.append("a");
 -    ASSERT_EQ(0, ioctx.write(stringify(i), bl, 1, 0));
 +    ASSERT_EQ(0, cache_ioctx.write(stringify(i), bl, 1, 0));
    }
  
    // get HitSets
@@@ -2100,14 -2083,14 +2102,14 @@@
  
      // cope with racing splits by refreshing pg_num
      if (i == num_pg - 1)
 -      num_pg = _get_pg_num(cluster, pool_name);
 +      num_pg = _get_pg_num(cluster, cache_pool_name);
    }
  
-   for (int i=0; i<1000; ++i) {
+   for (int i=0; i<num; ++i) {
      string n = stringify(i);
 -    uint32_t hash = ioctx.get_object_hash_position(n);
 +    uint32_t hash = cache_ioctx.get_object_hash_position(n);
      hobject_t oid(sobject_t(n, CEPH_NOSNAP), "", hash,
 -		  cluster.pool_lookup(pool_name.c_str()), "");
 +		  cluster.pool_lookup(cache_pool_name.c_str()), "");
      std::cout << "checking for " << oid << std::endl;
      bool found = false;
      for (int p=0; p<num_pg; ++p) {