Merge pull request ceph#3769 from athanatos/wip-10908

Wip 10908 Reviewed-by: Sage Weil <[email protected]>
n4j · Feb 20, 2015 · f6098bd · f6098bd
2 parents f85f7ad + d05539e
commit f6098bd
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 1 deletion.
diff --git a/src/osd/ECBackend.cc b/src/osd/ECBackend.cc
@@ -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,

diff --git a/src/osd/ReplicatedPG.cc b/src/osd/ReplicatedPG.cc
@@ -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());