diff options
| author | Greg Farnum <greg@inktank.com> | 2013-07-16 10:43:09 -0700 |
|---|---|---|
| committer | Greg Farnum <greg@inktank.com> | 2013-07-19 13:50:19 -0700 |
| commit | 934ad8814211e9b05deadb70438d6ab5d7bea7d8 (patch) | |
| tree | 8730b43d9ed625a18dee163f7f7b1acf009ca0b9 | |
| parent | f4675dcb545b9a1cdd22f9a64149e898fbd99a2f (diff) | |
| download | ceph-934ad8814211e9b05deadb70438d6ab5d7bea7d8.tar.gz | |
rgw: grab the old mtime when doing a user metadata put
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>
| -rw-r--r-- | src/rgw/rgw_user.cc | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/rgw/rgw_user.cc b/src/rgw/rgw_user.cc index 6cdcaa62935..a1a0577c490 100644 --- a/src/rgw/rgw_user.cc +++ b/src/rgw/rgw_user.cc @@ -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; |