RepoMirrors/ceph
1
0
Fork 0
mirror of https://github.com/ceph/ceph synced 2025-02-21 01:47:25 +00:00
Code Issues Packages Projects Releases Wiki Activity

client: Support new, filtered MStatfs

Browse Source 
When statfs() is called for a filesystem with a single data pool,
add that as an argument to receive statistics for that pool only.

Signed-off-by: Douglas Fuller <dfuller@redhat.com>
This commit is contained in:
Douglas Fuller 2017-07-17 17:24:24 -04:00
parent 76fc99a0a5
commit aeeeb43da9
2 changed files with 10 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/client/Client.cc
View File

@ -9430,7 +9430,13 @@ int Client::statfs(const char *path, struct statvfs *stbuf,
ceph_statfs stats;
C_SaferCond cond;
objecter->get_fs_stats(stats, &cond);
const vector<int64_t> &data_pools = mdsmap->get_data_pools();
if (data_pools.size() == 1) {
objecter->get_fs_stats(stats, data_pools[0], &cond);
} else {
objecter->get_fs_stats(stats, boost::optional<int64_t>(), &cond);
}
client_lock.Unlock();
int rval = cond.wait();
@ -9501,7 +9507,7 @@ int Client::statfs(const char *path, struct statvfs *stbuf,
stbuf->f_bfree = free;
stbuf->f_bavail = free;
} else {
// General case: report the overall RADOS cluster's statistics. Because
// General case: report the cluster statistics returned from RADOS. Because
// multiple pools may be used without one filesystem namespace via
// layouts, this is the most correct thing we can do.
stbuf->f_blocks = stats.kb >> (CEPH_BLOCK_SHIFT - 10);

3
src/librados/RadosClient.cc
View File

@ -641,7 +641,8 @@ int librados::RadosClient::get_fs_stats(ceph_statfs& stats)
int ret = 0;
lock.Lock();
objecter->get_fs_stats(stats, new C_SafeCond(&mylock, &cond, &done, &ret));
objecter->get_fs_stats(stats, boost::optional<int64_t> (),
new C_SafeCond(&mylock, &cond, &done, &ret));
lock.Unlock();
mylock.Lock();