RepoMirrors/ceph
1
0
Fork 0
mirror of https://github.com/ceph/ceph synced 2025-01-20 10:01:45 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #6439 from XinzeChi/wip-merge-tnx

Browse Source 
osd: merge local_t and op_t txn to single one

Reviewed-by: Sage Weil <sage@redhat.com>
This commit is contained in:
Sage Weil 2015-11-14 21:40:42 -05:00
commit b9251b4b6f
1 changed files with 1 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/osd/ReplicatedBackend.cc
View File

@ -602,8 +602,6 @@ void ReplicatedBackend::submit_transaction(
&op,
op_t);
ObjectStore::Transaction *local_t = new ObjectStore::Transaction;
local_t->set_use_tbl(op_t->get_use_tbl());
if (!(t->get_temp_added().empty())) {
add_temp_objs(t->get_temp_added());
}
@ -615,7 +613,7 @@ void ReplicatedBackend::submit_transaction(
trim_to,
trim_rollback_to,
true,
local_t);
op_t);
op_t->register_on_applied_sync(on_local_applied_sync);
op_t->register_on_applied(
@ -623,14 +621,11 @@ void ReplicatedBackend::submit_transaction(
new C_OSD_OnOpApplied(this, &op)));
op_t->register_on_applied(
new ObjectStore::C_DeleteTransaction(op_t));
op_t->register_on_applied(
new ObjectStore::C_DeleteTransaction(local_t));
op_t->register_on_commit(
parent->bless_context(
new C_OSD_OnOpCommit(this, &op)));
list<ObjectStore::Transaction*> tls;
tls.push_back(local_t);
tls.push_back(op_t);
parent->queue_transactions(tls, op.op);
delete t;