diff mbox series

net : client only want latest osdmap. If the gap with the latest version exceeds the threshold, mon will send the fullosdmap instead of incremental osdmap

Message ID 1594355944-7137-1-git-send-email-simon29rock@gmail.com (mailing list archive)
State New, archived
Headers show
Series net : client only want latest osdmap. If the gap with the latest version exceeds the threshold, mon will send the fullosdmap instead of incremental osdmap | expand

Commit Message

simon gao July 10, 2020, 4:39 a.m. UTC 
Fix: https://tracker.ceph.com/issues/43421
Signed-off-by: simon gao <simon29rock@gmail.com>
---
 include/linux/ceph/ceph_fs.h | 1 +
 net/ceph/mon_client.c        | 3 ++-
 2 files changed, 3 insertions(+), 1 deletion(-)

Comments

Ilya Dryomov July 10, 2020, 8:58 a.m. UTC | #1 
On Fri, Jul 10, 2020 at 6:39 AM simon gao <simon29rock@gmail.com> wrote:
>
> Fix: https://tracker.ceph.com/issues/43421
> Signed-off-by: simon gao <simon29rock@gmail.com>
> ---
>  include/linux/ceph/ceph_fs.h | 1 +
>  net/ceph/mon_client.c        | 3 ++-
>  2 files changed, 3 insertions(+), 1 deletion(-)
>
> diff --git a/include/linux/ceph/ceph_fs.h b/include/linux/ceph/ceph_fs.h
> index ebf5ba6..9dcc132 100644
> --- a/include/linux/ceph/ceph_fs.h
> +++ b/include/linux/ceph/ceph_fs.h
> @@ -208,6 +208,7 @@ struct ceph_client_mount {
>  } __attribute__ ((packed));
>
>  #define CEPH_SUBSCRIBE_ONETIME    1  /* i want only 1 update after have */
> +#define CEPH_SUBSCRIBE_LATEST_OSDMAP   2  /* i want the latest fullmap, for client */

Hi Simon,

Where is this flag introduced?  Looks like it is mentioned in the
comments of https://github.com/ceph/ceph/pull/32422, but it is not
actually added anywhere I can see.

>
>  struct ceph_mon_subscribe_item {
>         __le64 start;
> diff --git a/net/ceph/mon_client.c b/net/ceph/mon_client.c
> index 3d8c801..b0d1ce6 100644
> --- a/net/ceph/mon_client.c
> +++ b/net/ceph/mon_client.c
> @@ -349,7 +349,8 @@ static bool __ceph_monc_want_map(struct ceph_mon_client *monc, int sub,
>  {
>         __le64 start = cpu_to_le64(epoch);
>         u8 flags = !continuous ? CEPH_SUBSCRIBE_ONETIME : 0;
> -
> +    if (CEPH_SUB_OSDMAP == sub)
> +        flags |= CEPH_SUBSCRIBE_LATEST_OSDMAP

This won't compile because of the missing semicolon.

Thanks,

                Ilya
diff mbox series

Patch

diff --git a/include/linux/ceph/ceph_fs.h b/include/linux/ceph/ceph_fs.h
index ebf5ba6..9dcc132 100644
--- a/include/linux/ceph/ceph_fs.h
+++ b/include/linux/ceph/ceph_fs.h
@@ -208,6 +208,7 @@  struct ceph_client_mount {
 } __attribute__ ((packed));
 
 #define CEPH_SUBSCRIBE_ONETIME    1  /* i want only 1 update after have */
+#define CEPH_SUBSCRIBE_LATEST_OSDMAP   2  /* i want the latest fullmap, for client */ 
 
 struct ceph_mon_subscribe_item {
 	__le64 start;
diff --git a/net/ceph/mon_client.c b/net/ceph/mon_client.c
index 3d8c801..b0d1ce6 100644
--- a/net/ceph/mon_client.c
+++ b/net/ceph/mon_client.c
@@ -349,7 +349,8 @@  static bool __ceph_monc_want_map(struct ceph_mon_client *monc, int sub,
 {
 	__le64 start = cpu_to_le64(epoch);
 	u8 flags = !continuous ? CEPH_SUBSCRIBE_ONETIME : 0;
-
+    if (CEPH_SUB_OSDMAP == sub)
+        flags |= CEPH_SUBSCRIBE_LATEST_OSDMAP
 	dout("%s %s epoch %u continuous %d\n", __func__, ceph_sub_str[sub],
 	     epoch, continuous);