Merge branch 'wip-3127'

Conflicts:
	src/rgw/rgw_rados.cc

Signed-off-by: Yehuda Sadeh <yehuda@inktank.com>

diff --cc src/rgw/rgw_admin.cc
index 837a9c289ed44871f8469bdc7dc5889e990f3783,45756e02fb50bb7889062e158f079da840d35a69..c39e74027609982304967a355e773a8ab3ddc24f
--- 1/src/rgw/rgw_admin.cc
--- 2/src/rgw/rgw_admin.cc
+++ b/src/rgw/rgw_admin.cc
@@@ -50,8 -48,8 +50,9 @@@ void _usage(
    cerr << "  bucket unlink              unlink bucket from specified user\n";
    cerr << "  bucket stats               returns bucket statistics\n";
    cerr << "  bucket rm                  remove bucket\n";
+   cerr << "  bucket check               check bucket index\n";
    cerr << "  object rm                  remove object\n";
 +  cerr << "  cluster info               show cluster params info\n";
    cerr << "  pool add                   add an existing pool for data placement\n";
    cerr << "  pool rm                    remove an existing pool from data placement set\n";
    cerr << "  pools list                 list placement active set\n";

diff --cc src/rgw/rgw_rados.cc
index f7eb81d2b1d22328187f23e8706897d60e13ce29,2ed3562f5f3653ce3ec7845fe7dd4573a244088a..c58e046a9ee1e27711754d7b9981374cfed2599e
--- 1/src/rgw/rgw_rados.cc
--- 2/src/rgw/rgw_rados.cc
+++ b/src/rgw/rgw_rados.cc
@@@ -1229,124 -1164,6 +1229,124 @@@ int RGWRados::copy_obj(void *ctx
    if (ret < 0)
      return ret;
  
-     obj_stat(ctx, dest_obj, NULL, mtime, NULL, NULL);
 +  if (replace_attrs) {
 +    attrset = attrs;
 +  }
 +
 +  RGWObjManifest manifest;
 +  RGWObjState *astate = NULL;
 +  RGWRadosCtx *rctx = (RGWRadosCtx *)ctx;
 +  ret = get_obj_state(rctx, src_obj, &astate);
 +  if (ret < 0)
 +    return ret;
 +
 +  vector<rgw_obj> ref_objs;
 +
 +  bool copy_data = !astate->has_manifest;
 +  bool copy_first = false;
 +  if (astate->has_manifest) {
 +    if (astate->manifest.objs.size() < 2) {
 +      copy_data = true;
 +    } else {
 +      map<uint64_t, RGWObjManifestPart>::iterator iter = astate->manifest.objs.begin();
 +      RGWObjManifestPart part = iter->second;
 +      if (part.loc == src_obj) {
 +      if (part.size > RGW_MAX_CHUNK_SIZE)  // should never happen
 +        copy_data = true;
 +      else
 +          copy_first = true;
 +      }
 +    }
 +  }
 +
 +  if (copy_data) { /* refcounting tail wouldn't work here, just copy the data */
 +    return copy_obj_data(ctx, handle, end, dest_obj, src_obj, mtime, attrset, category, err);
 +  }
 +
 +  map<uint64_t, RGWObjManifestPart>::iterator miter = astate->manifest.objs.begin();
 +
 +  if (copy_first) // we need to copy first chunk, not increase refcount
 +    ++miter;
 +
 +  RGWObjManifestPart *first_part = &miter->second;
 +  string oid, key;
 +  rgw_bucket bucket;
 +  get_obj_bucket_and_oid_key(first_part->loc, bucket, oid, key);
 +  librados::IoCtx io_ctx;
 +
 +  ret = open_bucket_ctx(bucket, io_ctx);
 +  if (ret < 0)
 +    return ret;
 +
 +  bufferlist first_chunk;
 +
 +  string tag;
 +  append_rand_alpha(cct, tag, tag, 32);
 +
 +  for (; miter != astate->manifest.objs.end(); ++miter) {
 +    RGWObjManifestPart& part = miter->second;
 +    ObjectWriteOperation op;
 +    manifest.objs[miter->first] = part;
 +    cls_refcount_get(op, tag, true);
 +
 +    get_obj_bucket_and_oid_key(part.loc, bucket, oid, key);
 +    io_ctx.locator_set_key(key);
 +
 +    ret = io_ctx.operate(oid, &op);
 +    if (ret < 0)
 +      goto done_ret;
 +
 +    ref_objs.push_back(part.loc);
 +  }
 +
 +  if (copy_first) {
 +    ret = get_obj(ctx, &handle, src_obj, first_chunk, 0, RGW_MAX_CHUNK_SIZE);
 +    if (ret < 0)
 +      goto done_ret;
 +
 +    first_part = &manifest.objs[0];
 +    first_part->loc = dest_obj;
 +    first_part->loc_ofs = 0;
 +    first_part->size = first_chunk.length();
 +  }
 +
 +  manifest.obj_size = total_len;
 +
 +  ret = put_obj_meta(ctx, dest_obj, end + 1, NULL, attrset, category, false, NULL, &first_chunk, &manifest, &tag);
 +  if (mtime)
++    obj_stat(ctx, dest_obj, NULL, mtime, NULL, NULL, NULL);
 +
 +  return 0;
 +
 +done_ret:
 +  vector<rgw_obj>::iterator riter;
 +
 +  /* rollback reference */
 +  for (riter = ref_objs.begin(); riter != ref_objs.end(); ++riter) {
 +    ObjectWriteOperation op;
 +    cls_refcount_put(op, tag, true);
 +
 +    get_obj_bucket_and_oid_key(*riter, bucket, oid, key);
 +    io_ctx.locator_set_key(key);
 +
 +    int r = io_ctx.operate(oid, &op);
 +    if (r < 0) {
 +      ldout(cct, 0) << "ERROR: cleanup after error failed to drop reference on obj=" << *riter << dendl;
 +    }
 +  }
 +  return ret;
 +}
 +
 +
 +int RGWRados::copy_obj_data(void *ctx,
 +             void *handle, off_t end,
 +               rgw_obj& dest_obj,
 +               rgw_obj& src_obj,
 +             time_t *mtime,
 +               map<string, bufferlist>& attrs,
 +               RGWObjCategory category,
 +               struct rgw_err *err)
 +{
    bufferlist first_chunk;
    RGWObjManifest manifest;
    RGWObjManifestPart *first_part;
@@@ -1401,9 -1209,13 +1401,9 @@@
    }
    manifest.obj_size = ofs;
  
 -  if (replace_attrs) {
 -    attrset = attrs;
 -  }
 -
 -  ret = rgwstore->put_obj_meta(ctx, dest_obj, end + 1, NULL, attrset, category, false, NULL, &first_chunk, &manifest);
 +  ret = put_obj_meta(ctx, dest_obj, end + 1, NULL, attrs, category, false, NULL, &first_chunk, &manifest, NULL);
    if (mtime)
-     obj_stat(ctx, dest_obj, NULL, mtime, NULL, NULL);
+     obj_stat(ctx, dest_obj, NULL, mtime, NULL, NULL, NULL);
  
    finish_get_obj(&handle);
  
@@@ -3137,10 -2992,15 +3181,15 @@@ int RGWRados::check_disk_state(librados
    obj.init(bucket, oid, list_state.locator, ns);
    get_obj_bucket_and_oid_key(obj, bucket, oid, key);
    io_ctx.locator_set_key(key);
-   int r = io_ctx.stat(oid, &object.size, &object.mtime);
+ 
+   RGWObjState *astate = NULL;
 -  RGWRadosCtx rctx;
++  RGWRadosCtx rctx(this);
+   int r = get_obj_state(&rctx, obj, &astate);
+   if (r < 0)
+     return r;
  
    list_state.pending_map.clear(); // we don't need this and it inflates size
-   if (r == -ENOENT) {
+   if (!astate->exists) {
        /* object doesn't exist right now -- hopefully because it's
         * marked as !exists and got deleted */
      if (list_state.exists) {

diff --cc src/rgw/rgw_rados.h
Simple merge