RepoMirrors/ceph
1
0
Fork 0
mirror of https://github.com/ceph/ceph synced 2025-01-03 09:32:43 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #3769 from athanatos/wip-10908

Browse Source 
Wip 10908

Reviewed-by: Sage Weil <sage@redhat.com>
This commit is contained in:
Sage Weil 2015-02-20 15:08:20 -08:00
commit f6098bd9a9
2 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/osd/ECBackend.cc
View File

@ -1518,6 +1518,9 @@ void ECBackend::start_write(Op *op) {
trans[i->shard];
trans[i->shard].set_use_tbl(parent->transaction_use_tbl());
}
ObjectStore::Transaction empty;
empty.set_use_tbl(parent->transaction_use_tbl());
op->t->generate_transactions(
op->unstable_hash_infos,
ec_impl,
@ -1557,7 +1560,7 @@ void ECBackend::start_write(Op *op) {
op->reqid,
op->hoid,
stats,
should_send ? iter->second : ObjectStore::Transaction(),
should_send ? iter->second : empty,
op->version,
op->trim_to,
op->trim_rollback_to,

1
src/osd/ReplicatedPG.cc
View File

@ -7678,6 +7678,7 @@ Message * ReplicatedBackend::generate_subop(
<< ", pinfo.last_backfill "
<< pinfo.last_backfill << ")" << dendl;
ObjectStore::Transaction t;
t.set_use_tbl(op_t->get_use_tbl());
::encode(t, wr->get_data());
} else {
::encode(*op_t, wr->get_data());