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

Merge pull request #9826 from liewegas/wip-bluefs

Browse Source 
os/bluestore/BlueFS: instrument which file types we write to

Reviewed-by: Varada Kari <varada.kari@sandisk.com>
This commit is contained in:
Sage Weil 2016-06-21 09:30:18 -04:00 committed by GitHub
commit 59c47b4421
2 changed files with 62 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

62
src/os/bluestore/BlueFS.cc
View File

@ -46,18 +46,36 @@ void BlueFS::_init_logger()
{
PerfCountersBuilder b(g_ceph_context, "BlueFS",
l_bluefs_first, l_bluefs_last);
b.add_u64_counter(l_bluefs_gift_bytes, "gift_bytes", "Bytes gifted from BlueStore");
b.add_u64_counter(l_bluefs_reclaim_bytes, "reclaim_bytes", "Bytes reclaimed by BlueStore");
b.add_u64(l_bluefs_db_total_bytes, "db_total_bytes", "Total bytes (main db device)");
b.add_u64(l_bluefs_db_free_bytes, "db_free_bytes", "Free bytes (main db device)");
b.add_u64(l_bluefs_wal_total_bytes, "wal_total_bytes", "Total bytes (wal device)");
b.add_u64(l_bluefs_wal_free_bytes, "wal_free_bytes", "Free bytes (wal device)");
b.add_u64(l_bluefs_slow_total_bytes, "slow_total_bytes", "Total bytes (slow device)");
b.add_u64(l_bluefs_slow_free_bytes, "slow_free_bytes", "Free bytes (slow device)");
b.add_u64_counter(l_bluefs_gift_bytes, "gift_bytes",
"Bytes gifted from BlueStore");
b.add_u64_counter(l_bluefs_reclaim_bytes, "reclaim_bytes",
"Bytes reclaimed by BlueStore");
b.add_u64(l_bluefs_db_total_bytes, "db_total_bytes",
"Total bytes (main db device)");
b.add_u64(l_bluefs_db_free_bytes, "db_free_bytes",
"Free bytes (main db device)");
b.add_u64(l_bluefs_wal_total_bytes, "wal_total_bytes",
"Total bytes (wal device)");
b.add_u64(l_bluefs_wal_free_bytes, "wal_free_bytes",
"Free bytes (wal device)");
b.add_u64(l_bluefs_slow_total_bytes, "slow_total_bytes",
"Total bytes (slow device)");
b.add_u64(l_bluefs_slow_free_bytes, "slow_free_bytes",
"Free bytes (slow device)");
b.add_u64(l_bluefs_num_files, "num_files", "File count");
b.add_u64(l_bluefs_log_bytes, "log_bytes", "Size of the metadata log");
b.add_u64_counter(l_bluefs_log_compactions, "log_compactions", "Compactions of the metadata log");
b.add_u64_counter(l_bluefs_logged_bytes, "logged_bytes", "Bytes written to the metadata log");
b.add_u64_counter(l_bluefs_log_compactions, "log_compactions",
"Compactions of the metadata log");
b.add_u64_counter(l_bluefs_logged_bytes, "logged_bytes",
"Bytes written to the metadata log");
b.add_u64_counter(l_bluefs_files_written_wal, "files_written_wal",
"Files written to WAL");
b.add_u64_counter(l_bluefs_files_written_sst, "files_written_sst",
"Files written to SSTs");
b.add_u64_counter(l_bluefs_bytes_written_wal, "bytes_written_wal",
"Bytes written to WAL");
b.add_u64_counter(l_bluefs_bytes_written_sst, "bytes_written_sst",
"Bytes written to SSTs");
logger = b.create_perf_counters();
g_ceph_context->get_perfcounters_collection()->add(logger);
}
@ -1105,6 +1123,15 @@ int BlueFS::_flush_range(FileWriter *h, uint64_t offset, uint64_t length)
}
assert(bl.length() == length);
switch (h->writer_type) {
case WRITER_WAL:
logger->inc(l_bluefs_bytes_written_wal, length);
break;
case WRITER_SST:
logger->inc(l_bluefs_bytes_written_sst, length);
break;
}
dout(30) << "dump:\n";
bl.hexdump(*_dout);
*_dout << dendl;
@ -1399,6 +1426,19 @@ int BlueFS::open_for_write(
log_t.op_dir_link(dirname, filename, file->fnode.ino);
*h = _create_writer(file);
if (0 == filename.compare(filename.length() - 4, 4, ".log")) {
(*h)->writer_type = BlueFS::WRITER_WAL;
if (logger) {
logger->inc(l_bluefs_files_written_wal);
}
} else if (0 == filename.compare(filename.length() - 4, 4, ".sst")) {
(*h)->writer_type = BlueFS::WRITER_SST;
if (logger) {
logger->inc(l_bluefs_files_written_sst);
}
}
dout(10) << __func__ << " h " << *h << " on " << file->fnode << dendl;
return 0;
}
@ -1418,7 +1458,7 @@ BlueFS::FileWriter *BlueFS::_create_writer(FileRef f)
void BlueFS::_close_writer(FileWriter *h)
{
dout(10) << __func__ << " " << h << dendl;
dout(10) << __func__ << " " << h << " type " << h->writer_type << dendl;
for (unsigned i=0; i<MAX_BDEV; ++i) {
if (bdev[i]) {
assert(h->iocv[i]);

11
src/os/bluestore/BlueFS.h
View File

@ -31,6 +31,10 @@ enum {
l_bluefs_log_bytes,
l_bluefs_log_compactions,
l_bluefs_logged_bytes,
l_bluefs_files_written_wal,
l_bluefs_files_written_sst,
l_bluefs_bytes_written_wal,
l_bluefs_bytes_written_sst,
l_bluefs_last,
};
@ -41,6 +45,12 @@ public:
static constexpr unsigned BDEV_DB = 1;
static constexpr unsigned BDEV_SLOW = 2;
enum {
WRITER_UNKNOWN,
WRITER_WAL,
WRITER_SST,
};
struct File : public RefCountedObject {
bluefs_fnode_t fnode;
int refs;
@ -102,6 +112,7 @@ public:
uint64_t pos; ///< start offset for buffer
bufferlist buffer; ///< new data to write (at end of file)
bufferlist tail_block; ///< existing partial block at end of file, if any
int writer_type = 0; ///< WRITER_*
std::mutex lock;
std::array<IOContext*,MAX_BDEV> iocv; ///< for each bdev