Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 220abf5a authored by Ilya Dryomov's avatar Ilya Dryomov
Browse files

libceph: support SERVER_JEWEL feature bits 



Only MON_STATEFUL_SUB, really.  MON_ROUTE_OSDMAP and
OSDSUBOP_NO_SNAPCONTEXT are irrelevant.

Signed-off-by: default avatarIlya Dryomov <idryomov@gmail.com>
parent 2d7522e0

include/linux/ceph/ceph_features.h

+2 −0
Original line number Diff line number Diff line
@@ -199,6 +199,8 @@ DEFINE_CEPH_FEATURE_DEPRECATED(63, 1, RESERVED_BROKEN, LUMINOUS) // client-facin 
	 CEPH_FEATURE_MSGR_KEEPALIVE2 |		\

	 CEPH_FEATURE_OSD_POOLRESEND |		\

	 CEPH_FEATURE_CRUSH_V4 |		\

	 CEPH_FEATURE_SERVER_JEWEL |		\

	 CEPH_FEATURE_MON_STATEFUL_SUB |	\

	 CEPH_FEATURE_CRUSH_TUNABLES5 |		\

	 CEPH_FEATURE_NEW_OSDOPREPLY_ENCODING)

net/ceph/mon_client.c

+7 −1
Original line number Diff line number Diff line
@@ -6,6 +6,7 @@ 
#include <linux/random.h>

#include <linux/sched.h>



#include <linux/ceph/ceph_features.h>

#include <linux/ceph/mon_client.h>

#include <linux/ceph/libceph.h>

#include <linux/ceph/debugfs.h>
@@ -297,6 +298,10 @@ static void handle_subscribe_ack(struct ceph_mon_client *monc, 


	mutex_lock(&monc->mutex);

	if (monc->sub_renew_sent) {

		/*

		 * This is only needed for legacy (infernalis or older)

		 * MONs -- see delayed_work().

		 */

		monc->sub_renew_after = monc->sub_renew_sent +

					    (seconds >> 1) * HZ - 1;

		dout("%s sent %lu duration %d renew after %lu\n", __func__,
@@ -955,7 +960,8 @@ static void delayed_work(struct work_struct *work) 
			__validate_auth(monc);

		}



		if (is_auth) {

		if (is_auth &&

		    !(monc->con.peer_features & CEPH_FEATURE_MON_STATEFUL_SUB)) {

			unsigned long now = jiffies;



			dout("%s renew subs? now %lu renew after %lu\n",