RepoMirrors/ceph
1
0
Fork 0
mirror of https://github.com/ceph/ceph synced 2025-03-11 02:39:05 +00:00
Code Issues Packages Projects Releases Wiki Activity

librgw: compress RGWFileHandle stat data

Browse Source 
Just save the state we actually mutate, and fill stat structures
on demand.

Signed-off-by: Matt Benjamin <mbenjamin@redhat.com>
This commit is contained in:
Matt Benjamin 2015-11-24 22:14:37 -05:00
parent cfc7a4f5ee
commit 443e9c9c4a
2 changed files with 79 additions and 48 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
src/rgw/rgw_file.cc
View File

@ -137,13 +137,11 @@ int rgw_create(struct rgw_fs *rgw_fs,
if (get<1>(fhr) & RGWFileHandle::FLAG_CREATE) {
/* fill in stat data */
time_t now = time(0);
rgw_fh->get_stat()->st_atim.tv_sec = now;
rgw_fh->get_stat()->st_mtim.tv_sec = now;
rgw_fh->get_stat()->st_ctim.tv_sec = now;
rgw_fh->set_times(now);
rgw_fh->open_for_create();
}
*st = *(rgw_fh->get_stat());
(void) rgw_fh->stat(st);
struct rgw_file_handle *rfh = rgw_fh->get_fh();
*fh = rfh;
@ -393,15 +391,14 @@ int rgw_getattr(struct rgw_fs *rgw_fs,
}
/* fill in stat data */
rgw_fh->get_stat()->st_size = req.size();
rgw_fh->get_stat()->st_blocks = (st->st_size) / 512;
rgw_fh->get_stat()->st_atim.tv_sec = req.mtime();
rgw_fh->get_stat()->st_mtim.tv_sec = req.mtime();
rgw_fh->get_stat()->st_ctim.tv_sec = req.ctime();
rgw_fh->set_size(req.size());
rgw_fh->set_ctime({req.ctime(), 0});
rgw_fh->set_mtime({req.mtime(), 0});
rgw_fh->set_atime({req.mtime(), 0});
}
done:
*st = *(rgw_fh->get_stat());
(void) rgw_fh->stat(st);
return 0;
}
@ -485,7 +482,7 @@ int rgw_readdir(struct rgw_fs *rgw_fs,
rc = librgw.get_fe()->execute_req(&req);
/* XXX update link count (incorrectly) */
parent->get_stat()->st_nlink = 3 + *offset;
parent->set_nlink(3 + *offset);
}
/* XXXX request MUST set this */
@ -561,8 +558,8 @@ int rgw_write(struct rgw_fs *rgw_fs,
/* XXX move into request */
ssize_t min_size = offset+length;
if (min_size > rgw_fh->get_stat()->st_size)
rgw_fh->get_stat()->st_size = min_size;
if (min_size > rgw_fh->get_size())
rgw_fh->set_size(min_size);
*bytes_written = (rc == 0) ? req.bytes_written : 0;

104
src/rgw/rgw_file.h
View File

@ -111,7 +111,15 @@ namespace rgw {
RGWFHRef parent;
/* const */ std::string name; /* XXX file or bucket name */
/* const */ fh_key fhk;
struct stat st;
struct state {
uint64_t dev;
size_t size;
uint64_t nlink;
struct timespec ctime;
struct timespec mtime;
struct timespec atime;
state() : dev(0), size(0), nlink(1), ctime{0,0}, mtime{0,0}, atime{0,0} {}
} state;
uint32_t flags;
public:
@ -130,16 +138,8 @@ namespace rgw {
{
/* root */
fh.fh_type = RGW_FS_TYPE_DIRECTORY;
/* partial Unix attrs */
memset(&st, 0, sizeof(struct stat));
st.st_dev = fs_inst;
st.st_mode = RGW_RWXMODE|S_IFDIR;
st.st_nlink = 3;
st.st_uid = 0; // XXX
st.st_gid = 0; // XXX
/* stat */
state.dev = fs_inst;
/* pointer to self */
fh.fh_private = this;
}
@ -149,8 +149,6 @@ namespace rgw {
fh.fh_hk.bucket = XXH64(fsid.c_str(), fsid.length(), fh_key::seed);
fh.fh_hk.object = XXH64(object_name.c_str(), object_name.length(),
fh_key::seed);
/* fixup Unix attrs */
st.st_ino = fh.fh_hk.object;
fhk = fh.fh_hk;
name = object_name;
}
@ -167,27 +165,6 @@ namespace rgw {
fh_key fhk(parent->name, name);
fh.fh_hk = fhk.fh_hk; /* XXX redundant in fh_hk */
/* partial Unix attrs */
memset(&st, 0, sizeof(struct stat));
st.st_dev = fs_inst;
st.st_ino = fh.fh_hk.object; // XXX
st.st_uid = 0; // XXX
st.st_gid = 0; // XXX
switch (fh.fh_type) {
case RGW_FS_TYPE_DIRECTORY:
st.st_mode = RGW_RWXMODE|S_IFDIR;
st.st_nlink = 3;
break;
case RGW_FS_TYPE_FILE:
st.st_mode = RGW_RWMODE|S_IFREG;
st.st_nlink = 1;
st.st_blksize = 4096;
default:
break;
}
/* pointer to self */
fh.fh_private = this;
}
@ -196,9 +173,40 @@ namespace rgw {
return fhk;
}
const size_t get_size() { return state.size; }
struct rgw_file_handle* get_fh() { return &fh; }
struct stat *get_stat() { return &st; }
int stat(struct stat *st) {
/* partial Unix attrs */
memset(st, 0, sizeof(struct stat));
st->st_dev = state.dev;
st->st_ino = fh.fh_hk.object; // XXX
st->st_uid = 0; // XXX
st->st_gid = 0; // XXX
st->st_atim = state.atime;
st->st_mtim = state.mtime;
st->st_ctim = state.ctime;
switch (fh.fh_type) {
case RGW_FS_TYPE_DIRECTORY:
st->st_mode = RGW_RWXMODE|S_IFDIR;
st->st_nlink = 3;
break;
case RGW_FS_TYPE_FILE:
st->st_mode = RGW_RWMODE|S_IFREG;
st->st_nlink = 1;
st->st_blksize = 4096;
st->st_size = state.size;
st->st_blocks = (state.size) / 512;
default:
break;
}
return 0;
}
const std::string& bucket_name() const {
if (is_root())
@ -229,6 +237,32 @@ namespace rgw {
flags |= FLAG_CREATE;
}
void set_nlink(const uint64_t n) {
state.nlink = n;
}
void set_size(const size_t size) {
state.size = size;
}
void set_times(time_t t) {
state.ctime = {t, 0};
state.mtime = {t, 0};
state.atime = {t, 0};
}
void set_ctime(const struct timespec &ts) {
state.ctime = ts;
}
void set_mtime(const struct timespec &ts) {
state.mtime = ts;
}
void set_atime(const struct timespec &ts) {
state.atime = ts;
}
friend void intrusive_ptr_add_ref(const RGWFileHandle* fh) {
fh->refcnt.fetch_add(1, std::memory_order_relaxed);
}