From 6d6b05d8b1d592c164c98eb10d67c2cbe8b33b5e Mon Sep 17 00:00:00 2001 From: Yehuda Sadeh Date: Mon, 27 Jun 2011 12:20:22 -0700 Subject: [PATCH] rgw: fix some issues with call to clone_range --- src/rgw/rgw_common.h | 2 +- src/rgw/rgw_rados.cc | 9 +++++---- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/src/rgw/rgw_common.h b/src/rgw/rgw_common.h index e835c7953efb6..d69385900af3c 100644 --- a/src/rgw/rgw_common.h +++ b/src/rgw/rgw_common.h @@ -599,7 +599,7 @@ public: }; inline ostream& operator<<(ostream& out, const rgw_obj o) { - return out << o.bucket << ":" << o.key; + return out << o.bucket << ":" << o.object; } static inline void buf_to_hex(const unsigned char *buf, int len, char *str) diff --git a/src/rgw/rgw_rados.cc b/src/rgw/rgw_rados.cc index 38c2863eb5df9..9b59342a98f6b 100644 --- a/src/rgw/rgw_rados.cc +++ b/src/rgw/rgw_rados.cc @@ -435,8 +435,9 @@ int RGWRados::copy_obj(std::string& id, rgw_obj& dest_obj, rgw_obj tmp_obj = dest_obj; string tmp_oid; - append_rand_alpha(dest_obj.key, tmp_oid, 32); - tmp_obj.set_key(tmp_oid); + append_rand_alpha(dest_obj.object, tmp_oid, 32); + tmp_obj.set_obj(tmp_oid); + tmp_obj.set_key(dest_obj.object); rgw_obj tmp_dest; @@ -472,7 +473,7 @@ int RGWRados::copy_obj(std::string& id, rgw_obj& dest_obj, } attrs = attrset; - ret = clone_obj(dest_obj, 0, tmp_obj, 0, end, attrs); + ret = clone_obj(dest_obj, 0, tmp_obj, 0, end + 1, attrs); if (mtime) obj_stat(tmp_obj, NULL, mtime); @@ -647,7 +648,6 @@ int RGWRados::delete_obj(std::string& id, rgw_obj& obj) return r; io_ctx.locator_set_key(obj.key); - r = io_ctx.remove(oid); if (r < 0) return r; @@ -903,6 +903,7 @@ int RGWRados::clone_objs(rgw_obj& dst_obj, vector::iterator range_iter; for (range_iter = ranges.begin(); range_iter != ranges.end(); ++range_iter) { RGWCloneRangeInfo& range = *range_iter; + RGW_LOG(20) << "calling op.clone_range(dst_ofs=" << range.dst_ofs << ", src.object=" << range.src.object << " range.src_ofs=" << range.src_ofs << " range.len=" << range.len << dendl; op.clone_range(range.dst_ofs, range.src.object, range.src_ofs, range.len); } -- 2.39.5