RepoMirrors/ceph
1
0
Fork 0
mirror of https://github.com/ceph/ceph synced 2025-02-21 18:17:42 +00:00
Code Issues Packages Projects Releases Wiki Activity

osd: include SnapSet seq in the list snaps response

Browse Source 
It is important to know the latest seq that the object has seen in order
to tell if a response like

 clone 2 snaps=[1,2]
 clone head snaps=[]

was untouched before a hypothetical snap 3, or deleted prior to snap 3,
and then recreated+modified after.

Signed-off-by: Sage Weil <sage@inktank.com>
This commit is contained in:
Sage Weil 2013-03-25 20:59:11 -07:00 committed by Josh Durgin
parent fa5206ce9b
commit 0074228911
2 changed files with 11 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/osd/ReplicatedPG.cc
View File

@ -2351,6 +2351,7 @@ int ReplicatedPG::do_osd_ops(OpContext *ctx, vector<OSDOp>& ops)
resp.clones.push_back(ci);
}
resp.seq = ssc->snapset.seq;
resp.encode(osd_op.outdata);
result = 0;

12
src/osd/osd_types.h
View File

@ -2183,15 +2183,21 @@ WRITE_CLASS_ENCODER(clone_info)
*/
struct obj_list_snap_response_t {
vector<clone_info> clones; // ascending
snapid_t seq;
void encode(bufferlist& bl) const {
ENCODE_START(1, 1, bl);
ENCODE_START(2, 1, bl);
::encode(clones, bl);
::encode(seq, bl);
ENCODE_FINISH(bl);
}
void decode(bufferlist::iterator& bl) {
DECODE_START(1, bl);
DECODE_START(2, bl);
::decode(clones, bl);
if (struct_v >= 2)
::decode(seq, bl);
else
seq = CEPH_NOSNAP;
DECODE_FINISH(bl);
}
void dump(Formatter *f) const {
@ -2201,6 +2207,7 @@ struct obj_list_snap_response_t {
p->dump(f);
f->close_section();
}
f->dump_unsigned("seq", seq);
f->close_section();
}
static void generate_test_instances(list<obj_list_snap_response_t*>& o) {
@ -2218,6 +2225,7 @@ struct obj_list_snap_response_t {
cl.overlap.clear();
cl.size = 32768;
o.back()->clones.push_back(cl);
o.back()->seq = 123;
}
};