Skip to content

Commit 4d2ad69

Browse files
committed
mds: remove unneeded SubvolumeMetric field from struct Metric
Signed-off-by: Venky Shankar <[email protected]>
1 parent d236018 commit 4d2ad69

File tree

1 file changed

+1
-7
lines changed

1 file changed

+1
-7
lines changed

src/mds/MDSPerfMetricTypes.h

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -314,13 +314,12 @@ struct Metrics {
314314
OpenedInodesMetric opened_inodes_metric;
315315
ReadIoSizesMetric read_io_sizes_metric;
316316
WriteIoSizesMetric write_io_sizes_metric;
317-
SubvolumeMetric subvolume_metrics;
318317

319318
// metric update type
320319
uint32_t update_type = UpdateType::UPDATE_TYPE_REFRESH;
321320

322321
DENC(Metrics, v, p) {
323-
DENC_START(5, 1, p);
322+
DENC_START(4, 1, p);
324323
denc(v.update_type, p);
325324
denc(v.cap_hit_metric, p);
326325
denc(v.read_latency_metric, p);
@@ -338,9 +337,6 @@ struct Metrics {
338337
denc(v.read_io_sizes_metric, p);
339338
denc(v.write_io_sizes_metric, p);
340339
}
341-
if (struct_v >= 5) {
342-
denc(v.subvolume_metrics, p);
343-
}
344340
DENC_FINISH(p);
345341
}
346342

@@ -356,7 +352,6 @@ struct Metrics {
356352
f->dump_object("opened_inodes_metric", opened_inodes_metric);
357353
f->dump_object("read_io_sizes_metric", read_io_sizes_metric);
358354
f->dump_object("write_io_sizes_metric", write_io_sizes_metric);
359-
f->dump_object("subvolume_metrics", subvolume_metrics);
360355
}
361356

362357
friend std::ostream& operator<<(std::ostream& os, const Metrics& metrics) {
@@ -371,7 +366,6 @@ struct Metrics {
371366
<< ", opened_inodes_metric=" << metrics.opened_inodes_metric
372367
<< ", read_io_sizes_metric=" << metrics.read_io_sizes_metric
373368
<< ", write_io_sizes_metric=" << metrics.write_io_sizes_metric
374-
<< ", subvolume_metrics=" << metrics.subvolume_metrics
375369
<< "}]";
376370
return os;
377371
}

0 commit comments

Comments
 (0)