mirrors/scylladb
1
0
Fork 0
mirror of https://github.com/scylladb/scylladb.git synced 2026-06-06 23:13:15 +00:00
Code Issues Packages Projects Releases Wiki Activity

storage_proxy: Change histogram to

Browse Source 
timed_rate_moving_average_and_histogram

As part of moving the derived statistic in to scylla, this replaces the
histogram object in the storage_proxy to
timed_rate_moving_average_and_histogram. and the read, write and range
counters where replaced by rate_moving_average.

Signed-off-by: Amnon Heiman <amnon@scylladb.com>
This commit is contained in:
Amnon Heiman
2016-05-15 15:22:30 +03:00
parent f6a5a4e3da
commit 64e0c8cd1b
2 changed files with 21 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
service/storage_proxy.cc
View File

@@ -432,32 +432,32 @@ storage_proxy::storage_proxy(distributed<database>& db) : _db(db) {
scollectd::add_polled_metric(scollectd::type_instance_id("storage_proxy"
, scollectd::per_cpu_plugin_instance
, "total_operations", "write timeouts")
, scollectd::make_typed(scollectd::data_type::DERIVE, _stats.write_timeouts)
, scollectd::make_typed(scollectd::data_type::DERIVE, _stats.write_timeouts._count)
),
scollectd::add_polled_metric(scollectd::type_instance_id("storage_proxy"
, scollectd::per_cpu_plugin_instance
, "total_operations", "write unavailable")
, scollectd::make_typed(scollectd::data_type::DERIVE, _stats.write_unavailables)
, scollectd::make_typed(scollectd::data_type::DERIVE, _stats.write_unavailables._count)
),
scollectd::add_polled_metric(scollectd::type_instance_id("storage_proxy"
, scollectd::per_cpu_plugin_instance
, "total_operations", "read timeouts")
, scollectd::make_typed(scollectd::data_type::DERIVE, _stats.read_timeouts)
, scollectd::make_typed(scollectd::data_type::DERIVE, _stats.read_timeouts._count)
),
scollectd::add_polled_metric(scollectd::type_instance_id("storage_proxy"
, scollectd::per_cpu_plugin_instance
, "total_operations", "read unavailable")
, scollectd::make_typed(scollectd::data_type::DERIVE, _stats.read_unavailables)
, scollectd::make_typed(scollectd::data_type::DERIVE, _stats.read_unavailables._count)
),
scollectd::add_polled_metric(scollectd::type_instance_id("storage_proxy"
, scollectd::per_cpu_plugin_instance
, "total_operations", "range slice timeouts")
, scollectd::make_typed(scollectd::data_type::DERIVE, _stats.range_slice_timeouts)
, scollectd::make_typed(scollectd::data_type::DERIVE, _stats.range_slice_timeouts._count)
),
scollectd::add_polled_metric(scollectd::type_instance_id("storage_proxy"
, scollectd::per_cpu_plugin_instance
, "total_operations", "range slice unavailable")
, scollectd::make_typed(scollectd::data_type::DERIVE, _stats.range_slice_unavailables)
, scollectd::make_typed(scollectd::data_type::DERIVE, _stats.range_slice_unavailables._count)
),
scollectd::add_polled_metric(scollectd::type_instance_id("storage_proxy"
, scollectd::per_cpu_plugin_instance
@@ -1012,7 +1012,7 @@ future<> storage_proxy::mutate_end(future<> mutate_result, utils::latency_counte
assert(mutate_result.available());
_stats.write.mark(lc.stop().latency_in_nano());
if (lc.is_start()) {
_stats.estimated_write.add(lc.latency(), _stats.write.count);
_stats.estimated_write.add(lc.latency(), _stats.write.hist.count);
}
try {
mutate_result.get();
@@ -1023,14 +1023,14 @@ future<> storage_proxy::mutate_end(future<> mutate_result, utils::latency_counte
} catch(mutation_write_timeout_exception& ex) {
// timeout
logger.debug("Write timeout; received {} of {} required replies", ex.received, ex.block_for);
_stats.write_timeouts++;
_stats.write_timeouts.mark();
return make_exception_future<>(std::current_exception());
} catch (exceptions::unavailable_exception& ex) {
_stats.write_unavailables++;
_stats.write_unavailables.mark();
logger.trace("Unavailable");
return make_exception_future<>(std::current_exception());
} catch(overloaded_exception& ex) {
_stats.write_unavailables++;
_stats.write_unavailables.mark();
logger.trace("Overloaded");
return make_exception_future<>(std::current_exception());
}
@@ -2224,7 +2224,7 @@ void storage_proxy::handle_read_error(std::exception_ptr eptr) {
std::rethrow_exception(eptr);
} catch (read_timeout_exception& ex) {
logger.debug("Read timeout: received {} of {} required replies, data {}present", ex.received, ex.block_for, ex.data_present ? "" : "not ");
_stats.read_timeouts++;
_stats.read_timeouts.mark();
} catch (...) {
logger.debug("Error during read query {}", eptr);
}
@@ -2428,7 +2428,7 @@ storage_proxy::do_query(schema_ptr s,
return query_singular(cmd, std::move(partition_ranges), cl).finally([lc, p] () mutable {
p->_stats.read.mark(lc.stop().latency_in_nano());
if (lc.is_start()) {
p->_stats.estimated_read.add(lc.latency(), p->_stats.read.count);
p->_stats.estimated_read.add(lc.latency(), p->_stats.read.hist.count);
}
});
} catch (const no_such_column_family&) {

18
service/storage_proxy.hh
View File

@@ -111,12 +111,12 @@ public:
};
struct stats {
uint64_t read_timeouts = 0;
uint64_t read_unavailables = 0;
uint64_t range_slice_timeouts = 0;
uint64_t range_slice_unavailables = 0;
uint64_t write_timeouts = 0;
uint64_t write_unavailables = 0;
utils::timed_rate_moving_average read_timeouts;
utils::timed_rate_moving_average read_unavailables;
utils::timed_rate_moving_average range_slice_timeouts;
utils::timed_rate_moving_average range_slice_unavailables;
utils::timed_rate_moving_average write_timeouts;
utils::timed_rate_moving_average write_unavailables;
// total write attempts
split_stats writes_attempts;
@@ -136,9 +136,9 @@ public:
uint64_t forwarded_mutations = 0;
uint64_t forwarding_errors = 0;
utils::ihistogram read;
utils::ihistogram write;
utils::ihistogram range;
utils::timed_rate_moving_average_and_histogram read;
utils::timed_rate_moving_average_and_histogram write;
utils::timed_rate_moving_average_and_histogram range;
sstables::estimated_histogram estimated_read;
sstables::estimated_histogram estimated_write;
sstables::estimated_histogram estimated_range;