RepoMirrors/ceph
1
0
Fork 0
mirror of https://github.com/ceph/ceph synced 2024-12-28 22:43:29 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #14609 from linuxbox2/wip-rgw-file-wattrs

Browse Source 
rgw_file:  pre-compute unix attrs in write_finish()
This commit is contained in:
Matt Benjamin 2017-04-18 11:04:45 -04:00 committed by GitHub
commit e9aec52028
2 changed files with 18 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
src/rgw/rgw_file.cc
View File

@ -1280,6 +1280,11 @@ namespace rgw {
unsigned char m[CEPH_CRYPTO_MD5_DIGESTSIZE];
struct req_state* s = get_state();
size_t osize = rgw_fh->get_size();
struct timespec octime = rgw_fh->get_ctime();
struct timespec omtime = rgw_fh->get_mtime();
real_time appx_t = real_clock::now();
s->obj_size = ofs; // XXX check ofs
perfcounter->inc(l_rgw_put_b, s->obj_size);
@ -1300,7 +1305,12 @@ namespace rgw {
policy.encode(aclbl);
emplace_attr(RGW_ATTR_ACL, std::move(aclbl));
/* unix attrs */
rgw_fh->set_mtime(real_clock::to_timespec(appx_t));
rgw_fh->set_ctime(real_clock::to_timespec(appx_t));
rgw_fh->set_size(bytes_written);
rgw_fh->encode_attrs(ux_key, ux_attrs);
emplace_attr(RGW_ATTR_UNIX_KEY1, std::move(ux_key));
emplace_attr(RGW_ATTR_UNIX1, std::move(ux_attrs));
@ -1324,12 +1334,13 @@ namespace rgw {
}
op_ret = processor->complete(s->obj_size, etag, &mtime, real_time(), attrs,
(delete_at ? *delete_at : real_time()), if_match, if_nomatch);
if (! op_ret) {
/* update stats */
rgw_fh->set_mtime(real_clock::to_timespec(mtime));
rgw_fh->set_ctime(real_clock::to_timespec(mtime));
rgw_fh->set_size(bytes_written);
(delete_at ? *delete_at : real_time()),
if_match, if_nomatch);
if (op_ret != 0) {
/* revert attr updates */
rgw_fh->set_mtime(omtime);
rgw_fh->set_ctime(octime);
rgw_fh->set_size(osize);
}
done:

1
src/rgw/rgw_file.h
View File

@ -340,6 +340,7 @@ namespace rgw {
uint32_t get_owner_uid() const { return state.owner_uid; }
uint32_t get_owner_gid() const { return state.owner_gid; }
struct timespec get_ctime() const { return state.ctime; }
struct timespec get_mtime() const { return state.mtime; }
void create_stat(struct stat* st, uint32_t mask) {