ceph: send dentry lease metrics to MDS daemon
PATCH 1/1 ceph: send dentry lease metrics to MDS daemon
From: Xiubo Li <[email protected]>
For the old ceph version, if it received this one metric message containing the dentry lease metric info, it will just ignore it.
URL: https://tracker.ceph.com/issues/43423
--- fs/ceph/metric.c | 18 +++++++++++++++--- fs/ceph/metric.h | 14 ++++++++++++++ 2 files changed, 29 insertions(+), 3 deletions(-)
fs/ceph/metric.c +15 -3
@@ -16,6 +16,7 @@ static bool ceph_mdsc_send_metrics(struct ceph_mds_client *mdsc,struct ceph_metric_read_latency *read;struct ceph_metric_write_latency *write;struct ceph_metric_metadata_latency *meta; +struct ceph_metric_dlease *dlease;struct ceph_client_metric *m = &mdsc->metric;u64 nr_caps =atomic64_read (&m->total_caps);struct ceph_msg *msg;
@@ -25,7 +26,7 @@ static bool ceph_mdsc_send_metrics(struct ceph_mds_client *mdsc,s32 len; len =sizeof (*head) +sizeof (*cap) +sizeof (*read) +sizeof (*write) - +sizeof (*meta); + +sizeof (*meta) +sizeof (*dlease); msg =ceph_msg_new (CEPH_MSG_CLIENT_METRICS , len,GFP_NOFS , true);if (!msg) {
@@ -42,8 +43,8 @@ static bool ceph_mdsc_send_metrics(struct ceph_mds_client *mdsc, cap->ver =1 ; cap->compat =1 ; cap->data_len =cpu_to_le32 (sizeof (*cap) -10 ); - cap->hit =cpu_to_le64 (percpu_counter_sum (&mdsc->metric.i_caps_hit)); - cap->mis =cpu_to_le64 (percpu_counter_sum (&mdsc->metric.i_caps_mis)); + cap->hit =cpu_to_le64 (percpu_counter_sum (&m->i_caps_hit)); + cap->mis =cpu_to_le64 (percpu_counter_sum (&m->i_caps_mis)); cap->total =cpu_to_le64 (nr_caps); items++;
@@ -83,6 +84,17 @@ static bool ceph_mdsc_send_metrics(struct ceph_mds_client *mdsc, meta->nsec =cpu_to_le32 (ts.tv_nsec); items++; +/* encode the dentry lease metric */ + dlease = (struct ceph_metric_dlease *)(meta +1 ); + dlease->type =cpu_to_le32 (CLIENT_METRIC_TYPE_DENTRY_LEASE ); + dlease->ver =1 ; + dlease->compat =1 ; + dlease->data_len =cpu_to_le32 (sizeof (*dlease) -10 ); + dlease->hit =cpu_to_le64 (percpu_counter_sum (&m->d_lease_hit)); + dlease->mis =cpu_to_le64 (percpu_counter_sum (&m->d_lease_mis)); + dlease->total =atomic64_read (&m->total_dentries), + items++; +put_unaligned_le32 (items, &head->num); msg->front.iov_len = len; msg->hdr.version =cpu_to_le16 (1 );
fs/ceph/metric.h +14 -0
@@ -27,6 +27,7 @@ enum ceph_metric_type {CLIENT_METRIC_TYPE_READ_LATENCY , \CLIENT_METRIC_TYPE_WRITE_LATENCY , \CLIENT_METRIC_TYPE_METADATA_LATENCY , \ +CLIENT_METRIC_TYPE_DENTRY_LEASE , \ \ CLIENT_METRIC_TYPE_MAX, \ }
@@ -80,6 +81,19 @@ struct ceph_metric_metadata_latency {__le32 nsec; } __packed; +/* metric dentry lease header */ +struct ceph_metric_dlease { +__le32 type;/* ceph metric type */ + +__u8 ver; +__u8 compat; + +__le32 data_len;/* length of sizeof(hit + mis + total) */ +__le64 hit; +__le64 mis; +__le64 total; +} __packed; +struct ceph_metric_head {__le32 num;/* the number of metrics that will be sent */ } __packed;
Signature · 1 line
2.18.4
Quoted 5 lines · On Wed, 2020-10-21 at 00:50 -0400, [email protected] wrote:
From: Xiubo Li <[email protected]>
For the old ceph version, if it received this one metric message containing the dentry lease metric info, it will just ignore it.
Quoted 7 lines
URL: https://tracker.ceph.com/issues/43423
Signed-off-by Xiubo Li <[email protected]>---
fs/ceph/metric.c | 18 +++++++++++++++---
fs/ceph/metric.h | 14 ++++++++++++++2 files changed, 29 insertions(+), 3 deletions(-)
Sorry for the long delay -- this one fell through the cracks somehow...
Quoted 64 lines
fs/ceph/metric.c +1
-0@@ -16,6 +16,7 @@ static bool ceph_mdsc_send_metrics(struct ceph_mds_client *mdsc, struct ceph_metric_read_latency *read; struct ceph_metric_write_latency *write; struct ceph_metric_metadata_latency *meta; +struct ceph_metric_dlease *dlease; struct ceph_client_metric *m = &mdsc->metric; u64 nr_caps = atomic64_read(&m->total_caps); struct ceph_msg *msg;@@ -25,7 +26,7 @@ static bool ceph_mdsc_send_metrics(struct ceph_mds_client *mdsc, s32 len;len =
sizeof(*head)+sizeof(*cap)+sizeof(*read)+sizeof(*write)fs/ceph/metric.c +1
-1- +sizeof (*meta); + +sizeof (*meta) +sizeof (*dlease);msg =
ceph_msg_new(CEPH_MSG_CLIENT_METRICS, len, GFP_NOFS, true); if (!msg) {fs/ceph/metric.c +2
-2@@ -42,8 +43,8 @@ static bool ceph_mdsc_send_metrics(struct ceph_mds_client *mdsc, cap->ver = 1; cap->compat = 1; cap->data_len = cpu_to_le32(sizeof(*cap) - 10); - cap->hit =cpu_to_le64 (percpu_counter_sum (&mdsc->metric.i_caps_hit)); - cap->mis =cpu_to_le64 (percpu_counter_sum (&mdsc->metric.i_caps_mis)); + cap->hit =cpu_to_le64 (percpu_counter_sum (&m->i_caps_hit)); + cap->mis =cpu_to_le64 (percpu_counter_sum (&m->i_caps_mis)); cap->total = cpu_to_le64(nr_caps); items++;fs/ceph/metric.c +0
-0@@ -83,6 +84,17 @@ static bool ceph_mdsc_send_metrics(struct ceph_mds_client *mdsc, meta->nsec = cpu_to_le32(ts.tv_nsec); items++;
fs/ceph/metric.c static bool ceph_mdsc_send_metrics(struct ceph_mds_client *mdsc, · line 95
Quoted 9 lines
fs/ceph/metric.c +9
-0+/* encode the dentry lease metric */ + dlease = (struct ceph_metric_dlease *)(meta +1 ); + dlease->type =cpu_to_le32 (CLIENT_METRIC_TYPE_DENTRY_LEASE ); + dlease->ver =1 ; + dlease->compat =1 ; + dlease->data_len =cpu_to_le32 (sizeof (*dlease) -10 ); + dlease->hit =cpu_to_le64 (percpu_counter_sum (&m->d_lease_hit)); + dlease->mis =cpu_to_le64 (percpu_counter_sum (&m->d_lease_mis)); + dlease->total = atomic64_read(&m->total_dentries),
dlease->total needs to be wrapped in cpu_to_le64().
Quoted 40 lines
fs/ceph/metric.c +2
-0+ items++; +
put_unaligned_le32(items, &head->num);
msg->front.iov_len= len;
msg->hdr.version=cpu_to_le16(1);fs/ceph/metric.h +1
-0@@ -27,6 +27,7 @@ enum ceph_metric_type { CLIENT_METRIC_TYPE_READ_LATENCY, \ CLIENT_METRIC_TYPE_WRITE_LATENCY, \ CLIENT_METRIC_TYPE_METADATA_LATENCY, \ +CLIENT_METRIC_TYPE_DENTRY_LEASE , \ \ CLIENT_METRIC_TYPE_MAX, \ }@@ -80,6 +81,19 @@ struct ceph_metric_metadata_latency { __le32 nsec; } __packed;fs/ceph/metric.h +13
-0+/* metric dentry lease header */ +struct ceph_metric_dlease { +__le32 type;/* ceph metric type */ + +__u8 ver; +__u8 compat; + +__le32 data_len;/* length of sizeof(hit + mis + total) */ +__le64 hit; +__le64 mis; +__le64 total; +} __packed; +struct
ceph_metric_head{
__le32num; /* the number of metrics that will be sent */
}__packed;
Signature · 1 line
Jeff Layton <[email protected]>
Quoted 6 lines · Jeff Layton
Quoted 5 lines · On Wed, 2020-10-21 at 00:50 -0400, [email protected] wrote:
From: Xiubo Li <[email protected]>
For the old ceph version, if it received this one metric message containing the dentry lease metric info, it will just ignore it.
Quoted 8 lines
Quoted 7 lines
URL: https://tracker.ceph.com/issues/43423
Signed-off-by Xiubo Li <[email protected]>--- fs/ceph/metric.c | 18 +++++++++++++++--- fs/ceph/metric.h | 14 ++++++++++++++ 2 files changed, 29 insertions(+), 3 deletions(-)Sorry for the long delay -- this one fell through the cracks somehow...
No worry I was also waiting the ceph PR to be merged.
Quoted 64 lines
Quoted 64 lines
fs/ceph/metric.c +1
-0@@ -16,6 +16,7 @@ static bool ceph_mdsc_send_metrics(struct ceph_mds_client *mdsc, struct ceph_metric_read_latency *read; struct ceph_metric_write_latency *write; struct ceph_metric_metadata_latency *meta; +struct ceph_metric_dlease *dlease; struct ceph_client_metric *m = &mdsc->metric; u64 nr_caps = atomic64_read(&m->total_caps); struct ceph_msg *msg;@@ -25,7 +26,7 @@ static bool ceph_mdsc_send_metrics(struct ceph_mds_client *mdsc, s32 len;len =
sizeof(*head)+sizeof(*cap)+sizeof(*read)+sizeof(*write)fs/ceph/metric.c +3
-3- +sizeof (*meta); + +sizeof (*meta) +sizeof (*dlease); msg = ceph_msg_new(CEPH_MSG_CLIENT_METRICS, len, GFP_NOFS, true); if (!msg) {@@ -42,8 +43,8 @@ static bool ceph_mdsc_send_metrics(struct ceph_mds_client *mdsc, cap->ver = 1; cap->compat = 1; cap->data_len = cpu_to_le32(sizeof(*cap) - 10); - cap->hit =cpu_to_le64 (percpu_counter_sum (&mdsc->metric.i_caps_hit)); - cap->mis =cpu_to_le64 (percpu_counter_sum (&mdsc->metric.i_caps_mis)); + cap->hit =cpu_to_le64 (percpu_counter_sum (&m->i_caps_hit)); + cap->mis =cpu_to_le64 (percpu_counter_sum (&m->i_caps_mis)); cap->total = cpu_to_le64(nr_caps); items++;@@ -83,6 +84,17 @@ static bool ceph_mdsc_send_metrics(struct ceph_mds_client *mdsc, meta->nsec = cpu_to_le32(ts.tv_nsec); items++;
Quoted 10 lines
fs/ceph/metric.c static bool ceph_mdsc_send_metrics(struct ceph_mds_client *mdsc, · line 95
Quoted 9 lines
fs/ceph/metric.c +9
-0+/* encode the dentry lease metric */ + dlease = (struct ceph_metric_dlease *)(meta +1 ); + dlease->type =cpu_to_le32 (CLIENT_METRIC_TYPE_DENTRY_LEASE ); + dlease->ver =1 ; + dlease->compat =1 ; + dlease->data_len =cpu_to_le32 (sizeof (*dlease) -10 ); + dlease->hit =cpu_to_le64 (percpu_counter_sum (&m->d_lease_hit)); + dlease->mis =cpu_to_le64 (percpu_counter_sum (&m->d_lease_mis)); + dlease->total = atomic64_read(&m->total_dentries),
dlease->totalneeds to be wrapped incpu_to_le64().
Yeah, will fix it.
Thanks
BRs
Quoted 40 lines
Quoted 40 lines
fs/ceph/metric.c +2
-0+ items++; +
put_unaligned_le32(items, &head->num);
msg->front.iov_len= len;
msg->hdr.version=cpu_to_le16(1);fs/ceph/metric.h +14
-0@@ -27,6 +27,7 @@ enum ceph_metric_type { CLIENT_METRIC_TYPE_READ_LATENCY, \ CLIENT_METRIC_TYPE_WRITE_LATENCY, \ CLIENT_METRIC_TYPE_METADATA_LATENCY, \ +CLIENT_METRIC_TYPE_DENTRY_LEASE , \ \ CLIENT_METRIC_TYPE_MAX, \ }@@ -80,6 +81,19 @@ struct ceph_metric_metadata_latency { __le32 nsec; } __packed; +/* metric dentry lease header */ +struct ceph_metric_dlease { +__le32 type;/* ceph metric type */ + +__u8 ver; +__u8 compat; + +__le32 data_len;/* length of sizeof(hit + mis + total) */ +__le64 hit; +__le64 mis; +__le64 total; +} __packed; +struct
ceph_metric_head{
__le32num; /* the number of metrics that will be sent */
}__packed;