]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
os/bluestore/BlueStore: cleanup overlay using single delete 8437/head
authorJianjian Huo <jianjian.huo@ssi.samsung.com>
Mon, 4 Apr 2016 22:07:01 +0000 (15:07 -0700)
committerJianjian Huo <jianjian.huo@ssi.samsung.com>
Tue, 26 Apr 2016 00:03:52 +0000 (17:03 -0700)
Overlay entries are also only written once, eligible to use single delete.

Signed-off-by: Jianjian Huo <jianjian.huo@ssi.samsung.com>
src/os/bluestore/BlueStore.cc

index 08b0d7799e53331353251e3d8a386dba378f7e74..2c5c8c2f4b6b40c89f1c5b9e340e64abfa6c5e52 100644 (file)
@@ -3987,7 +3987,7 @@ void BlueStore::_kv_sync_thread()
               ++q) {
             string key;
             get_overlay_key(p->nid, *q, &key);
-           t->rmkey(PREFIX_OVERLAY, key);
+           t->rm_single_key(PREFIX_OVERLAY, key);
          }
        }
        // cleanup the wal
@@ -4726,7 +4726,7 @@ int BlueStore::_do_overlay_trim(TransContext *txc,
       if (o->onode.put_overlay_ref(p->second.key)) {
        string key;
        get_overlay_key(o->onode.nid, p->second.key, &key);
-       txc->t->rmkey(PREFIX_OVERLAY, key);
+       txc->t->rm_single_key(PREFIX_OVERLAY, key);
       }
       o->onode.overlay_map.erase(p++);
       ++changed;
@@ -4826,7 +4826,7 @@ int BlueStore::_do_write_overlays(TransContext *txc,
        if (o->onode.put_overlay_ref(p->second.key)) {
          string key;
          get_overlay_key(o->onode.nid, p->second.key, &key);
-         txc->t->rmkey(PREFIX_OVERLAY, key);
+         txc->t->rm_single_key(PREFIX_OVERLAY, key);
        }
        o->onode.overlay_map.erase(p++);
        continue;
@@ -4844,7 +4844,7 @@ int BlueStore::_do_write_overlays(TransContext *txc,
        if (o->onode.put_overlay_ref(p->second.key)) {
          string key;
          get_overlay_key(o->onode.nid, p->second.key, &key);
-         txc->t->rmkey(PREFIX_OVERLAY, key);
+         txc->t->rm_single_key(PREFIX_OVERLAY, key);
        }
        o->onode.overlay_map.erase(p++);
        continue;
@@ -6013,7 +6013,7 @@ int BlueStore::_do_truncate(
                 << op->second << dendl;
        string key;
        get_overlay_key(o->onode.nid, op->second.key, &key);
-       txc->t->rmkey(PREFIX_OVERLAY, key);
+       txc->t->rm_single_key(PREFIX_OVERLAY, key);
       } else {
        dout(20) << __func__ << " rm overlay " << op->first << " "
                 << op->second << " (put ref)" << dendl;