[prev in list] [next in list] [prev in thread] [next in thread]
List: ceph-commit
Subject: [ceph-commit] branch master updated. v9.0.0-1113-g64096b8
From: ceph-commit () ceph ! com (ceph ! git)
Date: 2015-05-29 21:23:07
Message-ID: 20150529212307.BC46F3F528 () ds3426 ! dreamservers ! com
[Download RAW message or body]
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "".
The branch, master has been updated
via 64096b870960d021ab5001b6a5cf3a999a9abeb7 (commit)
via 33150c509d33ca0fad8f19d2d9e43fe7dad57b24 (commit)
via 90eb7768f99ea249952df195a844a3a7c9a59b78 (commit)
via 6051e255ac062985ada1989edb7f23cd750915e2 (commit)
via 2738d02bef7972f55a3df45b5b1c841bd7738f40 (commit)
via 193f1e33b3bf4b40f7d59b1822d01c735daa9c32 (commit)
via 3fdace649d6eb239146585be156153de60c9f567 (commit)
via e89ee9e0e1a91b15ecb00d41185de1d34c68104c (commit)
from d07100b6606e791c878a1e4e1ec804f5438a1f5c (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commit 64096b870960d021ab5001b6a5cf3a999a9abeb7
Merge: 33150c5 90eb776
Author: Sage Weil <sage at redhat.com>
Date: Fri May 29 14:21:52 2015 -0700
Merge pull request #4805 from athanatos/wip-11787
Wip 11787
Reviewed-by: Sage Weil <sage at redhat.com>
commit 33150c509d33ca0fad8f19d2d9e43fe7dad57b24
Merge: d07100b 2738d02
Author: Samuel Just <sjust at redhat.com>
Date: Fri May 29 14:20:29 2015 -0700
Merge remote-tracking branch 'upstream/wip-txn-noappend-sam-rebased'
Reviewed-by: Sage Weil <sage at redhat.com>
Reviewed-by: Samuel Just <sjust at redhat.com>
-----------------------------------------------------------------------
Summary of changes:
src/messages/MOSDECSubOpWrite.h | 7 ++++---
src/osd/ECBackend.cc | 9 +++++++--
src/osd/ECMsgTypes.h | 19 +++++++++++++++++++
src/osd/PGBackend.h | 4 ++++
src/osd/ReplicatedBackend.cc | 28 ++++++++++++++++------------
src/osd/ReplicatedPG.cc | 9 +++++++--
src/osd/ReplicatedPG.h | 3 +++
src/osd/osd_types.cc | 19 +++++++++++++++++++
src/osd/osd_types.h | 3 +++
src/test/encoding/types.h | 2 +-
10 files changed, 83 insertions(+), 20 deletions(-)
diff --git a/src/messages/MOSDECSubOpWrite.h b/src/messages/MOSDECSubOpWrite.h
index a47bcef..b3a8e3c 100644
--- a/src/messages/MOSDECSubOpWrite.h
+++ b/src/messages/MOSDECSubOpWrite.h
@@ -35,9 +35,10 @@ public:
MOSDECSubOpWrite()
: Message(MSG_OSD_EC_WRITE, HEAD_VERSION, COMPAT_VERSION)
{}
- MOSDECSubOpWrite(ECSubWrite &op)
- : Message(MSG_OSD_EC_WRITE, HEAD_VERSION, COMPAT_VERSION),
- op(op) {}
+ MOSDECSubOpWrite(ECSubWrite &in_op)
+ : Message(MSG_OSD_EC_WRITE, HEAD_VERSION, COMPAT_VERSION) {
+ op.claim(in_op);
+ }
virtual void decode_payload() {
bufferlist::iterator p = payload.begin();
diff --git a/src/osd/ECBackend.cc b/src/osd/ECBackend.cc
index 845ea83..b04776c 100644
--- a/src/osd/ECBackend.cc
+++ b/src/osd/ECBackend.cc
@@ -841,7 +841,6 @@ void ECBackend::handle_sub_write(
get_parent()->whoami_shard().shard >= ec_impl->get_data_chunk_count())
op.t.set_fadvise_flag(CEPH_OSD_OP_FLAG_FADVISE_DONTNEED);
- localt->append(op.t);
if (on_local_applied_sync) {
dout(10) << "Queueing onreadable_sync: " << on_local_applied_sync << dendl;
localt->register_on_applied_sync(on_local_applied_sync);
@@ -857,7 +856,13 @@ void ECBackend::handle_sub_write(
new SubWriteApplied(this, msg, op.tid, op.at_version)));
localt->register_on_applied(
new ObjectStore::C_DeleteTransaction(localt));
- get_parent()->queue_transaction(localt, msg);
+ list<ObjectStore::Transaction*> tls;
+ tls.push_back(localt);
+ tls.push_back(new ObjectStore::Transaction);
+ tls.back()->swap(op.t);
+ tls.back()->register_on_complete(
+ new ObjectStore::C_DeleteTransaction(tls.back()));
+ get_parent()->queue_transactions(tls, msg);
}
void ECBackend::handle_sub_read(
diff --git a/src/osd/ECMsgTypes.h b/src/osd/ECMsgTypes.h
index 7819383..2d5dc75 100644
--- a/src/osd/ECMsgTypes.h
+++ b/src/osd/ECMsgTypes.h
@@ -57,10 +57,29 @@ struct ECSubWrite {
temp_added(temp_added),
temp_removed(temp_removed),
updated_hit_set_history(updated_hit_set_history) {}
+ void claim(ECSubWrite &other) {
+ from = other.from;
+ tid = other.tid;
+ reqid = other.reqid;
+ soid = other.soid;
+ stats = other.stats;
+ t.swap(other.t);
+ at_version = other.at_version;
+ trim_to = other.trim_to;
+ trim_rollback_to = other.trim_rollback_to;
+ log_entries.swap(other.log_entries);
+ temp_added.swap(other.temp_added);
+ temp_removed.swap(other.temp_removed);
+ updated_hit_set_history = other.updated_hit_set_history;
+ }
void encode(bufferlist &bl) const;
void decode(bufferlist::iterator &bl);
void dump(Formatter *f) const;
static void generate_test_instances(list<ECSubWrite*>& o);
+private:
+ // no outside copying -- slow
+ ECSubWrite(ECSubWrite& other);
+ const ECSubWrite& operator=(const ECSubWrite& other);
};
WRITE_CLASS_ENCODER(ECSubWrite)
diff --git a/src/osd/PGBackend.h b/src/osd/PGBackend.h
index d1bf105..aa9b6ca 100644
--- a/src/osd/PGBackend.h
+++ b/src/osd/PGBackend.h
@@ -109,6 +109,10 @@
ObjectStore::Transaction *t,
OpRequestRef op = OpRequestRef()
) = 0;
+ virtual void queue_transactions(
+ list<ObjectStore::Transaction*>& tls,
+ OpRequestRef op = OpRequestRef()
+ ) = 0;
virtual epoch_t get_epoch() const = 0;
virtual const set<pg_shard_t> &get_actingbackfill_shards() const = 0;
diff --git a/src/osd/ReplicatedBackend.cc b/src/osd/ReplicatedBackend.cc
index 48bface..19c3ee4 100644
--- a/src/osd/ReplicatedBackend.cc
+++ b/src/osd/ReplicatedBackend.cc
@@ -600,10 +600,10 @@ void ReplicatedBackend::submit_transaction(
&op,
op_t);
- ObjectStore::Transaction local_t;
- local_t.set_use_tbl(op_t->get_use_tbl());
+ ObjectStore::Transaction *local_t = new ObjectStore::Transaction;
+ local_t->set_use_tbl(op_t->get_use_tbl());
if (!(t->get_temp_added().empty())) {
- get_temp_coll(&local_t);
+ get_temp_coll(local_t);
add_temp_objs(t->get_temp_added());
}
clear_temp_objs(t->get_temp_cleared());
@@ -614,10 +614,7 @@ void ReplicatedBackend::submit_transaction(
trim_to,
trim_rollback_to,
true,
- &local_t);
-
- local_t.append(*op_t);
- local_t.swap(*op_t);
+ local_t);
op_t->register_on_applied_sync(on_local_applied_sync);
op_t->register_on_applied(
@@ -625,11 +622,16 @@ 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)));
-
- parent->queue_transaction(op_t, op.op);
+
+ list<ObjectStore::Transaction*> tls;
+ tls.push_back(local_t);
+ tls.push_back(op_t);
+ parent->queue_transactions(tls, op.op);
delete t;
}
@@ -1201,14 +1203,16 @@ void ReplicatedBackend::sub_op_modify_impl(OpRequestRef op)
op->mark_started();
- rm->localt.append(rm->opt);
- rm->localt.register_on_commit(
+ rm->opt.register_on_commit(
parent->bless_context(
new C_OSD_RepModifyCommit(this, rm)));
rm->localt.register_on_applied(
parent->bless_context(
new C_OSD_RepModifyApply(this, rm)));
- parent->queue_transaction(&(rm->localt), op);
+ list<ObjectStore::Transaction*> tls;
+ tls.push_back(&(rm->localt));
+ tls.push_back(&(rm->opt));
+ parent->queue_transactions(tls, op);
// op is cleaned up by oncommit/onapply when both are executed
}
diff --git a/src/osd/ReplicatedPG.cc b/src/osd/ReplicatedPG.cc
index e310db6..6fbf139 100644
--- a/src/osd/ReplicatedPG.cc
+++ b/src/osd/ReplicatedPG.cc
@@ -2865,7 +2865,10 @@ ReplicatedPG::RepGather *ReplicatedPG::trim_object(const hobject_t &coid)
ctx->log.back().mod_desc.mark_unrollbackable();
}
} else {
- dout(10) << coid << " updating snapset on " << snapoid << dendl;
+ dout(10) << coid << " filtering snapset on " << snapoid << dendl;
+ snapset.filter(pool.info);
+ dout(10) << coid << " writing updated snapset on " << snapoid
+ << ", snapset is " << snapset << dendl;
ctx->log.push_back(
pg_log_entry_t(
pg_log_entry_t::MODIFY,
@@ -6851,8 +6854,10 @@ int ReplicatedPG::start_flush(
<< " " << (blocking ? "blocking" : "non-blocking/best-effort")
<< dendl;
+ // get a filtered snapset, need to remove removed snaps
+ SnapSet snapset = obc->ssc->snapset.get_filtered(pool.info);
+
// verify there are no (older) check for dirty clones
- SnapSet& snapset = obc->ssc->snapset;
{
dout(20) << " snapset " << snapset << dendl;
vector<snapid_t>::reverse_iterator p = snapset.clones.rbegin();
diff --git a/src/osd/ReplicatedPG.h b/src/osd/ReplicatedPG.h
index 3439683..3aab489 100644
--- a/src/osd/ReplicatedPG.h
+++ b/src/osd/ReplicatedPG.h
@@ -339,6 +339,9 @@ public:
void queue_transaction(ObjectStore::Transaction *t, OpRequestRef op) {
osd->store->queue_transaction(osr.get(), t, 0, 0, 0, op);
}
+ void queue_transactions(list<ObjectStore::Transaction*>& tls, OpRequestRef op) {
+ osd->store->queue_transactions(osr.get(), tls, 0, 0, 0, op);
+ }
epoch_t get_epoch() const {
return get_osdmap()->get_epoch();
}
diff --git a/src/osd/osd_types.cc b/src/osd/osd_types.cc
index 1e620d5..bff9feb 100644
--- a/src/osd/osd_types.cc
+++ b/src/osd/osd_types.cc
@@ -4083,6 +4083,25 @@ uint64_t SnapSet::get_clone_bytes(snapid_t clone) const
return size;
}
+void SnapSet::filter(const pg_pool_t &pinfo)
+{
+ vector<snapid_t> oldsnaps;
+ oldsnaps.swap(snaps);
+ for (vector<snapid_t>::const_iterator i = oldsnaps.begin();
+ i != oldsnaps.end();
+ ++i) {
+ if (!pinfo.is_removed_snap(*i))
+ snaps.push_back(*i);
+ }
+}
+
+SnapSet SnapSet::get_filtered(const pg_pool_t &pinfo) const
+{
+ SnapSet ss = *this;
+ ss.filter(pinfo);
+ return ss;
+}
+
// -- watch_info_t --
void watch_info_t::encode(bufferlist& bl) const
diff --git a/src/osd/osd_types.h b/src/osd/osd_types.h
index f162433..ecebf5d 100644
--- a/src/osd/osd_types.h
+++ b/src/osd/osd_types.h
@@ -2769,6 +2769,9 @@ struct SnapSet {
}
return max;
}
+
+ SnapSet get_filtered(const pg_pool_t &pinfo) const;
+ void filter(const pg_pool_t &pinfo);
};
WRITE_CLASS_ENCODER(SnapSet)
diff --git a/src/test/encoding/types.h b/src/test/encoding/types.h
index ce099eb..cb06b15 100644
--- a/src/test/encoding/types.h
+++ b/src/test/encoding/types.h
@@ -93,7 +93,7 @@ TYPE(PushReplyOp)
TYPE(ECUtil::HashInfo)
#include "osd/ECMsgTypes.h"
-TYPE(ECSubWrite)
+TYPE_NOCOPY(ECSubWrite)
TYPE(ECSubWriteReply)
TYPE_FEATUREFUL(ECSubRead)
TYPE(ECSubReadReply)
hooks/post-receive
--
[prev in list] [next in list] [prev in thread] [next in thread]
Configure |
About |
News |
Add a list |
Sponsored by KoreLogic