[COMMIT seastar master] Merge 'Update IO stats label set' from Pavel Emelyanov

[Commit Bot]

From: Avi Kivity <a...@scylladb.com>
Committer: Avi Kivity <a...@scylladb.com>
Branch: master

Merge 'Update IO stats label set' from Pavel Emelyanov

This PR removes the obsoleted "ioshard" label and adds the "iogroup" one.

Closes #1591

* github.com:scylladb/seastar:
io_queue: Add iogroup label to metrics
io_queue: Remove ioshard metrics label

---
diff --git a/src/core/io_queue.cc b/src/core/io_queue.cc
--- a/src/core/io_queue.cc
+++ b/src/core/io_queue.cc
@@ -804,19 +804,19 @@ void io_queue::register_stats(sstring name, priority_class_data& pc) {
seastar::metrics::metric_groups new_metrics;

auto owner_l = sm::shard_label(this_shard_id());
- auto ioshard_l = sm::label("ioshard")(sm::impl::shard());
auto mnt_l = sm::label("mountpoint")(mountpoint());
auto class_l = sm::label("class")(name);
+ auto group_l = sm::label("iogroup")(to_sstring(_group->_allocated_on));

std::vector<sm::metric_definition> metrics;
for (auto&& m : pc.metrics()) {
- m(ioshard_l)(owner_l)(mnt_l)(class_l);
+ m(owner_l)(mnt_l)(class_l)(group_l);
metrics.emplace_back(std::move(m));
}

for (auto&& s : _streams) {
for (auto&& m : s.metrics(pc.fq_class())) {
- m(ioshard_l)(owner_l)(mnt_l)(class_l)(sm::label("stream")(s.label()));
+ m(owner_l)(mnt_l)(class_l)(group_l)(sm::label("stream")(s.label()));
metrics.emplace_back(std::move(m));
}
}