RepoMirrors/ceph
1
0
Fork 0
mirror of https://github.com/ceph/ceph synced 2025-01-19 17:41:39 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #12583 from liupan1111/wip-add-throttle-bluestore

Browse Source 
os/bluestore: add perf variable for throttle info in bluestore

Reviewed-by: xie xingguo <xie.xingguo@zte.com.cn>
Reviewed-by: Sage Weil <sage@redhat.com>
This commit is contained in:
Sage Weil 2016-12-22 09:20:02 -06:00 committed by GitHub
commit 59c1db1620
2 changed files with 59 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

57
src/os/bluestore/BlueStore.cc
View File

@ -2767,6 +2767,15 @@ void BlueStore::_init_logger()
b.add_u64(l_bluestore_write_small_new, "bluestore_write_small_new",
"Small write into new (sparse) blob");
b.add_u64(l_bluestore_cur_ops_in_queue, "bluestore_cur_ops_in_queue",
"Current ops in queue");
b.add_u64(l_bluestore_cur_bytes_in_queue, "bluestore_cur_bytes_in_queue",
"Current bytes in queue");
b.add_u64(l_bluestore_cur_ops_in_wal_queue, "bluestore_cur_ops_in_wal_queue",
"Current wal ops in wal queue");
b.add_u64(l_bluestore_cur_bytes_in_wal_queue, "l_bluestore_cur_bytes_in_wal_queue",
"Current wal bytes in wal queue");
b.add_u64(l_bluestore_txc, "bluestore_txc", "Transactions committed");
b.add_u64(l_bluestore_onode_reshard, "bluestore_onode_reshard",
"Onode extent map reshard events");
@ -6496,8 +6505,7 @@ void BlueStore::_txc_finish_kv(TransContext *txc)
txc->oncommits.pop_front();
}
throttle_ops.put(txc->ops);
throttle_bytes.put(txc->bytes);
op_queue_release_throttle(txc);
}
void BlueStore::BSPerfTracker::update_from_perfcounters(
@ -6535,8 +6543,7 @@ void BlueStore::_txc_finish(TransContext *txc)
txc->removed_collections.pop_front();
}
throttle_wal_ops.put(txc->ops);
throttle_wal_bytes.put(txc->bytes);
op_queue_release_wal_throttle(txc);
OpSequencerRef osr = txc->osr;
{
@ -6981,10 +6988,8 @@ int BlueStore::queue_transactions(
if (handle)
handle->suspend_tp_timeout();
throttle_ops.get(txc->ops);
throttle_bytes.get(txc->bytes);
throttle_wal_ops.get(txc->ops);
throttle_wal_bytes.get(txc->bytes);
op_queue_reserve_throttle(txc);
op_queue_reserve_wal_throttle(txc);
if (handle)
handle->reset_tp_timeout();
@ -6996,6 +7001,42 @@ int BlueStore::queue_transactions(
return 0;
}
void BlueStore::op_queue_reserve_throttle(TransContext *txc)
{
throttle_ops.get(txc->ops);
throttle_bytes.get(txc->bytes);
logger->set(l_bluestore_cur_ops_in_queue, throttle_ops.get_current());
logger->set(l_bluestore_cur_bytes_in_queue, throttle_bytes.get_current());
}
void BlueStore::op_queue_release_throttle(TransContext *txc)
{
throttle_ops.put(txc->ops);
throttle_bytes.put(txc->bytes);
logger->set(l_bluestore_cur_ops_in_queue, throttle_ops.get_current());
logger->set(l_bluestore_cur_bytes_in_queue, throttle_bytes.get_current());
}
void BlueStore::op_queue_reserve_wal_throttle(TransContext *txc)
{
throttle_wal_ops.get(txc->ops);
throttle_wal_bytes.get(txc->bytes);
logger->set(l_bluestore_cur_ops_in_wal_queue, throttle_wal_ops.get_current());
logger->set(l_bluestore_cur_bytes_in_wal_queue, throttle_wal_bytes.get_current());
}
void BlueStore::op_queue_release_wal_throttle(TransContext *txc)
{
throttle_wal_ops.put(txc->ops);
throttle_wal_bytes.put(txc->bytes);
logger->set(l_bluestore_cur_ops_in_wal_queue, throttle_wal_ops.get_current());
logger->set(l_bluestore_cur_bytes_in_wal_queue, throttle_wal_bytes.get_current());
}
void BlueStore::_txc_aio_submit(TransContext *txc)
{
dout(10) << __func__ << " txc " << txc << dendl;

10
src/os/bluestore/BlueStore.h
View File

@ -92,6 +92,12 @@ enum {
l_bluestore_write_small_wal,
l_bluestore_write_small_pre_read,
l_bluestore_write_small_new,
l_bluestore_cur_ops_in_queue,
l_bluestore_cur_bytes_in_queue,
l_bluestore_cur_ops_in_wal_queue,
l_bluestore_cur_bytes_in_wal_queue,
l_bluestore_txc,
l_bluestore_onode_reshard,
l_bluestore_blob_split,
@ -2176,6 +2182,10 @@ private:
CollectionRef& d,
unsigned bits, int rem);
void op_queue_reserve_throttle(TransContext *txc);
void op_queue_release_throttle(TransContext *txc);
void op_queue_reserve_wal_throttle(TransContext *txc);
void op_queue_release_wal_throttle(TransContext *txc);
};
inline ostream& operator<<(ostream& out, const BlueStore::OpSequencer& s) {