RepoMirrors/ceph
1
0
Fork 0
mirror of https://github.com/ceph/ceph synced 2024-12-19 09:57:05 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #3342 from ceph/wip-10311

Browse Source 
rgw: only keep track for cleanup of rados objects that were written

Reviewed-by: Ray Lv <xiangyulv@gmail.com>
This commit is contained in:
Sage Weil 2015-01-15 21:45:56 -08:00
commit bed740bbd0
3 changed files with 19 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/rgw/rgw_op.cc
View File

@ -1454,7 +1454,6 @@ int RGWPutObjProcessor_Multipart::prepare(RGWRados *store, void *obj_ctx, string
head_obj = manifest_gen.get_cur_obj();
cur_obj = head_obj;
add_obj(cur_obj);
return 0;
}

12
src/rgw/rgw_rados.cc
View File

@ -883,13 +883,15 @@ CephContext *RGWPutObjProcessor::ctx()
return store->ctx();
}
RGWPutObjProcessor::~RGWPutObjProcessor()
RGWPutObjProcessor_Aio::~RGWPutObjProcessor_Aio()
{
drain_pending();
if (is_complete)
return;
list<rgw_obj>::iterator iter;
for (iter = objs.begin(); iter != objs.end(); ++iter) {
for (iter = written_objs.begin(); iter != written_objs.end(); ++iter) {
rgw_obj& obj = *iter;
int r = store->delete_obj(obj_ctx, bucket_owner, obj);
if (r < 0 && r != -ENOENT) {
@ -944,6 +946,11 @@ int RGWPutObjProcessor_Aio::handle_obj_data(rgw_obj& obj, bufferlist& bl, off_t
if ((uint64_t)abs_ofs + bl.length() > obj_len)
obj_len = abs_ofs + bl.length();
if (!(obj == last_written_obj)) {
add_written_obj(obj);
last_written_obj = obj;
}
// For the first call pass -1 as the offset to
// do a write_full.
int r = store->aio_put_obj_data(NULL, obj,
@ -1144,7 +1151,6 @@ int RGWPutObjProcessor_Atomic::prepare_next_part(off_t ofs) {
cur_part_ofs = ofs;
next_part_ofs = ofs + manifest_gen.cur_stripe_max_size();
cur_obj = manifest_gen.get_cur_obj();
add_obj(cur_obj);
return 0;
}

19
src/rgw/rgw_rados.h
View File

@ -554,14 +554,9 @@ protected:
map<string, bufferlist>& attrs,
const char *if_match = NULL, const char *if_nomatch = NULL) = 0;
list<rgw_obj> objs;
void add_obj(const rgw_obj& obj) {
objs.push_back(obj);
}
public:
RGWPutObjProcessor(const string& _bo) : store(NULL), obj_ctx(NULL), is_complete(false), bucket_owner(_bo) {}
virtual ~RGWPutObjProcessor();
virtual ~RGWPutObjProcessor() {}
virtual int prepare(RGWRados *_store, void *_o, string *oid_rand) {
store = _store;
obj_ctx = _o;
@ -614,9 +609,17 @@ class RGWPutObjProcessor_Aio : public RGWPutObjProcessor
int wait_pending_front();
bool pending_has_completed();
rgw_obj last_written_obj;
protected:
uint64_t obj_len;
list<rgw_obj> written_objs;
void add_written_obj(const rgw_obj& obj) {
written_objs.push_back(obj);
}
int drain_pending();
int handle_obj_data(rgw_obj& obj, bufferlist& bl, off_t ofs, off_t abs_ofs, void **phandle, bool exclusive);
@ -624,9 +627,7 @@ public:
int throttle_data(void *handle, bool need_to_wait);
RGWPutObjProcessor_Aio(const string& bucket_owner) : RGWPutObjProcessor(bucket_owner), max_chunks(RGW_MAX_PENDING_CHUNKS), obj_len(0) {}
virtual ~RGWPutObjProcessor_Aio() {
drain_pending();
}
virtual ~RGWPutObjProcessor_Aio();
};
class RGWPutObjProcessor_Atomic : public RGWPutObjProcessor_Aio