objectstore: remove _fake_writes, _get_frag_stat

Also only implemented by ebofs.

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

diff --git a/src/os/ObjectStore.h b/src/os/ObjectStore.h
index 045075a442a94f9575e41d9e516d8b8897035146..18a38f2097961082dd7bfa491a193218f89bed84 100644 (file)
--- a/src/os/ObjectStore.h
+++ b/src/os/ObjectStore.h
@@ -79,25 +79,6 @@ public:
 
   Logger *logger;
 
-  class FragmentationStat {
-  public:
-    int total;
-    int num_extent;
-    int avg_extent;
-    map<int,int> extent_dist;          // powers of two
-    map<int,int> extent_dist_sum;          // powers of two
-
-    float avg_extent_per_object;
-    int avg_extent_jump;  // avg distance bweteen consecutive extents
-
-    int total_free;
-    int num_free_extent;
-    int avg_free_extent;
-    map<int,int> free_extent_dist;     // powers of two
-    map<int,int> free_extent_dist_sum;     // powers of two
-  };
-  
-
   struct Sequencer_impl {
     virtual void flush() = 0;
     virtual ~Sequencer_impl() {}
@@ -736,9 +717,6 @@ public:
 
   virtual int snapshot(const string& name) { return -EOPNOTSUPP; }
     
-  virtual void _fake_writes(bool b) {};
-  virtual void _get_frag_stat(FragmentationStat& st) {};
-
   virtual uuid_d get_fsid() = 0;
 };
 

diff --git a/src/osd/Ager.cc b/src/osd/Ager.cc
index fbd44ff3284ddd689a4f633f4fcc5c5cfc3dcc06..a90b1c1855d15217bcebaacef7660311f258a863 100644 (file)
--- a/src/osd/Ager.cc
+++ b/src/osd/Ager.cc
@@ -164,30 +164,7 @@ void Ager::age_empty(float pc) {
   }
 }
 
-void pfrag(uint64_t written, ObjectStore::FragmentationStat &st)
-{
-  cout << "#gb wr\ttotal\tn x\tavg x\tavg per\tavg j\tfree\tn fr\tavg fr\tnum<2\tsum<2\tnum<4\tsum<4\t..." 
-       << std::endl;
-  cout << written
-       << "\t" << st.total
-       << "\t" << st.num_extent
-       << "\t" << st.avg_extent
-       << "\t" << st.avg_extent_per_object
-       << "\t" << st.avg_extent_jump 
-       << "\t" << st.total_free
-       << "\t" << st.num_free_extent
-       << "\t" << st.avg_free_extent;
-    
-  int n = st.num_extent;
-  for (uint64_t i=1; i <= 30; i += 1) {
-    cout << "\t" << st.extent_dist[i];
-    cout << "\t" << st.extent_dist_sum[i];
-    //cout << "\ta " << (st.extent_dist[i] ? (st.extent_dist_sum[i] / st.extent_dist[i]):0);
-    n -= st.extent_dist[i];
-    if (n == 0) break;
-  }
-  cout << std::endl;
-}
+
 
 
 void Ager::age(int time,
@@ -197,7 +174,6 @@ void Ager::age(int time,
                float final_water,   // and end here ( <= low_water)
                int fake_size_mb) { 
 
-  store->_fake_writes(true);
   srand(0);
 
   utime_t start = ceph_clock_now(g_ceph_context);
@@ -244,8 +220,6 @@ void Ager::age(int time,
   for (int i=0; i<10; i++)
     age_objects[i].clear();
   
-  ObjectStore::FragmentationStat st;
-
   uint64_t wrote = 0;
 
   for (int c=1; c<=count; c++) {
@@ -273,9 +247,9 @@ void Ager::age(int time,
     //store->sync();
 
     // show frag state
-    store->_get_frag_stat(st);
+    /*store->_get_frag_stat(st);
     pfrag(wrote / (1024ULL*1024ULL) ,  // GB
-          st);
+    st);*/
 
     // dump freelist?
     /*
@@ -292,7 +266,6 @@ void Ager::age(int time,
   exit(0);   // hack
 
   // ok!
-  store->_fake_writes(false);
   store->sync();
   store->sync();
   generic_dout(1) << "age finished" << dendl;