From: Haomai Wang <haomaiwang@gmail.com>
Date: Fri, 21 Feb 2014 14:44:39 +0000 (+0800)
Subject: Remove eio inject codes in KeyValueStore
X-Git-Tag: v0.78~130^2~2
X-Git-Url: http://git.apps.os.sepia.ceph.com/?a=commitdiff_plain;h=62c1631f1d9a281952e06556adcdceb122fa005c;p=ceph.git

Remove eio inject codes in KeyValueStore

Signed-off-by: Haomai Wang <haomaiwang@gmail.com>
---

diff --git a/src/os/KeyValueStore.cc b/src/os/KeyValueStore.cc
index 53623cbddd02a..54d5d5de8c7dd 100644
--- a/src/os/KeyValueStore.cc
+++ b/src/os/KeyValueStore.cc
@@ -506,7 +506,6 @@ KeyValueStore::KeyValueStore(const std::string &base,
   op_wq(this, g_conf->filestore_op_thread_timeout,
         g_conf->filestore_op_thread_suicide_timeout, &op_tp),
   logger(NULL),
-  read_error_lock("KeyValueStore::read_error_lock"),
   m_keyvaluestore_queue_max_ops(g_conf->keyvaluestore_queue_max_ops),
   m_keyvaluestore_queue_max_bytes(g_conf->keyvaluestore_queue_max_bytes),
   do_update(do_update)
@@ -2985,44 +2984,3 @@ void KeyValueStore::handle_conf_change(const struct md_config_t *conf,
 void KeyValueStore::dump_transactions(list<ObjectStore::Transaction*>& ls, uint64_t seq, OpSequencer *osr)
 {
 }
-
-// ============== KeyValueStore Debug EIO Injection =================
-
-void KeyValueStore::inject_data_error(const ghobject_t &oid) {
-  Mutex::Locker l(read_error_lock);
-  dout(10) << __func__ << ": init error on " << oid << dendl;
-  data_error_set.insert(oid);
-}
-
-void KeyValueStore::inject_mdata_error(const ghobject_t &oid) {
-  Mutex::Locker l(read_error_lock);
-  dout(10) << __func__ << ": init error on " << oid << dendl;
-  mdata_error_set.insert(oid);
-}
-
-void KeyValueStore::debug_obj_on_delete(const ghobject_t &oid) {
-  Mutex::Locker l(read_error_lock);
-  dout(10) << __func__ << ": clear error on " << oid << dendl;
-  data_error_set.erase(oid);
-  mdata_error_set.erase(oid);
-}
-
-bool KeyValueStore::debug_data_eio(const ghobject_t &oid) {
-  Mutex::Locker l(read_error_lock);
-  if (data_error_set.count(oid)) {
-    dout(10) << __func__ << ": inject error on " << oid << dendl;
-    return true;
-  } else {
-    return false;
-  }
-}
-
-bool KeyValueStore::debug_mdata_eio(const ghobject_t &oid) {
-  Mutex::Locker l(read_error_lock);
-  if (mdata_error_set.count(oid)) {
-    dout(10) << __func__ << ": inject error on " << oid << dendl;
-    return true;
-  } else {
-    return false;
-  }
-}
diff --git a/src/os/KeyValueStore.h b/src/os/KeyValueStore.h
index a169e07eab935..d7b9c0a11644a 100644
--- a/src/os/KeyValueStore.h
+++ b/src/os/KeyValueStore.h
@@ -466,16 +466,6 @@ class KeyValueStore : public ObjectStore,
   void set_fsid(uuid_d u) { fsid = u; }
   uuid_d get_fsid() { return fsid; }
 
-  // DEBUG read error injection, an object is removed from both on delete()
-  Mutex read_error_lock;
-  set<ghobject_t> data_error_set; // read() will return -EIO
-  set<ghobject_t> mdata_error_set; // getattr(),stat() will return -EIO
-  void inject_data_error(const ghobject_t &oid);
-  void inject_mdata_error(const ghobject_t &oid);
-  void debug_obj_on_delete(const ghobject_t &oid);
-  bool debug_data_eio(const ghobject_t &oid);
-  bool debug_mdata_eio(const ghobject_t &oid);
-
   // attrs
   int getattr(coll_t cid, const ghobject_t& oid, const char *name,
               bufferptr &bp);