From bbfbb097e2f9efbf4f7ec997c70befa20c79d27c Mon Sep 17 00:00:00 2001 From: Yehuda Sadeh Date: Tue, 10 Sep 2013 12:18:55 -0700 Subject: [PATCH] rgw: drain pending requests before completing write Fixes: #6268 When doing aio write of objects (either regular or multipart parts) we need to drain pending aio requests. Otherwise if gateway goes down then object might end up corrupted. Reviewed-by: Josh Durgin Signed-off-by: Yehuda Sadeh --- src/rgw/rgw_op.cc | 16 ++++++++++++---- 1 file changed, 12 insertions(+), 4 deletions(-) diff --git a/src/rgw/rgw_op.cc b/src/rgw/rgw_op.cc index 0c157c561fb59..3485e690ca595 100644 --- a/src/rgw/rgw_op.cc +++ b/src/rgw/rgw_op.cc @@ -1019,11 +1019,11 @@ class RGWPutObjProcessor_Aio : public RGWPutObjProcessor struct put_obj_aio_info pop_pending(); int wait_pending_front(); bool pending_has_completed(); - int drain_pending(); protected: uint64_t obj_len; + int drain_pending(); int handle_obj_data(rgw_obj& obj, bufferlist& bl, off_t ofs, off_t abs_ofs, void **phandle); int throttle_data(void *handle); @@ -1213,8 +1213,12 @@ int RGWPutObjProcessor_Atomic::do_complete(string& etag, map store->set_atomic(s->obj_ctx, head_obj); - int r = store->put_obj_meta(s->obj_ctx, head_obj, obj_len, NULL, attrs, - RGW_OBJ_CATEGORY_MAIN, PUT_OBJ_CREATE, NULL, &first_chunk, &manifest, NULL, NULL); + int r = drain_pending(); + if (r < 0) + return r; + + r = store->put_obj_meta(s->obj_ctx, head_obj, obj_len, NULL, attrs, + RGW_OBJ_CATEGORY_MAIN, PUT_OBJ_CREATE, NULL, &first_chunk, &manifest, NULL, NULL); return r; } @@ -1261,7 +1265,11 @@ int RGWPutObjProcessor_Multipart::do_complete(string& etag, mapput_obj_meta(s->obj_ctx, head_obj, s->obj_size, NULL, attrs, RGW_OBJ_CATEGORY_MAIN, 0, NULL, NULL, NULL, NULL, NULL); + int r = drain_pending(); + if (r < 0) + return r; + + r = store->put_obj_meta(s->obj_ctx, head_obj, s->obj_size, NULL, attrs, RGW_OBJ_CATEGORY_MAIN, 0, NULL, NULL, NULL, NULL, NULL); if (r < 0) return r; -- 2.39.5