os, osd: drop the dummy FileStore converter

Signed-off-by: Radoslaw Zarzynski <rzarzyns@redhat.com>

diff --git a/src/ceph_osd.cc b/src/ceph_osd.cc
index da09b7bae5a7c273b7cabc46e4bc5e231918cd09..32589e91ce3d8a0546462e427e9ca3d22a885558 100644 (file)
--- a/src/ceph_osd.cc
+++ b/src/ceph_osd.cc
@@ -151,7 +151,6 @@ int main(int argc, const char **argv)
   bool mkkey = false;
   bool flushjournal = false;
   bool dump_journal = false;
-  bool convertfilestore = false;
   bool get_osd_fsid = false;
   bool get_cluster_fsid = false;
   bool get_journal_fsid = false;
@@ -181,8 +180,6 @@ int main(int argc, const char **argv)
       mkkey = true;
     } else if (ceph_argparse_flag(args, i, "--flush-journal", (char*)NULL)) {
       flushjournal = true;
-    } else if (ceph_argparse_flag(args, i, "--convert-filestore", (char*)NULL)) {
-      convertfilestore = true;
     } else if (ceph_argparse_witharg(args, i, &val, "--dump-pg-log", (char*)NULL)) {
       dump_pg_log = val;
     } else if (ceph_argparse_flag(args, i, "--dump-journal", (char*)NULL)) {
@@ -477,23 +474,6 @@ flushjournal_out:
     forker.exit(0);
   }
 
-  if (convertfilestore) {
-    int err = store->mount();
-    if (err < 0) {
-      derr << TEXT_RED << " ** ERROR: error mounting store " << data_path
-          << ": " << cpp_strerror(-err) << TEXT_NORMAL << dendl;
-      forker.exit(1);
-    }
-    err = store->upgrade();
-    store->umount();
-    if (err < 0) {
-      derr << TEXT_RED << " ** ERROR: error converting store " << data_path
-          << ": " << cpp_strerror(-err) << TEXT_NORMAL << dendl;
-      forker.exit(1);
-    }
-    forker.exit(0);
-  }
-  
   {
     int r = extblkdev::preload(g_ceph_context);
     if (r < 0) {

diff --git a/src/os/ObjectStore.h b/src/os/ObjectStore.h
index 9a0f2b01a3d7d5fefd98a46c488a8e5c88782709..027e410436b1d35a720e2f4aa68810228b8f3054 100644 (file)
--- a/src/os/ObjectStore.h
+++ b/src/os/ObjectStore.h
@@ -253,11 +253,6 @@ public:
   explicit ObjectStore(const ObjectStore& o) = delete;
   const ObjectStore& operator=(const ObjectStore& o) = delete;
 
-  // versioning
-  virtual int upgrade() {
-    return 0;
-  }
-
   virtual void get_db_statistics(ceph::Formatter *f) { }
   virtual void generate_db_histogram(ceph::Formatter *f) { }
   virtual int flush_cache(std::ostream *os = NULL) { return -1; }