]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph.git/commitdiff
rgw: grab the old mtime when doing a user metadata put
authorGreg Farnum <greg@inktank.com>
Tue, 16 Jul 2013 17:43:09 +0000 (10:43 -0700)
committerGreg Farnum <greg@inktank.com>
Fri, 19 Jul 2013 20:50:19 +0000 (13:50 -0700)
We're about to use this to enable (ick) a timestamp-based update
decision tree, to help in resolving disastrous double-active conflicts.

Signed-off-by: Greg Farnum <greg@inktank.com>
src/rgw/rgw_user.cc

index 6cdcaa6293576ec377f81c21b76d05d63150eaf1..a1a0577c490984d771730c911feb239f9541e1bc 100644 (file)
@@ -2301,7 +2301,8 @@ public:
     decode_json_obj(info, obj);
 
     RGWUserInfo old_info;
-    int ret = rgw_get_user_info_by_uid(store, entry, old_info, &objv_tracker);
+    time_t orig_mtime;
+    int ret = rgw_get_user_info_by_uid(store, entry, old_info, &objv_tracker, &orig_mtime);
     if (ret < 0 && ret != -ENOENT)
       return ret;