From: Greg Farnum <greg@inktank.com>
Date: Fri, 26 Jul 2013 20:03:01 +0000 (-0700)
Subject: Merge branch 'wip-rgw-versionchecks' into next
X-Git-Tag: v0.67-rc3~47
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=2a1aea7c7f0a8065a8e06c7ea04359e3fe37e8f5;p=ceph.git

Merge branch 'wip-rgw-versionchecks' into next

Conflicts:
	src/rgw/rgw_rest_metadata.h

Reviewed-by: Yehuda Sadeh <yehuda@inktank.com
---

2a1aea7c7f0a8065a8e06c7ea04359e3fe37e8f5
diff --cc src/rgw/rgw_bucket.cc
index 8de5a3d101fe,439f5035dcc6..bf8da99d616d
--- a/src/rgw/rgw_bucket.cc
+++ b/src/rgw/rgw_bucket.cc
@@@ -1410,9 -1407,15 +1411,15 @@@ public
      if (ret < 0 && ret != -ENOENT)
        return ret;
  
+     // are we actually going to perform this put, or is it too old?
+     if (!check_versions(old_ot.read_version, orig_mtime,
+ 			objv_tracker.write_version, mtime, sync_type)) {
+       return STATUS_NO_APPLY;
+     }
+ 
      objv_tracker.read_version = old_ot.read_version; /* maintain the obj version we just read */
  
 -    ret = store->put_bucket_entrypoint_info(entry, be, false, objv_tracker, mtime);
 +    ret = store->put_bucket_entrypoint_info(entry, be, false, objv_tracker, mtime, &attrs);
      if (ret < 0)
        return ret;
  
diff --cc src/rgw/rgw_rest_metadata.h
index 59d7c5f70455,8a95518288f5..7f3cf1f2207a
--- a/src/rgw/rgw_rest_metadata.h
+++ b/src/rgw/rgw_rest_metadata.h
@@@ -48,7 -50,8 +50,8 @@@ public
      return caps.check_cap("metadata", RGW_CAP_WRITE);
    }
    void execute();
+   void send_response();
 -  virtual const char *name() { return "set_metadata"; }
 +  virtual const string name() { return "set_metadata"; }
  };
  
  class RGWOp_Metadata_Delete : public RGWRESTOp {