From: Sage Weil <sage@redhat.com>
Date: Sat, 3 Feb 2018 15:21:09 +0000 (-0600)
Subject: ceph_test_filestore_idempotent_sequence: fix do_coll_create
X-Git-Tag: v13.0.2~338^2~8
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=db3004e1f47abb71903f8b91ed96371a3bde8dae;p=ceph.git

ceph_test_filestore_idempotent_sequence: fix do_coll_create

The old code made no sense whatsoever!

- create one colletion, not a zillion
- inform the model in the parent class

Signed-off-by: Sage Weil <sage@redhat.com>
---

diff --git a/src/test/objectstore/DeterministicOpSequence.cc b/src/test/objectstore/DeterministicOpSequence.cc
index e25003f61a3a..c7194443f939 100644
--- a/src/test/objectstore/DeterministicOpSequence.cc
+++ b/src/test/objectstore/DeterministicOpSequence.cc
@@ -420,26 +420,13 @@ bool DeterministicOpSequence::do_coll_move(rngen_t& gen)
 
 bool DeterministicOpSequence::do_coll_create(rngen_t& gen)
 {
-  boost::uniform_int<> pg_num_range(0, 512);
-  int pg_num = pg_num_range(gen);
-
-  // Assume there is 7 OSDs in total, the PGs are evenly distributed across those OSDs
-  int pgs = pg_num / 7;
-
-  boost::uniform_int<> num_objs_range(1, 1024);
-  int num_objs = num_objs_range(gen);
-
-  int pool_id = get_next_pool_id();
-  std::set<int> pg_created;
-  for (int i = 0; i < pgs; i++) {
-    boost::uniform_int<> pg_range(0, pg_num - 1);
-    int pg_id = pg_range(gen);
-    if (pg_created.count(pg_id) > 0)
-      continue;
-    _do_coll_create(coll_t(spg_t(pg_t(pg_id,pool_id),shard_id_t::NO_SHARD)),
-		    (uint32_t) pg_num, (uint64_t) num_objs);
-    pg_created.insert(pg_id);
-  }
+  int i = m_collections.size();
+  coll_entry_t *entry = coll_create(i);
+  m_collections.insert(make_pair(i, entry));
+  m_collections_ids.push_back(i);
+
+  _do_coll_create(entry->m_coll, 10, 10);
+  
   return true;
 }